From: idfx <idfx>
Date: Sat, 6 Nov 2004 17:35:15 +0000 (+0000)
Subject: restoring head
X-Git-Tag: BEFORE_MERGE_1_1~30
X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=commitdiff_plain;h=25d4e7462606788970b556c0637fb62cf1981e24

restoring head
---

diff --git a/bundles/admin_de.properties b/bundles/admin_de.properties
index 5bb635c2..e7de8cc6 100755
--- a/bundles/admin_de.properties
+++ b/bundles/admin_de.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: deutsch / german
-# $Id: admin_de.properties,v 1.30 2003/09/03 18:29:00 zapata Exp $
+# $Id: admin_de.properties,v 1.31 2004/11/06 17:39:45 idfx Exp $
 
 languagename=Deutsch
 
@@ -67,6 +67,8 @@ media.is_published=free to publish
 media.icon=Icon
 media.nr_of_media=Anzahl der Medien (max 20)
 media.nr_of_media.submit=Anzahl festlegen
+media.comments=Kommentare
+media.articles=Artike
 
 medialist.search_text_in=Search text in
 
@@ -94,6 +96,7 @@ other_medialist.htmltitle=andere Medien Liste
 # breaking
 breaking.htmltitle=breaking news
 breaking.textinfo=(max. 5 Zeilen / 250 Zeichen)
+breaking.id = id
 breaking.text=Text
 breaking.date=Datum
 
@@ -113,8 +116,9 @@ comment.url=Url
 comment.creator=Uhrheber
 comment.article=Artikel
 comment.html=HTML?
-comment.status=Status 
+comment.status=Status
 comment.language=Sprache
+comment.allcomments=alle Erg&auml;nzungen
 
 comment.operation.hide=verstecken
 comment.operation.unhide=zeigen
@@ -124,16 +128,19 @@ comment.operation.unhide=zeigen
 commentlist.htmltitle=Kommentare Liste
 commentlist.published=sichtbar
 commentlist.hidden=versteckt
+commentlist.allcomments=alle Erg&auml;nzungen zu diesem Artikel
 commentlist.search=go!
 commentlist.activate = &Auml;nderungen aktivieren
 commentlist.order = Reihenfolge
-commentlist.order.datedesc= Alte zuerst
-commentlist.order.dateasc= Neue zuerst
+commentlist.order.datedesc= Neue zuerst
+commentlist.order.dateasc= Alte zuerst
 commentlist.order.articletitle= Artikel Titel
 
 commentsearch.field = Suchen
 commentsearch.field.title = Title
 commentsearch.field.creator = Autor
+commentsearch.field.main_url = Url
+commentsearch.field.email = Email
 commentsearch.field.description = Beschreibung
 commentsearch.value = Feld
 
@@ -144,8 +151,8 @@ commentsearch.publishedstate.published = sichtbar
 commentsearch.status = Status
 
 commentsearch.order = Reihenfolge
-commentsearch.order.datedesc= Alte zuerst
-commentsearch.order.dateasc= Neue zuerst
+commentsearch.order.datedesc= Neue zuerst
+commentsearch.order.dateasc= Alte zuerst
 commentsearch.order.articletitle= Artikeltitel
 
 commentsearch.searchbutton = suchen
@@ -220,6 +227,8 @@ contentsearch.field = Feld
 contentsearch.field.title = Titel
 contentsearch.field.creator = Autor
 contentsearch.field.contents=Inhalt
+contentsearch.field.creator_email = Email
+contentsearch.field.creator_main_url = Web-Adresse
 
 contentsearch.publishedstate = Status
 contentsearch.publishedstate.hidden=versteckt
@@ -228,8 +237,8 @@ contentsearch.publishedstate.published=sichtbar
 contentsearch.articletype = Artikeltyp
 
 contentsearch.order = sortieren nach
-contentsearch.order.datedesc=Alte zuerst
-contentsearch.order.dateasc=Neue zuerst
+contentsearch.order.datedesc=Neue zuerst
+contentsearch.order.dateasc=Alte zuerst
 contentsearch.order.title=nach Titel
 contentsearch.order.creator=nach Autor
 contentsearch.searchbutton=suchen
@@ -243,26 +252,12 @@ contentlist.select=w&auml;hlen
 
 # language
 language.htmltitle=Sprache
+language.id=Id
 language.name=Sprache
 language.code=Language code
 
 languagelist.htmltitle=Sprachen
 
-
-# imcs
-linkimcs.htmltitle=LinksImcs
-linkimcs.name=Name
-linkimcs.continent=Kontinent
-linkimcs.new_parent=Neuen Oberbegriff anlegen
-linkimcs.url=URL
-linkimcs.sort_by=Sortierkriterium
-linkimcs.language=Sprache
-linkimcs.parent=parent
-
-linkimcslist.htmltitle=LinksImcsList
-linkimcslist.search_in=Text suchen in
-
-
 # login
 login.htmltitle=login
 login.info=Dieser Bereich steht nur authorisierten Gruppen zur Verfügung. Wenn ihr aktuelle Nachrichten einspielen wollt, so koennt ihr als Redaktionsgruppe teilnehmen. Bitte meldet Euch bei der {0}.
@@ -274,6 +269,7 @@ login.submit=  OK
 
 # mediafolder
 mediafolder.htmltitle=Mediafolder
+mediafolder.id=id
 mediafolder.date=Datum
 mediafolder.name=Name
 mediafolder.location=Ort
@@ -285,7 +281,8 @@ mediafolderlist.htmltitle=Mediafolderlist
 
 # message
 message.htmltitle=Messages
-message.date=Datum 
+message.id=id
+message.date=Datum
 message.title=Titel
 message.creator=Autor
 message.text=Text
@@ -296,12 +293,11 @@ messagelist.htmltitle=Messages Liste
 # admin start page
 start.htmltitle=Admin-Startpage
 
-start.breaking.new=neue breaking news
 start.content.new=neuer Artikel
 start.show=zeigen
-start.open_by_id=id &ouml;ffnen
+start.comment.open_by_id=Erg&auml;nzung # &ouml;ffnen
+start.content.open_by_id=Artikel # &ouml;ffnen
 
-start.content.comments=Erg&auml;nzungen
 start.content.hidden=alle versteckten eines Monats
 start.content.not_published=(noch) nicht ver&ouml;ffentlicht
 start.content.with_media=mit Medien
@@ -311,24 +307,29 @@ start.content.all=Alle Artikel
 start.content.search=suchen
 
 start.allarticlesoftype={0}
+start.allcommentswithstatus={0}
 
 start.producers.title=MANUELL GENERIEREN
 start.producers.produceAllNew=alle neuen generieren
+start.producers.recipe.allnew=alle neuen generieren
+
 start.producers.advanced=extra Optionen (Vorsicht!)
 
-start.openpostings.title=OPENPOSTINGS
+
+start.administer.title=AUFR&Auml;UMEN
+start.administer.comments=ERG&Auml;NZUNGEN
+
 start.comments.title=ERG&Auml;NZUNGEN
+
 start.breaking.title=breaking news
-start.content.title=ARTIKEL
-start.administer.title=AUFR&Auml;UMEN
-start.list.title=LIST
+start.articles.title=ARTIKEL
 start.fileedit.includes.title=Includes editieren
 start.addandedit.title=NEU / &Auml;NDERN
 start.extra.title=EXTRA
 start.search.title=SUCHEN
-start.topics.title=TOPICS
 start.other_media.title=andere Medien
 start.images.title=Bilder
+start.images.open_by_id=Bild # &ouml;ffnen
 start.video.title=Video
 start.audio.title=Audio
 start.media.title=MEDIA
@@ -341,8 +342,12 @@ start.messageboard.no_messages=keine Nachrichten
 start.superusermenu=Mehr Funktionen (Vorsicht!)
 
 
+
 # topic
+
 topic.htmltitle=Themen
+
+topic.id=id
 topic.title=Name
 topic.description=Beschreibung
 topic.filename=Dateiname
@@ -355,8 +360,10 @@ topiclist.htmltitle=Themenliste
 # users
 user.htmltitle=BenutzerInnen
 user.login=Login
-user.password=Password
-user.password2=Password (best&auml;tigen)
+user.ownpassword=Dein eigenes Passwort
+user.oldpassword=altes Passwort
+user.password=Passwort
+user.password2=Passwort (best&auml;tigen)
 user.admin=Admin
 
 userlist.htmltitle=BenutzerInnen
@@ -369,6 +376,14 @@ articletype.name=Name
 
 articletypelist.htmltitle=Artikeltyp Liste
 
+# mediatypes
+mediatypelist.htmltitle = Mediatypes bearbeiten
+mediatype.id = id
+mediatype.name = Name
+mediatype.htmltitle = Mediatype
+mediatype.mimetype = MIME-Type
+mediatype.classname = Klassenname
+mediatype.tablename = Tabellenname
 
 
 #commentstatus
@@ -399,10 +414,11 @@ producer.verb.enqueue = produzieren
 producer.job.name = Job
 producer.job.status = Status
 producer.job.date = seit:
-producer.job.cancel = cancel
-producer.job.abort = abort
 producer.job.empty = Nix zu tun ;-)
+producer.job.runningtime = Laufzeit
 
+producer.jobqueue.canceljobs = ausgew&auml;hlte abbrechen
+producer.jobqueue.cancelalljobs = alle abbrechen
 producer.jobqueue.title = Laufende Jobs
 producer.jobqueue.refresh = neu laden
 producer.producerlist.title = neuer Job
@@ -415,6 +431,7 @@ superusermenu.htmltitle = Extra-Funktionen
 superusermenu.manage = BEARBEITEN
 superusermenu.topics = Topics
 superusermenu.articletypes =  Artikeltypen
+superusermenu.mediatypes = Medienformate
 superusermenu.comment_statuses =  comment status Werte
 superusermenu.users =  BenutzerInnen
 superusermenu.languages =  Sprachen
@@ -425,7 +442,7 @@ superusermenu.imcs =  IMCS (nicht aktiv)
 #abuse
 abuse.htmltitle = Spam abwehr
 
-abuse.setting = Einstellungen 
+abuse.setting = Einstellungen
 abuse.value = Werte
 
 abuse.disableopenpostings=Openposting abschalten
@@ -443,17 +460,38 @@ abuse.log.time=Zeit
 abuse.log.address=IP-Nummer
 abuse.log.object=Objekt
 abuse.log.browser=Browser
+abuse.log.filtertype=Filter Typ
+abuse.log.filterexpression=Ausdruck
 
 abuse.filters = Filter
+abuse.filters.movedown = runter
+abuse.filters.moveup = hoch
+
 abuse.filter.type = Type
+abuse.filter.expression = Expression
+abuse.filter.articleaction = Artikel
+abuse.filter.commentaction = Erg&auml;nzung
+abuse.filter.comments = Kommentar (intern)
+abuse.filter.lasthit = letzter Treffer
+abuse.filter.htmltitle = Filter bearbeiten
+
 abuse.filtertype.ip = IP Nummer
 abuse.filtertype.regexp = Regular expression
-abuse.filter.expression = Expression
+abuse.filtertype.useragent= User Agent (Browser-Typ)
+
+abuse.filtererror.title = Fehler:
+abuse.filtererror.invalidtype = Falscher Filtertyp
+abuse.filtererror.invalidexpression = Falscher Ausdruck f&uuml;r diesen Filtertyp
+
+abuse.filters.htmltitle = Spam Abwehr Filterregeln
+abuse.log.htmltitle = Spam Abwehr - open posting log
+
 
 
 # head
 head.start=start
 head.logout=logout
+head.changepassword=password
 head.help=help
 head.search=search
 head.logged_in=logged in
@@ -469,11 +507,11 @@ foot.top=top
 
 
 # Article types
-articletypes.openposting=open posting
-articletypes.newswire=Newswire
-articletypes.feature=Feature
-articletypes.topicspecial=Topic-Special
-articletypes.startspecial=Startpage-Special
+articletypes.OpenPosting=open posting
+articletypes.Newswire=Newswire
+articletypes.Feature=Feature
+articletypes.Spezial\ (Topicpage)=Topic-Special
+articletypes.Spezial\ (Startpage)=Startpage-Special
 
 # Comment status values
 commentstatus.normal=normal
@@ -484,13 +522,13 @@ commentstatus.bad=b&ouml;se
 
 ########## error ##########
 error.htmltitle=das system ist der fehler
-error.title=OOPS!
+error.title=FEHLER!
 error.text=Nunja, kann passieren! Wahrscheinlich wird Dir der folgende Fehlertext nichts sagen, koennte aber sein, da&szlig; <a href="mailto:{0}">{1}</a>damit was anfangen kann:
 error.text2=Also, bitte eine Mail mit dem <font color="Red">roten Text</font>und einer m&ouml;glichst genauen Fehlerbeschreibung an <a href="mailto:{0}">{1}</a>
 
 usererror.htmltitle=Fehlerhafte Eingabe
-usererror.title=OOPS!
-usererror.text=Bei der Eingabe hat es folgende fehler gegeben:
+usererror.title=FEHLER!
+usererror.text=Bei Deiner Eingabe hat es folgende Fehler gegeben:
 usererror.what_to_do=Also, bitte druecke die zurueck taste und versuche es nochmal
 
 media.error.unsupportedformat=Das Format der hochgeladenen Mediendatei wird nicht unterst&uuml;tzt.
@@ -501,5 +539,6 @@ user.error.missingpassword=Bitte ein Passwort angebenn.
 
 ########## infomessages ##########
 infomessage.htmltitle = zu Ihrer Information
+infomessage.recipeAddedToQueue = Der Vorgang wird bearbeitet.
 infomessage.produceAllNewAddedToQueue = Der Vorgang wird bearbeitet.
 
diff --git a/bundles/admin_en.properties b/bundles/admin_en.properties
index bbd3fb20..4ee99737 100755
--- a/bundles/admin_en.properties
+++ b/bundles/admin_en.properties
@@ -1,6 +1,4 @@
-########## admin ##########
-# language: english
-# $Id: admin_en.properties,v 1.49 2003/09/03 18:29:00 zapata Exp $
+# $Id: admin_en.properties,v 1.50 2004/11/06 17:39:45 idfx Exp $
 
 languagename=English
 
@@ -25,6 +23,7 @@ delete=delete
 add=add
 filter=filter
 attach=attach
+deattach=remove
 list=browse
 back=back
 cancel=cancel
@@ -45,8 +44,11 @@ no_matches_found=No matching entries!
 list.next=next
 list.previous=previous
 
+system.status = Status:
+system.loggedin = Logged in:
 
 # media - used by image, audio, video and other media
+media.urls = Urls
 media.created=created
 media.changed=last modification
 media.published=published
@@ -67,6 +69,8 @@ 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.articles=Articles
 
 medialist.search_text_in=Search text in
 
@@ -117,6 +121,8 @@ comment.html=HTML
 comment.status=Status 
 comment.language=Language
 comment.allcomments=All comments
+comment.comment=Internal Comment
+comment.comment.info=(internal)
 
 comment.operation.hide=hide
 comment.operation.unhide=unhide
@@ -130,8 +136,8 @@ commentlist.allcomments=All comments for this article
 commentlist.search=go!
 commentlist.activate = activate changes
 commentlist.order = order
-commentlist.order.datedesc= date (desc.)
-commentlist.order.dateasc= date (asc.)
+commentlist.order.datedesc= newest first
+commentlist.order.dateasc= oldest first
 commentlist.order.articletitle= article title
 
 commentsearch.field = Search
@@ -140,6 +146,7 @@ commentsearch.field.creator = Author
 commentsearch.field.main_url = Url
 commentsearch.field.email = Email
 commentsearch.field.description = Description
+commentsearch.field.comment = Internal comment
 commentsearch.value = Value
 
 commentsearch.publishedstate = Published state
@@ -182,6 +189,11 @@ content.content=Content
 content.html=HTML
 content.comment=Internal Comment
 content.internal=(internal)
+content.keywords=Keywords
+content.lockedby=Locked by {0}
+content.lock=Lock
+content.unlock=Unlock
+content.forcelock=Force lock
 
 content.attachments=Attachments
 content.images=Images
@@ -220,6 +232,8 @@ content.operation.hide=hide
 content.operation.unhide=unhide
 content.operation.newswire=newswire
 
+content.preview.default = Preview
+
 contentsearch.value = search
 contentsearch.field = field
 contentsearch.field.title = Title
@@ -227,6 +241,7 @@ contentsearch.field.creator = Author
 contentsearch.field.contents=Contents
 contentsearch.field.creator_email = Email
 contentsearch.field.creator_main_url = Web address
+contentsearch.field.comment = Internal comment
 
 contentsearch.publishedstate = publication state
 contentsearch.publishedstate.hidden=hidden
@@ -310,6 +325,8 @@ start.allcommentswithstatus={0}
 
 start.producers.title=GENERATE MANUALLY
 start.producers.produceAllNew=generate all new
+start.producers.recipe.allnew=generate all new
+
 start.producers.advanced=advanced page (use with care!)
 
 start.administer.title=ADMINISTER
@@ -324,7 +341,8 @@ start.addandedit.title=ADD / EDIT
 start.extra.title=EXTRA
 start.search.title=SEARCH
 start.other_media.title=other media
-start.images.title=pictures
+start.images.title=images
+start.images.open_by_id=open image #
 start.video.title=video
 start.audio.title=audio
 start.media.title=MEDIA
@@ -359,6 +377,15 @@ user.oldpassword=Old password
 user.password=Password
 user.password2=Password (confirmation)
 user.admin=Admin
+user.is_disabled=Disabled ?
+user.creationdate=Creation date
+user.lastlogindate=Last login
+user.email=Email address
+user.comment=Comment
+user.profile=Profile
+
+
+
 
 userlist.htmltitle=Users
 
@@ -370,7 +397,14 @@ articletype.name=Name
 
 articletypelist.htmltitle=Article types
 
-
+# mediatypes
+mediatypelist.htmltitle = Manage Mediatypes
+mediatype.id = id
+mediatype.name = Name
+mediatype.htmltitle = Mediatype
+mediatype.mimetype = MIME-Type
+mediatype.classname = Classname
+mediatype.tablename = Tabelname
 
 #commentstatus
 commentstatus.htmltitle=Comment status
@@ -400,12 +434,11 @@ producer.verb.enqueue = enqueue
 producer.job.name = Job
 producer.job.status = Status
 producer.job.date = Last change
-producer.job.cancel = cancel
-producer.job.abort = abort
 producer.job.empty = Queue is empty
 producer.job.runningtime = Running time
 
 producer.jobqueue.canceljobs = Cancel selected jobs
+producer.jobqueue.cancelalljobs = Cancel all pending jobs
 producer.jobqueue.title = Current jobs
 producer.jobqueue.refresh = refresh
 producer.producerlist.title = Add a new job
@@ -418,11 +451,16 @@ superusermenu.htmltitle = Super-user functions
 superusermenu.manage = MANAGE
 superusermenu.topics = topics
 superusermenu.articletypes =  article types
+superusermenu.mediatypes = mediatypes
 superusermenu.comment_statuses =  comment status values
 superusermenu.users =  users
 superusermenu.languages =  languages
 superusermenu.abuse = apply anti-abuse measures
 superusermenu.imcs =  IMCS (obsolete)
+superusermenu.reload=  reload bundles, logging and producers
+
+infomessage.reloadSuccessfull = reload successfull
+infomessage.reloadFailed= An error has occurred while reloading: <br>{0}
 
 
 #abuse
@@ -446,8 +484,15 @@ 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.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 
@@ -458,6 +503,9 @@ 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
@@ -518,4 +566,4 @@ user.error.incorrectpassword= Incorrect password
 
 ########## infomessages ##########
 infomessage.htmltitle = Information
-infomessage.produceAllNewAddedToQueue = Your request has been added to the queue.
+infomessage.recipeAddedToQueue = Your request has been added to the queue.
diff --git a/bundles/admin_es.properties b/bundles/admin_es.properties
index 3c6e48d3..a5f2713d 100755
--- a/bundles/admin_es.properties
+++ b/bundles/admin_es.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: spanish
-# $Id: admin_es.properties,v 1.30 2003/09/03 18:29:00 zapata Exp $
+# $Id: admin_es.properties,v 1.31 2004/11/06 17:39:45 idfx Exp $
 
 languagename = Castellano
 
@@ -25,6 +25,8 @@ delete = borrar
 add = a\u00f1adir
 filter = filtrar
 attach = adjuntar
+# missing (master value = "remove")
+deattach = 
 list = mostrar lista
 back = atr\u00e1s
 cancel = cancelar
@@ -45,8 +47,11 @@ no_matches_found = \u00a1No se encontraron coincidencias!
 list.next = siguiente
 list.previous = anterior
 
+system.status = Situaci\u00f3n:
+system.loggedin = Identificado:
 
 # media - used by image, audio, video and other media
+media.urls = URLs
 media.created = creado
 media.changed = \u00faltima modificaci\u00f3n
 media.published = publicado
@@ -67,6 +72,8 @@ media.is_published = Est\u00e1 publicado
 media.icon = Icono
 media.nr_of_media = N\u00famero de recursos medi\u00e1ticos (m\u00e1ximo 20)
 media.nr_of_media.submit = definir n\u00famero
+media.comments = Comentarios
+media.articles = Art\u00edculos
 
 medialist.search_text_in = Buscar texto en
 
@@ -94,6 +101,7 @@ other_medialist.htmltitle = Lista de recursos medi\u00e1ticos
 # breaking
 breaking.htmltitle = \u00daltimas noticias
 breaking.textinfo = (m\u00e1x. 5 l\u00edneas / 250 caracteres)
+breaking.id = Id
 breaking.text = texto
 breaking.date = fecha
 
@@ -115,6 +123,9 @@ comment.article = Art\u00edculo
 comment.html = HTML
 comment.status = Estado
 comment.language = Idioma
+comment.allcomments = Todos los comentarios
+comment.comment = Comentario Interno
+comment.comment.info = (interno)
 
 comment.operation.hide = ocultar
 comment.operation.unhide = desocultar
@@ -124,8 +135,7 @@ comment.operation.unhide = desocultar
 commentlist.htmltitle = Lista de comentarios
 commentlist.published = publicado
 commentlist.hidden = oculto
-# missing (master value = "All comments for this article")
-commentlist.allcomments = Todos los comentarios de este artículo
+commentlist.allcomments = Todos los comentarios de este art\u00edculo
 commentlist.search = buscar
 commentlist.activate = activar modificaciones
 commentlist.order = orden
@@ -136,7 +146,11 @@ commentlist.order.articletitle = t\u00edtulo del art\u00edculo
 commentsearch.field = Buscar
 commentsearch.field.title = T\u00edtulo
 commentsearch.field.creator = Autor
+commentsearch.field.main_url = URL
+commentsearch.field.email = Correo-e
 commentsearch.field.description = Descripci\u00f3n
+# missing (master value = "Internal comment")
+commentsearch.field.comment = 
 commentsearch.value = Valor
 
 commentsearch.publishedstate = Estado de publicaci\u00f3n
@@ -179,6 +193,11 @@ content.content = Contenido
 content.html = HTML?
 content.comment = Comentario interno
 content.internal = (prop\u00f3sito interno)
+content.keywords = Palabras clave
+content.lockedby = Bloqueado por {0}
+content.lock = Bloquear
+content.unlock = Desbloquear
+content.forcelock = Forzar bloqueo
 
 content.attachments = Adjuntos
 content.images = Im\u00e1genes
@@ -217,12 +236,15 @@ content.operation.hide = ocultar
 content.operation.unhide = desocultar
 content.operation.newswire = newswire
 
-# missing (master value = "search")
 contentsearch.value = buscar
 contentsearch.field = campo
 contentsearch.field.title = T\u00edtulo
 contentsearch.field.creator = Autor
 contentsearch.field.contents = Contenido
+contentsearch.field.creator_email = Correo-e
+contentsearch.field.creator_main_url = Direcci\u00f3n web
+# missing (master value = "Internal comment")
+contentsearch.field.comment = 
 
 contentsearch.publishedstate = estado de publicaci\u00f3n
 contentsearch.publishedstate.hidden = oculto
@@ -246,26 +268,12 @@ contentlist.select = Seleccionar
 
 # language
 language.htmltitle = Idioma
+language.id = Id
 language.name = Idioma
 language.code = C\u00f3digo de idioma
 
 languagelist.htmltitle = Idiomas
 
-
-# imcs
-linkimcs.htmltitle = Enlaces a CMIs
-linkimcs.name = Nombre
-linkimcs.continent = Continente
-linkimcs.new_parent = Nuevo padre
-linkimcs.url = URL
-linkimcs.sort_by = Criterio de ordenaci\u00f3n
-linkimcs.language = Idioma
-linkimcs.parent = Padre
-
-linkimcslist.htmltitle = Lista de enlaces a CMIs
-linkimcslist.search_in = Buscar texto en
-
-
 # login
 login.htmltitle = Entrada
 login.info = Esta zona es accesible exclusivamente a grupos autorizados. Si quieres colaborar como editor, por favor contacta con nosotros en {0}.
@@ -278,6 +286,7 @@ login.submit = Aceptar
 
 # mediafolder
 mediafolder.htmltitle = Carpeta de recursos medi\u00e1ticos
+mediafolder.id = id
 mediafolder.date = fecha
 mediafolder.name = nombre
 mediafolder.location = lugar de origen
@@ -289,6 +298,7 @@ mediafolderlist.htmltitle = Lista de carpetas de recursos medi\u00e1ticos
 
 # message
 message.htmltitle = Mensajes
+message.id = id
 message.date = fecha
 message.title = t\u00edtulo
 message.creator = autor
@@ -300,12 +310,11 @@ messagelist.htmltitle = Lista de mensajes
 # admin start page
 start.htmltitle = Administraci\u00f3n
 
-start.breaking.new = a\u00f1adir \u00faltima noticia
 start.content.new = nuevo art\u00edculo
 start.show = mostrar
-start.open_by_id = ID env\u00edo
+start.comment.open_by_id = comentario abierto n\u00ba
+start.content.open_by_id = art\u00edculo abierto n\u00ba
 
-start.administer.comments = comentarios
 start.content.hidden = art\u00edculos ocultos
 start.content.not_published = art\u00edculos (aun) sin publicar
 start.content.with_media = con recursos medi\u00e1ticos
@@ -315,30 +324,34 @@ start.content.all = Todos los art\u00edculos
 start.content.search = buscar
 
 start.allarticlesoftype = {0}
+start.allcommentswithstatus = {0}
 
 start.producers.title = GENERAR MANUALMENTE
 start.producers.produceAllNew = generar todos los nuevos
+start.producers.recipe.allnew = generar todos los nuevos
+
 start.producers.advanced = p\u00e1gina avanzada (usar con cuidado!)
 
-start.openpostings.title = ENV\u00cdOS ABIERTOS
+start.administer.title = ADMINISTRAR
+start.administer.comments = comentarios
+
 start.comments.title = COMENTARIOS
+
 start.breaking.title = \u00faltimas noticias
-start.content.title = ART\u00cdCULOS
-start.administer.title = ADMINISTRAR
-start.list.title = LISTA
+start.articles.title = ART\u00cdCULOS
 start.fileedit.includes.title = editar ficheros
 start.addandedit.title = A\u00d1ADIR / EDITAR
 start.extra.title = EXTRA
 start.search.title = BUSCAR
-start.topics.title = TEMAS
 start.other_media.title = otros recursos medi\u00e1ticos
 start.images.title = im\u00e1genes
+start.images.open_by_id = imagen abierta n\u00ba
 start.video.title = video
 start.audio.title = audio
 start.media.title = MEDIA
 start.mediafolder.title = carpeta de recursos medi\u00e1ticos
 start.languages.title = IDIOMAS
-start.imcs.title = IMCS
+start.imcs.title = IMCs
 start.messageboard.title = TABL\u00d3N DE AVISOS
 start.messageboard.no_messages = no hay mensajes
 
@@ -346,7 +359,10 @@ start.superusermenu = funciones de super-usuario (usar con cuidado!)
 
 
 # topic
+
 topic.htmltitle = tema
+
+topic.id = id
 topic.title = nombre
 topic.description = descripci\u00f3n
 topic.filename = nombre del fichero
@@ -359,25 +375,43 @@ topiclist.htmltitle = Lista de temas
 # users
 user.htmltitle = Usuario
 user.login = Usuario
+user.ownpassword = Tu propia contrase\u00f1a
+user.oldpassword = Contrase\u00f1a antigua
 user.password = Contrase\u00f1a
 user.password2 = Contrase\u00f1a (confirmaci\u00f3n)
 user.admin = Administrador
+user.is_disabled = Desabilitar?
+user.creationdate = Fecha creaci\u00f3n
+user.lastlogindate = \u00daltimo login
+user.email = Direcci\u00f3n correo-e
+user.comment = Comentario
+user.profile = Perfil
+
+
+
 
 userlist.htmltitle = Lista de usuarios
 
 
 #articletype
 articletype.htmltitle = Tipo de art\u00edculo
-articletype.id = ID
+articletype.id = Id
 articletype.name = Nombre
 
 articletypelist.htmltitle = Lista de tipos de art\u00edculo
 
-
+# mediatypes
+mediatypelist.htmltitle = Gestionar los Tipos de medios
+mediatype.id = Id
+mediatype.name = Nombre
+mediatype.htmltitle = Tipo de medio
+mediatype.mimetype = Tipo MIME
+mediatype.classname = Nombre de clase
+mediatype.tablename = Nombre de tabla
 
 #commentstatus
 commentstatus.htmltitle = Estado de comentario
-commentstatus.id = ID
+commentstatus.id = Id
 commentstatus.name = Nombre
 
 commentstatuslist.htmltitle = Lista de estados de comentario
@@ -403,10 +437,11 @@ producer.verb.enqueue = Poner a la cola
 producer.job.name = Trabajo
 producer.job.status = Estado
 producer.job.date = \u00daltima modificacion
-producer.job.cancel = cancelar
-producer.job.abort = abortar
 producer.job.empty = La cola est\u00e1 vac\u00eda
+producer.job.runningtime = Tiempo ejecut\u00e1ndose
 
+producer.jobqueue.canceljobs = Cancelar trabajos seleccionados
+producer.jobqueue.cancelalljobs = Cancelar todos los trabajos pendientes
 producer.jobqueue.title = Trabajos actuales
 producer.jobqueue.refresh = refrescar
 producer.producerlist.title = A\u00f1adir un nuevo trabajo
@@ -419,11 +454,19 @@ superusermenu.htmltitle = Funciones de super-usuario
 superusermenu.manage = GESTIONAR
 superusermenu.topics = temas
 superusermenu.articletypes = tipos de art\u00edculo
+superusermenu.mediatypes = Tipos de medios
 superusermenu.comment_statuses = valores de estados de comentario
 superusermenu.users = usuarios
 superusermenu.languages = idiomas
 superusermenu.abuse = aplicar medidas antiabuso
 superusermenu.imcs = IMCs (obsoleto)
+# missing (master value = "reload bundles, logging and producers")
+superusermenu.reload = 
+
+# missing (master value = "reload successfull")
+infomessage.reloadSuccessfull = 
+# missing (master value = "An error has occurred while reloading: <br>{0}")
+infomessage.reloadFailed = 
 
 
 #abuse
@@ -437,8 +480,8 @@ abuse.openpostingpassword = Pedir contrase\u00f1a para los env\u00edos abiertos
 abuse.logpostings = Hacer un log de las IPs de los env\u00edos abiertos
 abuse.logsize = Tama\u00f1o del buffer del log
 abuse.cookies = Utilizar cookies para los usuarios bloqueados
-abuse.articleaction = Acción a realizar con un artículo bloqueado
-abuse.commentaction = Acción a realizar con un comentario bloqueado
+abuse.articleaction = Acci\u00f3n a realizar con un art\u00edculo bloqueado
+abuse.commentaction = Acci\u00f3n a realizar con un comentario bloqueado
 
 abuse.showlog = Mostrar el log de IPs
 abuse.showfilters = Gestionar filtros
@@ -447,17 +490,44 @@ abuse.log.time = Hora
 abuse.log.address = N\u00famero de IP
 abuse.log.object = Objeto
 abuse.log.browser = Navegador
+abuse.log.filtertype = Tipo de filtro
+abuse.log.filterexpression = Expresi\u00f3n
 
 abuse.filters = Filtros
+abuse.filters.movedown = abajo
+abuse.filters.moveup = arriba
+# missing (master value = "bottom")
+abuse.filters.movebottom = 
+# missing (master value = "top")
+abuse.filters.movetop = 
+
 abuse.filter.type = Tipos
+abuse.filter.expression = Expresi\u00f3n
+abuse.filter.articleaction = Art\u00edculo
+abuse.filter.commentaction = Comentario
+abuse.filter.comments = Comentarios (uso interno)
+abuse.filter.lasthit = \u00daltimo hit
+abuse.filter.htmltitle = Editar filtro
+
 abuse.filtertype.ip = N\u00famero de IP
 abuse.filtertype.regexp = Expresi\u00f3n regular
-abuse.filter.expression = Expresi\u00f3n
+abuse.filtertype.useragent = Navegador
+# missing (master value = "Throttle")
+abuse.filtertype.throttle = 
+# missing (master value = "Host name")
+abuse.filtertype.hostname = 
 
+abuse.filtererror.title = Error:
+abuse.filtererror.invalidtype = Tipo de filtro inv\u00e1lido
+abuse.filtererror.invalidexpression = Expresi\u00f3n inv\u00e1lida para este tipo
+
+abuse.filters.htmltitle = Reglas de filtro antiabuso
+abuse.log.htmltitle = Log de env\u00edos abiertos antiabuso
 
 # head
 head.start = inicio
 head.logout = salir
+head.changepassword = contrase\u00f1a
 head.help = ayuda
 head.search = buscar
 head.logged_in = identificado
@@ -481,8 +551,6 @@ articletypes.startspecial = Especial de portada
 
 # Comment status values
 commentstatus.normal = normal
-commentstatus.good = bueno
-commentstatus.bad = malo
 
 
 
@@ -501,8 +569,11 @@ media.error.unsupportedformat = El formato del recurso medi\u00e1tico que has su
 user.error.missingpasswords = La nueva contrase\u00f1a debe ser introducida dos veces
 user.error.passwordmismatch = Las contrase\u00f1as no son iguales
 user.error.missingpassword = Es necesario introducir alguna contrase\u00f1a
+user.error.incorrectpassword = Contrase\u00f1a incorrecta
+
+
 
 
 ########## infomessages ##########
 infomessage.htmltitle = Informaci\u00f3n
-infomessage.produceAllNewAddedToQueue = Tu petici\u00f3n se ha a\u00f1adido a la cola.
+infomessage.recipeAddedToQueue = Tu petici\u00f3n ha sido a\u00f1adida a la cola.
diff --git a/bundles/admin_eu.properties b/bundles/admin_eu.properties
index ab37002f..9b62561e 100755
--- a/bundles/admin_eu.properties
+++ b/bundles/admin_eu.properties
@@ -1,26 +1,20 @@
 ########## admin ##########
-# language: euskera / basque
-# $Id: admin_eu.properties,v 1.13 2003/09/03 18:29:00 zapata Exp $
+# language: euskara / basque
+# $Id: admin_eu.properties,v 1.14 2004/11/06 17:39:45 idfx Exp $
 
-languagename = Euskera
+languagename = Euskara
 
 # general
 yes = bai
 no = ez
 dontcare = ez du axola
 all = dena
-# missing (master value = "month")
-month = 
-# missing (master value = "year")
-year = 
-# missing (master value = "file")
-file = 
-# missing (master value = "new")
-new = 
-# missing (master value = "by")
-by = 
-# missing (master value = "help")
-help = 
+month = hilabetea
+year = urtea
+file = fitxategia
+new = berria
+by = nork
+help = laguntza
 
 
 # actions
@@ -36,26 +30,26 @@ back = atzera
 cancel = utzi
 preview = aurrebista
 reset = berrasieratu
-# missing (master value = "administer")
-administer = 
-# missing (master value = "search")
-search = 
+administer = administratu
+search = bilatu
 
 
 # special
-# missing (master value = "fileEdit")
-fileedit = 
+fileedit = fitxategia aldatu
 
 
 # records
 records = sarrerak
-show_from_to = {0}(e)tik {1}(e)ra bitarteko sarrerak erakusten
+show_from_to = {0}-(e)tik {1}-(e)ra bitarteko sarrerak erakusten
 no_matches_found = Ez da horrelako sarrerarik aurkitu!
 list.next = hurrengoa
 list.previous = aurrekoa
 
+system.status = Egoera:
+system.loggedin = Identifikatuta:
 
 # media - used by image, audio, video and other media
+media.urls = URLak
 media.created = sortua
 media.changed = aldatua
 media.published = argitaratua
@@ -69,13 +63,15 @@ media.description = Deskripzioa
 media.date = Data
 media.location = Jatorrizko lekua
 media.creator = Egilea
-media.keywords = Hitz gakoak
+media.keywords = Gako-hitzak
 media.comment = Komentarioa
 media.source = Jatorria
 media.is_published = Argitaratzeko prest
 media.icon = Ikonoa
 media.nr_of_media = Baliabide mediatikoen kopurua
-media.nr_of_media.submit = Aldatu kopurua
+media.nr_of_media.submit = Kopurua aldatu
+media.comments = Komentarioak
+media.articles = Artikuluak
 
 medialist.search_text_in = Testua non bilatu
 
@@ -96,14 +92,14 @@ videolist.htmltitle = Bideo zerrenda
 
 
 # other
-other_media.htmltitle = Baliabide mediatikoen zerrenda
-# missing (master value = "Other media overview")
-other_medialist.htmltitle = 
+other_media.htmltitle = Beste baliabide mediatikoa
+other_medialist.htmltitle = Beste baliabide mediatikoen zerrenda
 
 
 # breaking
 breaking.htmltitle = Azken albisteak
-breaking.textinfo = (gehienez 5 lerrro / 250 letra)
+breaking.textinfo = (gehienez 5 lerro / 250 letra)
+breaking.id = id
 breaking.text = testua
 breaking.date = data
 
@@ -125,77 +121,59 @@ comment.article = Artikuluarena
 comment.html = HTML da?
 comment.status = Egoera
 comment.language = Hizkuntza
+comment.allcomments = Komentario guztiak
+comment.comment = Barne-komentarioa
+comment.comment.info = (barne xederako)
 
-# missing (master value = "hide")
-comment.operation.hide = 
-# missing (master value = "unhide")
-comment.operation.unhide = 
+comment.operation.hide = ezkutatu
+comment.operation.unhide = agertarazi
 
 
 #commentlist
 commentlist.htmltitle = Komentarioen zerrenda
-# missing (master value = "published")
-commentlist.published = 
-commentlist.hidden = izkutua
-# missing (master value = "All comments for this article")
-commentlist.allcomments = 
+commentlist.published = argitaratuta
+commentlist.hidden = ezkutua
+commentlist.allcomments = Artikulu honentzako komentario guztiak
 commentlist.search = bilatu!
-# missing (master value = "activate changes")
-commentlist.activate = 
-# missing (master value = "order")
-commentlist.order = 
-# missing (master value = "date (desc.)")
-commentlist.order.datedesc = 
-# missing (master value = "date (asc.)")
-commentlist.order.dateasc = 
-# missing (master value = "article title")
-commentlist.order.articletitle = 
-
-# missing (master value = "Search")
-commentsearch.field = 
-# missing (master value = "Title")
-commentsearch.field.title = 
-# missing (master value = "Author")
-commentsearch.field.creator = 
-# missing (master value = "Description")
-commentsearch.field.description = 
-# missing (master value = "Value")
-commentsearch.value = 
-
-# missing (master value = "Published state")
-commentsearch.publishedstate = 
-# missing (master value = "Hidden")
-commentsearch.publishedstate.hidden = 
-# missing (master value = "Published")
-commentsearch.publishedstate.published = 
-
-# missing (master value = "Status")
-commentsearch.status = 
-
-# missing (master value = "Order")
-commentsearch.order = 
+commentlist.activate = aldaketak eragin
+commentlist.order = hurrenkera
+commentlist.order.datedesc = berriena lehenengo
+commentlist.order.dateasc = zaharrena lehenengo
+commentlist.order.articletitle = artikuluaren izenburua
+
+commentsearch.field = Bilatu
+commentsearch.field.title = Izenburua
+commentsearch.field.creator = Egilea
+commentsearch.field.main_url = URL
+commentsearch.field.email = E-posta
+commentsearch.field.description = Deskripzioa
+commentsearch.value = Balorea
+
+commentsearch.publishedstate = Argitaraketa-egoera
+commentsearch.publishedstate.hidden = Ezkutua
+commentsearch.publishedstate.published = Argitaratua
+
+commentsearch.status = Egoera
+
+commentsearch.order = Hurrenkera
 commentsearch.order.datedesc = data (behera)
 commentsearch.order.dateasc = data (gora)
-commentsearch.order.articletitle = artikuluaren titulua
+commentsearch.order.articletitle = artikuluaren izenburua
 
-# missing (master value = "Search")
-commentsearch.searchbutton = 
+commentsearch.searchbutton = Bilatu
 
 
 # confirm
 confirm.htmltitle = Ezabaketa baieztatu
 confirm.really_delete = Sarrera hau ezabatu nahi duzu?
-# missing (master value = "This will erase the entry from the database unrecoverably.")
-confirm.text = 
+confirm.text = Honek behin betiko ezabatuko du sarrera datu-basetik.
 
 
 # content
 content.htmltitle = Edukia
 content.owner = Jabea
-# missing (master value = "Language")
-content.language = 
-# missing (master value = "Article type")
-content.articletype = 
+content.language = Hizkuntza
+content.articletype = Artikulu-mota
 content.topic = Gaia
 content.title = Izenburu luzea
 content.subtitle = Azpi-izenburua
@@ -211,6 +189,11 @@ content.content = Edukia
 content.html = HTML da?
 content.comment = Barne komentarioa
 content.internal = (barne xederako)
+content.keywords = Gako-hitzak
+content.lockedby = {0}-(e)k blokeatua
+content.lock = Blokeatu
+content.unlock = Desblokeatu
+content.forcelock = Blokeoa behartu
 
 content.attachments = Atxekiak
 content.images = Irudiak
@@ -219,117 +202,75 @@ content.video = Bideoa
 content.other = Beste baliabide mediatikoak
 content.media = Baliabide mediatikoak
 content.addimage = irudia gehitu
-# missing (master value = "upload image")
-content.uploadimage = 
-content.addaudio = audio gehitu
-# missing (master value = "upload audio")
-content.uploadaudio = 
+content.uploadimage = irudia igo
+content.addaudio = audioa gehitu
+content.uploadaudio = audioa igo
 content.addvideo = bideoa gehitu
-# missing (master value = "upload video")
-content.uploadvideo = 
+content.uploadvideo = bideoa igo
 content.addother = beste baliabide mediatikoa gehitu
-# missing (master value = "upload other media")
-content.uploadother = 
+content.uploadother = beste baliabide mediatikoa igo
 
 content.creationdate = data
 content.modificationdate = azken aldaketa
 content.status = Egoera
-content.type = Artikulu mota
+content.type = Artikulu-mota
 content.import_date = sarreraren data
 content.lastchange_date = azken aldaketa
 content.create_date = data
 content.published = argitaratua
 content.comments = Komentarioak
 
-# missing (master value = "Children & Parents")
-content.family = 
-# missing (master value = "Children")
-content.children = 
-# missing (master value = "view")
-content.viewchildren = 
-# missing (master value = "Parent")
-content.parent = 
-# missing (master value = "view")
-content.viewparent = 
-# missing (master value = "de-select")
-content.clearparent = 
-# missing (master value = "select")
-content.selectparent = 
-
-# missing (master value = "hide")
-content.operation.hide = 
-# missing (master value = "unhide")
-content.operation.unhide = 
-# missing (master value = "newswire")
-content.operation.newswire = 
-
-# missing (master value = "search")
-contentsearch.value = 
-# missing (master value = "field")
-contentsearch.field = 
-# missing (master value = "Title")
-contentsearch.field.title = 
-# missing (master value = "Author")
-contentsearch.field.creator = 
-# missing (master value = "Contents")
-contentsearch.field.contents = 
-
-# missing (master value = "publication state")
-contentsearch.publishedstate = 
-# missing (master value = "hidden")
-contentsearch.publishedstate.hidden = 
-# missing (master value = "published")
-contentsearch.publishedstate.published = 
-
-# missing (master value = "article type")
-contentsearch.articletype = 
-
-# missing (master value = "order by")
-contentsearch.order = 
-# missing (master value = "Newest first")
-contentsearch.order.datedesc = 
-# missing (master value = "Oldest first")
-contentsearch.order.dateasc = 
-# missing (master value = "Title")
-contentsearch.order.title = 
-# missing (master value = "Author")
-contentsearch.order.creator = 
-# missing (master value = "Search")
-contentsearch.searchbutton = 
+content.family = Aita eta Semeak
+content.children = Semeak
+content.viewchildren = ikusi
+content.parent = Gurasoa
+content.viewparent = ikusi
+content.clearparent = aukeraketa kendu
+content.selectparent = aukeratu
+
+content.operation.hide = ezkutatu
+content.operation.unhide = agertarazi
+content.operation.newswire = newswirea
+
+contentsearch.value = bilatu
+contentsearch.field = eremua
+contentsearch.field.title = Izenburua
+contentsearch.field.creator = Egilea
+contentsearch.field.contents = Edukiak
+contentsearch.field.creator_email = E-posta
+contentsearch.field.creator_main_url = Web helbidea
+
+contentsearch.publishedstate = argitaraketa-egoera
+contentsearch.publishedstate.hidden = ezkutua
+contentsearch.publishedstate.published = argitaratua
+
+contentsearch.articletype = artikulu-mota
+
+contentsearch.order = hurrenkera
+contentsearch.order.datedesc = Berriena lehenengo
+contentsearch.order.dateasc = Zaharrena lehenengo
+contentsearch.order.title = Izenburua
+contentsearch.order.creator = Egilea
+contentsearch.searchbutton = Bilatu
 
 
 #contentlist
 contentlist.htmltitle = Edukien zerrenda
 contentlist.comments = komentarioak
-# missing (master value = "Select")
-contentlist.select = 
+contentlist.select = Aukeratu
 
 
 # language
 language.htmltitle = Hizkuntza
+language.id = Id
 language.name = hizkuntza
-language.code = Hizkuntza kodea
+language.code = Hizkuntza-kodea
 
 languagelist.htmltitle = Hizkuntzen zerrenda
 
-
-# imcs
-linkimcs.htmltitle = MIGen loturak
-linkimcs.name = Izena
-linkimcs.continent = Kontinentea
-linkimcs.new_parent = Aita berria
-linkimcs.url = URL
-linkimcs.sort_by = Hurrenkera irizpidea
-linkimcs.language = Hizkuntza
-linkimcs.parent = Aita
-
-linkimcslist.htmltitle = MIGen loturen zerrenda
-linkimcslist.search_in = Testua non bilatu
-
-
 # login
 login.htmltitle = Sarrera
-login.info = Eremu hau baimendutako taldeentzat bakarrik da. Editore lanetan lagundu nahi baduzu, jar zaitez gurekin kontaktuan <a href="mailto:imc-euskalherria-editorial@lists.indymedia.org">imceuskalherria-editorial@lists.indymedia.org</a> helbidean mesedez.
+login.info = Eremu hau baimendutako taldeentzat bakarrik da. Editore lanetan lagundu nahi baduzu, jar zaitez gurekin kontaktuan <a href="mailto:imc-euskalherria-editorial@lists.indymedia.org">imc-euskalherria-editorial@lists.indymedia.org</a> helbidean mesedez.
 login.title = erabiltzailea
 login.name = Erabiltzailea
 login.password = Pasahitza
@@ -339,10 +280,11 @@ login.submit = Ados
 
 # mediafolder
 mediafolder.htmltitle = Baliabide mediatikoen karpeta
+mediafolder.id = id
 mediafolder.date = data
 mediafolder.name = izena
 mediafolder.location = jatorrizko lekua
-mediafolder.keywords = hitz gakoak
+mediafolder.keywords = gako-hitzak
 mediafolder.comment = komentarioa
 
 mediafolderlist.htmltitle = Baliabide mediatikoen karpeten zerrenda
@@ -350,26 +292,24 @@ mediafolderlist.htmltitle = Baliabide mediatikoen karpeten zerrenda
 
 # message
 message.htmltitle = Mezuak
+message.id = id
 message.date = data
 message.title = izenburua
 message.creator = Egilea
 message.text = testua
-message.textinfo = (gehienez 5 lerrro / 250 letra)
+message.textinfo = (gehienez 5 lerro / 250 letra)
 
 messagelist.htmltitle = Mezuen zerrenda
 
 # admin start page
 start.htmltitle = Administrazioa
 
-start.breaking.new = azken albiste berriak
 start.content.new = artikulu berriak
 start.show = Erakutsi
-# missing (master value = "open id")
-start.open_by_id = 
+start.comment.open_by_id = komentario-ireki zenbakia:
+start.content.open_by_id = artikulu-ireki zenbakia:
 
-# missing (master value = "comments")
-start.administer.comments = 
-start.content.hidden = aritukulu ezkutukoak
+start.content.hidden = artikulu ezkutukoak
 start.content.not_published = argitaratzeke dauden artikuluak
 start.content.with_media = baliabide mediatikoekin
 start.content.last_changes = azken aldaketak
@@ -377,46 +317,46 @@ start.content.with_comments = barne xederako komentarioekin
 start.content.all = Artikulu guztiak
 start.content.search = bilatu
 
-start.allarticlesoftype = {0} motatako artikulu guztiak
+start.allarticlesoftype = {0}-motatako artikulu guztiak
+start.allcommentswithstatus = {0}
+
+start.producers.title = Eskuz ekoiztu
+start.producers.produceAllNew = Berri guztia ekoiztu
+start.producers.recipe.allnew = Berri guztia ekoiztu
 
-start.producers.title = Euskuz ekoiztu
-start.producers.produceAllNew = Dena berria ekoiztu
 start.producers.advanced = Aukera arreratuak (kontuz honekin!)
 
-start.openpostings.title = BIDALKETA IREKIAK
+start.administer.title = ADMINISTRATU
+start.administer.comments = komentarioak
+
 start.comments.title = KOMENTARIOAK
-start.breaking.title = AZKEN ALBISTRAK
-start.content.title = ARTIKULUAK
-# missing (master value = "ADMINISTER")
-start.administer.title = 
-# missing (master value = "LIST")
-start.list.title = 
-# missing (master value = "edit include files")
-start.fileedit.includes.title = 
-# missing (master value = "ADD / EDIT")
-start.addandedit.title = 
-# missing (master value = "EXTRA")
-start.extra.title = 
-# missing (master value = "SEARCH")
-start.search.title = 
-start.topics.title = GAIAK
+
+start.breaking.title = AZKEN ALBISTEAK
+start.articles.title = ARTIKULUAK
+start.fileedit.includes.title = include fitxategiak aldatu
+start.addandedit.title = GEHITU / ALDATU
+start.extra.title = EXTRA
+start.search.title = BILAKETA
 start.other_media.title = BESTE MEDIOEN FITXATEGIAK
 start.images.title = IRUDIAK
+start.images.open_by_id = irudi-ireki zenbakia:
 start.video.title = BIDEO FITXATEGIAK
 start.audio.title = AUDIO FITXATEGIAK
-# missing (master value = "MEDIA")
-start.media.title = 
+start.media.title = MEDIA
 start.mediafolder.title = BALIABIDE MEDIATIKOEN ZERRENDA
 start.languages.title = IZENBURUA
 start.imcs.title = MIGak
 start.messageboard.title = Barneko mezuak
 start.messageboard.no_messages = ez dago mezurik
 
-start.superusermenu = Aukera aurreratuak (kontuz honekin!)
+start.superusermenu = Goi-erabiltzaileentzako funtzioak (kontuz honekin!)
 
 
 # topic
+
 topic.htmltitle = Gaia
+
+topic.id = id
 topic.title = Izena
 topic.description = deskripzioa
 topic.filename = Fitxategiaren izena
@@ -429,26 +369,43 @@ topiclist.htmltitle = Gaien zerrenda
 # users
 user.htmltitle = Erabiltzailea
 user.login = erabiltzailea
-user.password = pasahitza
-# missing (master value = "Password (confirmation)")
-user.password2 = 
+user.ownpassword = Zure pasahitza
+user.oldpassword = Pasahitz zaharra
+user.password = Pasahitza
+user.password2 = Pasahitza (berriro)
 user.admin = administratzailea
+user.is_disabled = Ezgaituta?
+user.creationdate = Sorrera-data
+user.lastlogindate = Azken sarketa
+user.email = Posta elektronikoa
+user.comment = Oharra
+user.profile = Profila
+
+
+
 
 userlist.htmltitle = Erabiltzaileen zerrenda
 
 
 #articletype
-articletype.htmltitle = Artikuluen motak
-articletype.id = ID
+articletype.htmltitle = Artikulu-motak
+articletype.id = Id
 articletype.name = Izena
 
-articletypelist.htmltitle = Artikuluen mota zerrenda
-
+articletypelist.htmltitle = Artikulu-moten zerrenda
 
+# mediatypes
+mediatypelist.htmltitle = Media-motak kudeatu
+mediatype.id = Id
+mediatype.name = Izena
+mediatype.htmltitle = Media-mota
+mediatype.mimetype = MIME-mota
+mediatype.classname = Klase izena
+mediatype.tablename = Taula izena
 
 #commentstatus
 commentstatus.htmltitle = Komentarioen egoera
-commentstatus.id = ID
+commentstatus.id = Id
 commentstatus.name = Izena
 
 commentstatuslist.htmltitle = Komentarioen egoeraren zerrenda
@@ -458,29 +415,27 @@ commentstatuslist.htmltitle = Komentarioen egoeraren zerrenda
 #file editing
 fileedit.htmltitle = Fitxategia aldatu
 fileedit.filename = Fitxategiaren izena
-# missing (master value = "Subdirectory")
-fileedit.subdirectory = 
+fileedit.subdirectory = Azpidirektorioa
 
 fileeditlist.htmltitle = Fitxategien aldaketak
 fileeditlist.filename = Fitxategiaren izena
-# missing (master value = "Subdirectory")
-fileeditlist.dirname = 
+fileeditlist.dirname = Azpidirektorioa
 
 
 #producers
 producer.producer = Ekoizlearen izena
 producer.verb.name = Lanaren izena
-producer.verb.description = Lanaren deskribapena
+producer.verb.description = Lanaren deskripzioa
 producer.verb.enqueue = Eskatu
 
 producer.job.name = Lana
 producer.job.status = Egoera
 producer.job.date = azken aldaketa
-producer.job.cancel = ezeztatu
-producer.job.abort = utzi
-# missing (master value = "Queue is empty")
-producer.job.empty = 
+producer.job.empty = Ilada hutsik dago
+producer.job.runningtime = Denbora exekuzioan
 
+producer.jobqueue.canceljobs = Aukeratutako lanak ezeztatu
+producer.jobqueue.cancelalljobs = Egiteke dauden lan guztiak ezeztatu
 producer.jobqueue.title = Oraingo lanak
 producer.jobqueue.refresh = birkargatu
 producer.producerlist.title = Lan berri bat gehitu
@@ -490,71 +445,68 @@ producerqueue.htmltitle = Eskuz ekoiztu
 
 #superusermenu
 superusermenu.htmltitle = Aukera aurreratuak
-# missing (master value = "MANAGE")
-superusermenu.manage = 
+superusermenu.manage = KUDEATU
 superusermenu.topics = Gaien kudeaketa
-superusermenu.articletypes = Artiukuluen moten kudeaketa
+superusermenu.articletypes = Artikulu-moten kudeaketa
+superusermenu.mediatypes = Media-motak
 superusermenu.comment_statuses = Komentarioen egoeraren kudeaketa
-superusermenu.users = Erabiltzailen kudeaketa
+superusermenu.users = Erabiltzaileen kudeaketa
 superusermenu.languages = Hizkuntzen kudeaketa
-# missing (master value = "apply anti-abuse measures")
-superusermenu.abuse = 
+superusermenu.abuse = gehiegikerien aurkako neurriak eragin
 superusermenu.imcs = MIGen zerrendaren kudeaketa (zaharkitua)
 
 
 #abuse
-# missing (master value = "anti-abuse measures")
-abuse.htmltitle = 
-
-# missing (master value = "Setting")
-abuse.setting = 
-# missing (master value = "Value")
-abuse.value = 
-
-# missing (master value = "Turn off open posting")
-abuse.disableopenpostings = 
-# missing (master value = "Require a password for open postings")
-abuse.openpostingpassword = 
-# missing (master value = "Log IPs for open postings")
-abuse.logpostings = 
-# missing (master value = "Logging buffer size")
-abuse.logsize = 
-# missing (master value = "Use cookies for blocked users")
-abuse.cookies = 
-# missing (master value = "Action for blocked article")
-abuse.articleaction = 
-# missing (master value = "Action for blocked comment")
-abuse.commentaction = 
-
-# missing (master value = "Show the IP log")
-abuse.showlog = 
-# missing (master value = "Manage filters")
-abuse.showfilters = 
-
-# missing (master value = "Time")
-abuse.log.time = 
-# missing (master value = "IP number")
-abuse.log.address = 
-# missing (master value = "Object")
-abuse.log.object = 
-# missing (master value = "Browser")
-abuse.log.browser = 
-
-# missing (master value = "Filters")
-abuse.filters = 
-# missing (master value = "Type")
-abuse.filter.type = 
-# missing (master value = "IP Number")
-abuse.filtertype.ip = 
-# missing (master value = "Regular expression")
-abuse.filtertype.regexp = 
-# missing (master value = "Expression")
-abuse.filter.expression = 
-
+abuse.htmltitle = gehiegikerien aurkako neurriak
+
+abuse.setting = Aukera
+abuse.value = Balioa
+
+abuse.disableopenpostings = bidalketa-irekia itxi
+abuse.openpostingpassword = bidalketa-irekientzako pasahitza eskatu
+abuse.logpostings = bidalketa-irekien IPak gorde
+abuse.logsize = Gordetako log-aren tamaina
+abuse.cookies = Blokeatutako erabiltzaileekin cookie-ak erabili
+abuse.articleaction = Blokeatutako artikuluekin egin beharrekoa
+abuse.commentaction = Blokeatutako komentarioekin egin beharrekoa
+
+abuse.showlog = IPen log-a erakutsi
+abuse.showfilters = Iragazkiak kudeatu
+
+abuse.log.time = Ordua
+abuse.log.address = IP zenbakia
+abuse.log.object = Objektua
+abuse.log.browser = Nabigatzaiela
+abuse.log.filtertype = Iragazki-mota
+abuse.log.filterexpression = Espresioa
+
+abuse.filters = Iragazkiak
+abuse.filters.movedown = bera
+abuse.filters.moveup = gora
+
+abuse.filter.type = Motak
+abuse.filter.expression = Espresioa
+abuse.filter.articleaction = Artikulua
+abuse.filter.commentaction = Komentarioa
+abuse.filter.comments = Komentarioak (barne xederako)
+abuse.filter.lasthit = Azken hit-a
+abuse.filter.htmltitle = Iragazkia aldatu
+
+abuse.filtertype.ip = IP Zenbakia
+abuse.filtertype.regexp = Espresio erregularra
+abuse.filtertype.useragent = Nabigatzailea
+
+abuse.filtererror.title = Errakuntza:
+abuse.filtererror.invalidtype = Iragazki-mota okerra
+abuse.filtererror.invalidexpression = Mota honentzako espresio okerra
+
+abuse.filters.htmltitle = Gehiegikerien aurkako iragazki arauak
+abuse.log.htmltitle = Gehiegikerien aurkako bidalketa-irekien log-a
 
 # head
 head.start = hasiera
 head.logout = irten
+head.changepassword = pasahitza
 head.help = laguntza
 head.search = bilatu
 head.logged_in = erregistraturik zaude
@@ -570,45 +522,35 @@ foot.top = gora
 
 
 # Article types
-articletypes.openposting = bidalitako mezu ireki bat
-articletypes.newswire = newswire
-articletypes.feature = azalakoa
-articletypes.topicspecial = gaiaz berezia
-articletypes.startspecial = berezia
+articletypes.openposting = bidalketa-irekia
+articletypes.newswire = newswirea
+articletypes.feature = azalekoa
+articletypes.topicspecial = gaiko berezia
+articletypes.startspecial = azaleko berezia
 
 # Comment status values
-# missing (master value = "normal")
-commentstatus.normal = 
-# missing (master value = "good")
-commentstatus.good = 
-# missing (master value = "bad")
-commentstatus.bad = 
+commentstatus.normal = normala
 
 
 
 ########## error ##########
 error.htmltitle = Errakuntza
 error.title = Iep! Errakuntza bat gertatu da
-error.text = Ondoren datorren mezak agian ez dizu askorik lagunduko, baina seguraski <a href="mailto:{0}">{1}</a>koei bai.
-error.text2 = Mesedez, mezu bat bidali <a href="mailto:{0}">{1}</a>ra <font color="Red">gorriz agertzen den testuarekin</font> eta egiten ari zinenaren azalpen zehatzarekin. Eskerrik asko!
+error.text = Ondoren datorren mezuak agian ez dizu askorik lagunduko, baina seguraski <a href="mailto:{0}">{1}</a>koei bai.
+error.text2 = Mesedez, bidali posta elektronikoko mezu bat <a href="mailto:{0}">{1}</a>ra <font color="Red">gorriz agertzen den testuarekin</font> eta egiten ari zinenaren azalpenarekin (fitxategia igotzen, artikulua bidaltzen, komentarioa bidaltzen, bilaketa egiten...). Eskerrik asko!
 
 usererror.htmltitle = Errakuntza datuetan
 usererror.title = Arranopola! Errakuntza bat gertatu da
 usererror.text = Sartu dituzun datuek ondoko errakuntza sortarazi dute:
 usererror.what_to_do = Mesedez, sakatu atzera botoia eta saiatu berriz
 
-# missing (master value = "The format of the media you uploaded is not supported")
-media.error.unsupportedformat = 
-# missing (master value = "The new password must be entered twice")
-user.error.missingpasswords = 
-# missing (master value = "The passwords are not equal")
-user.error.passwordmismatch = 
-# missing (master value = "A password must be entered")
-user.error.missingpassword = 
+media.error.unsupportedformat = Igo duzun baliabide mediatikoaren formatuarekin ez dugu lan egiten
+user.error.missingpasswords = Pasahitz berria birritan sartu beharra dago
+user.error.passwordmismatch = Pasahitzak ez dira berdinak
+user.error.missingpassword = Pasahitz bat sartu beharra dago
+user.error.incorrectpassword = Pasahitza okerra da
 
 
 ########## infomessages ##########
 infomessage.htmltitle = Oharra
-infomessage.produceAllNewAddedToQueue = Lana zerrendan sartuta
-
-########## HTML-charset ##########
+infomessage.recipeAddedToQueue = Zure eskaria ilarara gehitu da
diff --git a/bundles/admin_fr.properties b/bundles/admin_fr.properties
index 58844a8d..52c61083 100755
--- a/bundles/admin_fr.properties
+++ b/bundles/admin_fr.properties
@@ -367,7 +367,15 @@ articletype.name = Nom
 
 articletypelist.htmltitle = Types d'articles
 
-
+# mediatypes
+### needs translation
+mediatypelist.htmltitle = Manage Mediatypes
+mediatype.id = id
+mediatype.name = Name
+mediatype.htmltitle = Mediatype
+mediatype.mimetype = MIME-Type
+mediatype.classname = Classname
+mediatype.tablename = Tabelname
 
 #commentstatus
 commentstatus.htmltitle = Commenter le statut
@@ -413,6 +421,7 @@ superusermenu.htmltitle = Fonctions Super-Utilisateur
 superusermenu.manage = G\u00c9RER
 superusermenu.topics = Th\u00e8mes
 superusermenu.articletypes = Types d'articles
+superusermenu.mediatypes = Types de media
 superusermenu.comment_statuses = Commenter les valeurs du statut
 superusermenu.users = Utilisateurs
 superusermenu.languages = Langues
diff --git a/bundles/admin_gz.properties b/bundles/admin_gz.properties
index 5d8a72c5..3bc96b1c 100755
--- a/bundles/admin_gz.properties
+++ b/bundles/admin_gz.properties
@@ -1,514 +1,525 @@
-########## admin ##########
-# language: galician
-# $Id: admin_gz.properties,v 1.3 2003/09/03 18:29:00 zapata Exp $
-
-languagename = Galego
-
-# general
-yes = s\u00ed
-no = non
-dontcare = non importa
-all = todo
-month = mes
-year = a\u00f1o
-file = ficheiro
-new = novo
-by = por
-help = axuda
-
-
-# actions
-insert = inserir
-save = gardar
-edit = editar
-delete = borrar
-add = engadir
-filter = filtrar
-attach = adjuntar
-list = mostrar lista
-back = atr\u00e1s
-cancel = cancelar
-preview = previsualizar
-reset = resetar
-administer = administrar
-search = buscar
-
-
-# special
-fileedit = editar ficheiro
-
-
-# records
-records = rexistros
-show_from_to = mostrando entradas dende {0} ate {1}
-no_matches_found = \u00a1Non se encontraron coincidencias!
-list.next = seguinte
-list.previous = anterior
-
-
-# media - used by image, audio, video and other media
-media.created = creado
-media.changed = \u00faltima modificaci\u00f3n
-media.published = publicado
-media.format = Formato
-media.rights = Dereitos de autor
-media.type = Tipo
-media.mediafolder = Carpeta de recursos medi\u00e1ticos
-media.title = T\u00edtulo
-media.size = Tama\u00f1o
-media.description = Descripci\u00f3n
-media.date = Data
-media.location = Lugar de orixe
-media.creator = Autor
-media.keywords = Palabras chave
-media.comment = Comentario (de uso interno)
-media.source = Orixen
-media.is_published = Est\u00e1 publicado
-media.icon = Icona
-media.nr_of_media = N\u00famero de recursos medi\u00e1ticos (m\u00e1ximo 20)
-media.nr_of_media.submit = definir n\u00famero
-
-medialist.search_text_in = Buscar texto en
-
-
-# image
-image.htmltitle = Imaxe
-imagelist.htmltitle = Lista de imaxes
-
-
-# audio
-audio.htmltitle = Audio
-audiolist.htmltitle = Lista de audio
-
-
-# video
-video.htmltitle = Video
-videolist.htmltitle = Lista de video
-
-
-# other
-other_media.htmltitle = Otros recursos medi\u00e1ticos
-other_medialist.htmltitle = Lista de recursos medi\u00e1ticos
-
-
-# breaking
-breaking.htmltitle = \u00daltimas noticias
-breaking.textinfo = (m\u00e1x. 5 l\u00edneas / 250 caracteres)
-breaking.text = texto
-breaking.date = data
-
-breakinglist.htmltitle = Listado de \u00faltimas novas
-
-
-# comment
-comment.htmltitle = Comentario
-comment.date = Data
-comment.title = T\u00edtulo
-comment.published = Publicado
-comment.text = Texto do comentario
-comment.address = Direcci\u00f3n
-comment.phone = Tel\u00e9fono
-comment.email = Correo electr\u00f3nico
-comment.url = URL
-comment.creator = Autor
-comment.article = Art\u00edculo
-comment.html = HTML
-comment.status = Estado
-comment.language = Idioma
-
-comment.operation.hide = agachar
-comment.operation.unhide = desagachar
-
-
-#commentlist
-commentlist.htmltitle = Lista de comentarios
-commentlist.published = publicado
-commentlist.hidden = oculto
-# missing (master value = "All comments for this article")
-commentlist.allcomments = Todos os comentarios deste artículo
-commentlist.search = buscar
-commentlist.activate = activar modificacions
-commentlist.order = orde
-commentlist.order.datedesc = data (desc.)
-commentlist.order.dateasc = data (asc.)
-commentlist.order.articletitle = t\u00edtulo do artigo
-
-commentsearch.field = Buscar
-commentsearch.field.title = T\u00edtulo
-commentsearch.field.creator = Autor
-commentsearch.field.description = Descripci\u00f3n
-commentsearch.value = Valor
-
-commentsearch.publishedstate = Estado de publicaci\u00f3n
-commentsearch.publishedstate.hidden = Oculto
-commentsearch.publishedstate.published = Publicado
-
-commentsearch.status = Estado
-
-commentsearch.order = Orden
-commentsearch.order.datedesc = fecha (desc.)
-commentsearch.order.dateasc = fecha (asc.)
-commentsearch.order.articletitle = t\u00edtulo do artigo
-
-commentsearch.searchbutton = Buscar
-
-
-# confirm
-confirm.htmltitle = Confirmar borrado
-confirm.really_delete = \u00bfQueres borrar esta entrada?
-confirm.text = Esto borrar\u00e1 a entrada da base de datos definitivamente.
-
-
-# content
-content.htmltitle = Artigo 
-content.owner = Propietario
-content.language = Idioma
-content.articletype = Tipo de artigo
-content.topic = Tema
-content.title = T\u00edtulo largo
-content.subtitle = Subt\u00edtulo 
-content.edittitle = T\u00edtulo contextualizador
-content.location = Lugar de orixe
-content.creator = Autor
-content.creator.email = Correo electr\u00f3nico
-content.creator.url = Direcci\u00f3n web
-content.creator.address = Direcci\u00f3n
-content.creator.telephone = Tel\u00e9fono
-content.abstract = Descripci\u00f3n breve
-content.content = Contido
-content.html = HTML?
-content.comment = Comentario interno
-content.internal = (prop\u00f3sito interno)
-
-content.attachments = Adxuntos
-content.images = Images
-content.audio = Audio
-content.video = Video
-content.other = Outros recursos medi\u00e1ticos
-content.media = Recursos medi\u00e1ticos
-content.addimage = engadir imaxe
-content.uploadimage = subir imaxe
-content.addaudio = a\u00f1adir audio
-content.uploadaudio = subir audio
-content.addvideo = engadir video
-content.uploadvideo = subir video
-content.addother = engadir outro recurso medi\u00e1tico
-content.uploadother = subir outro recurso medi\u00e1tico
-
-content.creationdate = data
-content.modificationdate = \u00faltima modificaci\u00f3n
-content.status = Estado
-content.type = Tipo de artigo
-content.import_date = Data de importaci\u00f3n
-content.lastchange_date = Data da \u00faltima modificaci\u00f3n
-content.create_date = Data
-content.published = publicado
-content.comments = comentarios
-
-content.family = Ascendentes e descendentes
-content.children = Descendentes
-content.viewchildren = ver
-content.parent = Ascendentes
-content.viewparent = ver
-content.clearparent = deselecionar
-content.selectparent = selecionar
-
-content.operation.hide = ocultar
-content.operation.unhide = desocultar
-content.operation.newswire = novas
-
-# missing (master value = "search")
-contentsearch.value = buscar
-contentsearch.field = campo
-contentsearch.field.title = T\u00edtulo
-contentsearch.field.creator = Autor
-contentsearch.field.contents = Contido
-
-contentsearch.publishedstate = estado de publicaci\u00f3n
-contentsearch.publishedstate.hidden = oculto
-contentsearch.publishedstate.published = publicado
-
-contentsearch.articletype = Tipo de artigo
-
-contentsearch.order = ordear por
-contentsearch.order.datedesc = Novos primero
-contentsearch.order.dateasc = Antigos primero
-contentsearch.order.title = T\u00edtulo
-contentsearch.order.creator = Autor
-contentsearch.searchbutton = Buscar
-
-
-#contentlist
-contentlist.htmltitle = Artigos
-contentlist.comments = Comentarios
-contentlist.select = Selecionar
-
-
-# language
-language.htmltitle = Idioma
-language.name = Idioma
-language.code = C\u00f3digo de idioma
-
-languagelist.htmltitle = Idiomas
-
-
-# imcs
-linkimcs.htmltitle = Enlaces a IMCs
-linkimcs.name = Nome
-linkimcs.continent = Continente
-linkimcs.new_parent = Novo ascendente
-linkimcs.url = URL
-linkimcs.sort_by = Criterio de ordenaci\u00f3n
-linkimcs.language = Idioma
-linkimcs.parent = Ascendente
-
-linkimcslist.htmltitle = Lista de ligas a IMCs
-linkimcslist.search_in = Buscar texto en
-
-
-# login
-login.htmltitle = Entrada
-login.info = Esta zona é accesibel exclusivamente para grupos
-autorizados. Se queres colaborar como editor, por favor contacta com
-nós em  {0}.
-login.title = nome
-login.name = Nome
-login.password = Chave
-login.language = Idioma
-login.submit = Aceptar
-
-
-# mediafolder
-mediafolder.htmltitle = Carpeta de recursos medi\u00e1ticos
-mediafolder.date = data
-mediafolder.name = nome
-mediafolder.location = lugar de orixe
-mediafolder.keywords = palabras chave
-mediafolder.comment = comentario
-
-mediafolderlist.htmltitle = Lista de carpetas de recursos medi\u00e1ticos
-
-
-# message
-message.htmltitle = Mensaxes
-message.date = data
-message.title = t\u00edtulo
-message.creator = autor
-message.text = texto
-message.textinfo = (m\u00e1x. 5 l\u00edneas / 250 caracteres)
-
-messagelist.htmltitle = Lista de mensaxes
-
-# admin start page
-start.htmltitle = Administraci\u00f3n
-
-start.breaking.new = engadir \u00faltima nova
-start.content.new = nuevo art\u00edculo
-start.show = mostrar
-start.open_by_id = ID env\u00edo
-
-start.administer.comments = comentarios
-start.content.hidden = artigos ocultos
-start.content.not_published = artigos (ainda) sen publicar
-start.content.with_media = con recursos medi\u00e1ticos
-start.content.last_changes = \u00faltimas modificacions
-start.content.with_comments = con comentarios internos
-start.content.all = Todos os art\u00edculos
-start.content.search = buscar
-
-start.allarticlesoftype = {0}
-
-start.producers.title = GERAR MANUALMENTE
-start.producers.produceAllNew = gerar todos os novos
-start.producers.advanced = p\u00e1gina avanzada (coidadinho!)
-
-start.openpostings.title = ENV\u00cdOS ABIERTOS
-start.comments.title = COMENTARIOS
-start.breaking.title = \u00faltimas novas
-start.content.title = ART\u00cdCULOS
-start.administer.title = ADMINISTRAR
-start.list.title = LISTA
-start.fileedit.includes.title = editar ficheros
-start.addandedit.title = A\u00d1ADIR / EDITAR
-start.extra.title = EXTRA
-start.search.title = BUSCAR
-start.topics.title = TEMAS
-start.other_media.title = otros recursos medi\u00e1ticos
-start.images.title = im\u00e1genes
-start.video.title = video
-start.audio.title = audio
-start.media.title = MEDIA
-start.mediafolder.title = carpeta de recursos medi\u00e1ticos
-start.languages.title = IDIOMAS
-start.imcs.title = IMCS
-start.messageboard.title = TABL\u00d3N DE AVISOS
-start.messageboard.no_messages = no hay mensajes
-
-start.superusermenu = funcions de super-usuario (usar con cuidado!)
-
-
-# topic
-topic.htmltitle = tema
-topic.title = nome
-topic.description = descripci\u00f3n
-topic.filename = nome del ficheiro
-topic.main_url = p\u00e1gina de informaci\u00f3n principal
-topic.archive_url = URL do ficheiro
-
-topiclist.htmltitle = Lista de temas
-
-
-# users
-user.htmltitle = Usuario
-user.login = Usuario
-user.password = chave
-user.password2 = chave (confirmaci\u00f3n)
-user.admin = Administrador
-
-userlist.htmltitle = Lista de usuarios
-
-
-#articletype
-articletype.htmltitle = Tipo de art\u00edculo
-articletype.id = ID
-articletype.name = Nome
-
-articletypelist.htmltitle = Lista de tipos de art\u00edculo
-
-
-
-#commentstatus
-commentstatus.htmltitle = Estado de comentario
-commentstatus.id = ID
-commentstatus.name = Nombre
-
-commentstatuslist.htmltitle = Lista de estados de comentario
-
-
-
-#file editing
-fileedit.htmltitle = Edici\u00f3n de ficheiro
-fileedit.filename = Nombre de ficheiro
-fileedit.subdirectory = Subdirectorio
-
-fileeditlist.htmltitle = Ficheiros editables
-fileeditlist.filename = Nome de ficheiro
-fileeditlist.dirname = Subdirectorio
-
-
-#producers
-producer.producer = Nome de productor
-producer.verb.name = Nome de tarefa
-producer.verb.description = Descripci\u00f3n de tarefa
-producer.verb.enqueue = Ponher á cola
-
-producer.job.name = Trabalho
-producer.job.status = Estado
-producer.job.date = \u00daltima modificacion
-producer.job.cancel = cancelar
-producer.job.abort = abortar
-producer.job.empty = A cola est\u00e1 valeira
-
-producer.jobqueue.title = Trabalhos actuais
-producer.jobqueue.refresh = refrescar
-producer.producerlist.title = Engadir un novo trabalho
-
-producerqueue.htmltitle = Generar manualmente
-
-
-#superusermenu
-superusermenu.htmltitle = Funciones de super-usuario
-superusermenu.manage = GESTIONAR
-superusermenu.topics = temas
-superusermenu.articletypes = tipos de art\u00edculo
-superusermenu.comment_statuses = valores de estados de comentario
-superusermenu.users = usuarios
-superusermenu.languages = idiomas
-superusermenu.abuse = aplicar medidas antiabuso
-superusermenu.imcs = IMCs (obsoleto)
-
-
-#abuse
-abuse.htmltitle = medidas antiabuso
-
-abuse.setting = Opci\u00f3n
-abuse.value = Valor
-
-abuse.disableopenpostings = Desabilitar os env\u00edos abierta
-abuse.openpostingpassword = Pedir contrase\u00f1a para los env\u00edos abiertos
-abuse.logpostings = Fazer log das IPs dos env\u00edos abiertos
-abuse.logsize = Tama\u00f1o do buffer do log
-abuse.cookies = Utilizar cookies para os usuarios bloqueados
-abuse.articleaction = Acción a realizar cun artículo bloqueado
-abuse.commentaction = Acción a realizar cun comentario bloqueado
-
-abuse.showlog = Mostrar log de IPs
-abuse.showfilters = Gestionar filtros
-
-abuse.log.time = Hora
-abuse.log.address = N\u00famero de IP
-abuse.log.object = Objeto
-abuse.log.browser = Navegador
-
-abuse.filters = Filtros
-abuse.filter.type = Tipos
-abuse.filtertype.ip = N\u00famero de IP
-abuse.filtertype.regexp = Expresi\u00f3n regular
-abuse.filter.expression = Expresi\u00f3n
-
-
-# head
-head.start = inicio
-head.logout = salir
-head.help = ajuda
-head.search = buscar
-head.logged_in = identificado
-
-# foot
-foot.top = arriba
-
-
-########## dynamic values ##########
-
-# (users can add new types, how to translate these)
-# suggestion if not in bundle use value as Text
-
-
-# Article types
-articletypes.openposting = env\u00edo abierto
-articletypes.newswire = newswire
-articletypes.feature = Titular
-articletypes.topicspecial = Especial de un tema
-articletypes.startspecial = Especial de portada
-
-# Comment status values
-commentstatus.normal = normal
-commentstatus.good = bon
-commentstatus.bad = malo
-
-
-
-########## error ##########
-error.htmltitle = Error no sistema
-error.title = Produciuse un error no sistema
-error.text = Pode pasar. Ainda que a seguinte mensaxe sexa pouco
-entendible para tí, pode selo para <a href="mailto:{0}">{1}</a>:
-error.text2 = Por tanto, env\u00eda por favor unha mensaxe co <font color="Red">texto que aparece en vermelho</font> e umha descripci\u00f3n lo m\u00e1s detallada posible das circunstancias baixo as que se produciu el error a <a href="mailto:{0}">{1}</a>. \u00a1Gracias!
-
-usererror.htmltitle = Error de datos
-usererror.title = Error de datos
-usererror.text = Os datos que introduciches causaron o seguinte erro:
-usererror.what_to_do = Por favor, pulsa el bot\u00f3n atr\u00e1s e tentao de novo
-
-media.error.unsupportedformat = O formato do recurso medi\u00e1tico que subiches non est\u00e1 soportado
-user.error.missingpasswords = A nova chave debe ser introducida duass veces
-user.error.passwordmismatch = As chaves non son iguales
-user.error.missingpassword = E preciso introducir algumha chave
-
-
-########## infomessages ##########
-infomessage.htmltitle = Informaci\u00f3n
-infomessage.produceAllNewAddedToQueue = Petici\u00f3n engadida a cola.
-
-########## HTML-charset ##########
-htmlcharset = iso-8859-15
+########## admin ##########
+# language: galician
+# $Id: admin_gz.properties,v 1.4 2004/11/06 17:39:45 idfx Exp $
+
+languagename = Galego
+
+# general
+yes = s\u00ed
+no = non
+dontcare = non importa
+all = todo
+month = mes
+year = a\u00f1o
+file = ficheiro
+new = novo
+by = por
+help = axuda
+
+
+# actions
+insert = inserir
+save = gardar
+edit = editar
+delete = borrar
+add = engadir
+filter = filtrar
+attach = adjuntar
+list = mostrar lista
+back = atr\u00e1s
+cancel = cancelar
+preview = previsualizar
+reset = resetar
+administer = administrar
+search = buscar
+
+
+# special
+fileedit = editar ficheiro
+
+
+# records
+records = rexistros
+show_from_to = mostrando entradas dende {0} ate {1}
+no_matches_found = \u00a1Non se encontraron coincidencias!
+list.next = seguinte
+list.previous = anterior
+
+
+# media - used by image, audio, video and other media
+media.created = creado
+media.changed = \u00faltima modificaci\u00f3n
+media.published = publicado
+media.format = Formato
+media.rights = Dereitos de autor
+media.type = Tipo
+media.mediafolder = Carpeta de recursos medi\u00e1ticos
+media.title = T\u00edtulo
+media.size = Tama\u00f1o
+media.description = Descripci\u00f3n
+media.date = Data
+media.location = Lugar de orixe
+media.creator = Autor
+media.keywords = Palabras chave
+media.comment = Comentario (de uso interno)
+media.source = Orixen
+media.is_published = Est\u00e1 publicado
+media.icon = Icona
+media.nr_of_media = N\u00famero de recursos medi\u00e1ticos (m\u00e1ximo 20)
+media.nr_of_media.submit = definir n\u00famero
+
+medialist.search_text_in = Buscar texto en
+
+
+# image
+image.htmltitle = Imaxe
+imagelist.htmltitle = Lista de imaxes
+
+
+# audio
+audio.htmltitle = Audio
+audiolist.htmltitle = Lista de audio
+
+
+# video
+video.htmltitle = Video
+videolist.htmltitle = Lista de video
+
+
+# other
+other_media.htmltitle = Otros recursos medi\u00e1ticos
+other_medialist.htmltitle = Lista de recursos medi\u00e1ticos
+
+
+# breaking
+breaking.htmltitle = \u00daltimas noticias
+breaking.textinfo = (m\u00e1x. 5 l\u00edneas / 250 caracteres)
+breaking.text = texto
+breaking.date = data
+
+breakinglist.htmltitle = Listado de \u00faltimas novas
+
+
+# comment
+comment.htmltitle = Comentario
+comment.date = Data
+comment.title = T\u00edtulo
+comment.published = Publicado
+comment.text = Texto do comentario
+comment.address = Direcci\u00f3n
+comment.phone = Tel\u00e9fono
+comment.email = Correo electr\u00f3nico
+comment.url = URL
+comment.creator = Autor
+comment.article = Art\u00edculo
+comment.html = HTML
+comment.status = Estado
+comment.language = Idioma
+
+comment.operation.hide = agachar
+comment.operation.unhide = desagachar
+
+
+#commentlist
+commentlist.htmltitle = Lista de comentarios
+commentlist.published = publicado
+commentlist.hidden = oculto
+# missing (master value = "All comments for this article")
+commentlist.allcomments = Todos os comentarios deste artículo
+commentlist.search = buscar
+commentlist.activate = activar modificacions
+commentlist.order = orde
+commentlist.order.datedesc = data (desc.)
+commentlist.order.dateasc = data (asc.)
+commentlist.order.articletitle = t\u00edtulo do artigo
+
+commentsearch.field = Buscar
+commentsearch.field.title = T\u00edtulo
+commentsearch.field.creator = Autor
+commentsearch.field.description = Descripci\u00f3n
+commentsearch.value = Valor
+
+commentsearch.publishedstate = Estado de publicaci\u00f3n
+commentsearch.publishedstate.hidden = Oculto
+commentsearch.publishedstate.published = Publicado
+
+commentsearch.status = Estado
+
+commentsearch.order = Orden
+commentsearch.order.datedesc = fecha (desc.)
+commentsearch.order.dateasc = fecha (asc.)
+commentsearch.order.articletitle = t\u00edtulo do artigo
+
+commentsearch.searchbutton = Buscar
+
+
+# confirm
+confirm.htmltitle = Confirmar borrado
+confirm.really_delete = \u00bfQueres borrar esta entrada?
+confirm.text = Esto borrar\u00e1 a entrada da base de datos definitivamente.
+
+
+# content
+content.htmltitle = Artigo 
+content.owner = Propietario
+content.language = Idioma
+content.articletype = Tipo de artigo
+content.topic = Tema
+content.title = T\u00edtulo largo
+content.subtitle = Subt\u00edtulo 
+content.edittitle = T\u00edtulo contextualizador
+content.location = Lugar de orixe
+content.creator = Autor
+content.creator.email = Correo electr\u00f3nico
+content.creator.url = Direcci\u00f3n web
+content.creator.address = Direcci\u00f3n
+content.creator.telephone = Tel\u00e9fono
+content.abstract = Descripci\u00f3n breve
+content.content = Contido
+content.html = HTML?
+content.comment = Comentario interno
+content.internal = (prop\u00f3sito interno)
+
+content.attachments = Adxuntos
+content.images = Images
+content.audio = Audio
+content.video = Video
+content.other = Outros recursos medi\u00e1ticos
+content.media = Recursos medi\u00e1ticos
+content.addimage = engadir imaxe
+content.uploadimage = subir imaxe
+content.addaudio = a\u00f1adir audio
+content.uploadaudio = subir audio
+content.addvideo = engadir video
+content.uploadvideo = subir video
+content.addother = engadir outro recurso medi\u00e1tico
+content.uploadother = subir outro recurso medi\u00e1tico
+
+content.creationdate = data
+content.modificationdate = \u00faltima modificaci\u00f3n
+content.status = Estado
+content.type = Tipo de artigo
+content.import_date = Data de importaci\u00f3n
+content.lastchange_date = Data da \u00faltima modificaci\u00f3n
+content.create_date = Data
+content.published = publicado
+content.comments = comentarios
+
+content.family = Ascendentes e descendentes
+content.children = Descendentes
+content.viewchildren = ver
+content.parent = Ascendentes
+content.viewparent = ver
+content.clearparent = deselecionar
+content.selectparent = selecionar
+
+content.operation.hide = ocultar
+content.operation.unhide = desocultar
+content.operation.newswire = novas
+
+# missing (master value = "search")
+contentsearch.value = buscar
+contentsearch.field = campo
+contentsearch.field.title = T\u00edtulo
+contentsearch.field.creator = Autor
+contentsearch.field.contents = Contido
+
+contentsearch.publishedstate = estado de publicaci\u00f3n
+contentsearch.publishedstate.hidden = oculto
+contentsearch.publishedstate.published = publicado
+
+contentsearch.articletype = Tipo de artigo
+
+contentsearch.order = ordear por
+contentsearch.order.datedesc = Novos primero
+contentsearch.order.dateasc = Antigos primero
+contentsearch.order.title = T\u00edtulo
+contentsearch.order.creator = Autor
+contentsearch.searchbutton = Buscar
+
+
+#contentlist
+contentlist.htmltitle = Artigos
+contentlist.comments = Comentarios
+contentlist.select = Selecionar
+
+
+# language
+language.htmltitle = Idioma
+language.name = Idioma
+language.code = C\u00f3digo de idioma
+
+languagelist.htmltitle = Idiomas
+
+
+# imcs
+linkimcs.htmltitle = Enlaces a IMCs
+linkimcs.name = Nome
+linkimcs.continent = Continente
+linkimcs.new_parent = Novo ascendente
+linkimcs.url = URL
+linkimcs.sort_by = Criterio de ordenaci\u00f3n
+linkimcs.language = Idioma
+linkimcs.parent = Ascendente
+
+linkimcslist.htmltitle = Lista de ligas a IMCs
+linkimcslist.search_in = Buscar texto en
+
+
+# login
+login.htmltitle = Entrada
+login.info = Esta zona é accesibel exclusivamente para grupos
+autorizados. Se queres colaborar como editor, por favor contacta com
+nós em  {0}.
+login.title = nome
+login.name = Nome
+login.password = Chave
+login.language = Idioma
+login.submit = Aceptar
+
+
+# mediafolder
+mediafolder.htmltitle = Carpeta de recursos medi\u00e1ticos
+mediafolder.date = data
+mediafolder.name = nome
+mediafolder.location = lugar de orixe
+mediafolder.keywords = palabras chave
+mediafolder.comment = comentario
+
+mediafolderlist.htmltitle = Lista de carpetas de recursos medi\u00e1ticos
+
+
+# message
+message.htmltitle = Mensaxes
+message.date = data
+message.title = t\u00edtulo
+message.creator = autor
+message.text = texto
+message.textinfo = (m\u00e1x. 5 l\u00edneas / 250 caracteres)
+
+messagelist.htmltitle = Lista de mensaxes
+
+# admin start page
+start.htmltitle = Administraci\u00f3n
+
+start.breaking.new = engadir \u00faltima nova
+start.content.new = nuevo art\u00edculo
+start.show = mostrar
+start.open_by_id = ID env\u00edo
+
+start.administer.comments = comentarios
+start.content.hidden = artigos ocultos
+start.content.not_published = artigos (ainda) sen publicar
+start.content.with_media = con recursos medi\u00e1ticos
+start.content.last_changes = \u00faltimas modificacions
+start.content.with_comments = con comentarios internos
+start.content.all = Todos os art\u00edculos
+start.content.search = buscar
+
+start.allarticlesoftype = {0}
+
+start.producers.title = GERAR MANUALMENTE
+start.producers.produceAllNew = gerar todos os novos
+start.producers.advanced = p\u00e1gina avanzada (coidadinho!)
+
+start.openpostings.title = ENV\u00cdOS ABIERTOS
+start.comments.title = COMENTARIOS
+start.breaking.title = \u00faltimas novas
+start.content.title = ART\u00cdCULOS
+start.administer.title = ADMINISTRAR
+start.list.title = LISTA
+start.fileedit.includes.title = editar ficheros
+start.addandedit.title = A\u00d1ADIR / EDITAR
+start.extra.title = EXTRA
+start.search.title = BUSCAR
+start.topics.title = TEMAS
+start.other_media.title = otros recursos medi\u00e1ticos
+start.images.title = im\u00e1genes
+start.video.title = video
+start.audio.title = audio
+start.media.title = MEDIA
+start.mediafolder.title = carpeta de recursos medi\u00e1ticos
+start.languages.title = IDIOMAS
+start.imcs.title = IMCS
+start.messageboard.title = TABL\u00d3N DE AVISOS
+start.messageboard.no_messages = no hay mensajes
+
+start.superusermenu = funcions de super-usuario (usar con cuidado!)
+
+
+# topic
+topic.htmltitle = tema
+topic.title = nome
+topic.description = descripci\u00f3n
+topic.filename = nome del ficheiro
+topic.main_url = p\u00e1gina de informaci\u00f3n principal
+topic.archive_url = URL do ficheiro
+
+topiclist.htmltitle = Lista de temas
+
+
+# users
+user.htmltitle = Usuario
+user.login = Usuario
+user.password = chave
+user.password2 = chave (confirmaci\u00f3n)
+user.admin = Administrador
+
+userlist.htmltitle = Lista de usuarios
+
+
+#articletype
+articletype.htmltitle = Tipo de art\u00edculo
+articletype.id = ID
+articletype.name = Nome
+
+articletypelist.htmltitle = Lista de tipos de art\u00edculo
+
+# mediatypes
+### needs translation
+mediatypelist.htmltitle = Manage Mediatypes
+mediatype.id = id
+mediatype.name = Name
+mediatype.htmltitle = Mediatype
+mediatype.mimetype = MIME-Type
+mediatype.classname = Classname
+mediatype.tablename = Tabelname
+
+
+
+#commentstatus
+commentstatus.htmltitle = Estado de comentario
+commentstatus.id = ID
+commentstatus.name = Nombre
+
+commentstatuslist.htmltitle = Lista de estados de comentario
+
+
+
+#file editing
+fileedit.htmltitle = Edici\u00f3n de ficheiro
+fileedit.filename = Nombre de ficheiro
+fileedit.subdirectory = Subdirectorio
+
+fileeditlist.htmltitle = Ficheiros editables
+fileeditlist.filename = Nome de ficheiro
+fileeditlist.dirname = Subdirectorio
+
+
+#producers
+producer.producer = Nome de productor
+producer.verb.name = Nome de tarefa
+producer.verb.description = Descripci\u00f3n de tarefa
+producer.verb.enqueue = Ponher á cola
+
+producer.job.name = Trabalho
+producer.job.status = Estado
+producer.job.date = \u00daltima modificacion
+producer.job.cancel = cancelar
+producer.job.abort = abortar
+producer.job.empty = A cola est\u00e1 valeira
+
+producer.jobqueue.title = Trabalhos actuais
+producer.jobqueue.refresh = refrescar
+producer.producerlist.title = Engadir un novo trabalho
+
+producerqueue.htmltitle = Generar manualmente
+
+
+#superusermenu
+superusermenu.htmltitle = Funciones de super-usuario
+superusermenu.manage = GESTIONAR
+superusermenu.topics = temas
+superusermenu.articletypes = tipos de art\u00edculo
+superusermenu.mediatypes = Mediatypes
+superusermenu.comment_statuses = valores de estados de comentario
+superusermenu.users = usuarios
+superusermenu.languages = idiomas
+superusermenu.abuse = aplicar medidas antiabuso
+superusermenu.imcs = IMCs (obsoleto)
+
+
+#abuse
+abuse.htmltitle = medidas antiabuso
+
+abuse.setting = Opci\u00f3n
+abuse.value = Valor
+
+abuse.disableopenpostings = Desabilitar os env\u00edos abierta
+abuse.openpostingpassword = Pedir contrase\u00f1a para los env\u00edos abiertos
+abuse.logpostings = Fazer log das IPs dos env\u00edos abiertos
+abuse.logsize = Tama\u00f1o do buffer do log
+abuse.cookies = Utilizar cookies para os usuarios bloqueados
+abuse.articleaction = Acción a realizar cun artículo bloqueado
+abuse.commentaction = Acción a realizar cun comentario bloqueado
+
+abuse.showlog = Mostrar log de IPs
+abuse.showfilters = Gestionar filtros
+
+abuse.log.time = Hora
+abuse.log.address = N\u00famero de IP
+abuse.log.object = Objeto
+abuse.log.browser = Navegador
+
+abuse.filters = Filtros
+abuse.filter.type = Tipos
+abuse.filtertype.ip = N\u00famero de IP
+abuse.filtertype.regexp = Expresi\u00f3n regular
+abuse.filter.expression = Expresi\u00f3n
+
+
+# head
+head.start = inicio
+head.logout = salir
+head.help = ajuda
+head.search = buscar
+head.logged_in = identificado
+
+# foot
+foot.top = arriba
+
+
+########## dynamic values ##########
+
+# (users can add new types, how to translate these)
+# suggestion if not in bundle use value as Text
+
+
+# Article types
+articletypes.openposting = env\u00edo abierto
+articletypes.newswire = newswire
+articletypes.feature = Titular
+articletypes.topicspecial = Especial de un tema
+articletypes.startspecial = Especial de portada
+
+# Comment status values
+commentstatus.normal = normal
+commentstatus.good = bon
+commentstatus.bad = malo
+
+
+
+########## error ##########
+error.htmltitle = Error no sistema
+error.title = Produciuse un error no sistema
+error.text = Pode pasar. Ainda que a seguinte mensaxe sexa pouco
+entendible para tí, pode selo para <a href="mailto:{0}">{1}</a>:
+error.text2 = Por tanto, env\u00eda por favor unha mensaxe co <font color="Red">texto que aparece en vermelho</font> e umha descripci\u00f3n lo m\u00e1s detallada posible das circunstancias baixo as que se produciu el error a <a href="mailto:{0}">{1}</a>. \u00a1Gracias!
+
+usererror.htmltitle = Error de datos
+usererror.title = Error de datos
+usererror.text = Os datos que introduciches causaron o seguinte erro:
+usererror.what_to_do = Por favor, pulsa el bot\u00f3n atr\u00e1s e tentao de novo
+
+media.error.unsupportedformat = O formato do recurso medi\u00e1tico que subiches non est\u00e1 soportado
+user.error.missingpasswords = A nova chave debe ser introducida duass veces
+user.error.passwordmismatch = As chaves non son iguales
+user.error.missingpassword = E preciso introducir algumha chave
+
+
+########## infomessages ##########
+infomessage.htmltitle = Informaci\u00f3n
+infomessage.produceAllNewAddedToQueue = Petici\u00f3n engadida a cola.
+
+########## HTML-charset ##########
+htmlcharset = iso-8859-15
diff --git a/bundles/admin_it.properties b/bundles/admin_it.properties
index 427b01cd..6fe2526c 100755
--- a/bundles/admin_it.properties
+++ b/bundles/admin_it.properties
@@ -1,6 +1,6 @@
 ########## admin #######
 # language: italiano
-# $Id: admin_it.properties,v 1.2 2003/09/03 18:29:00 zapata Exp $
+# $Id: admin_it.properties,v 1.3 2004/11/06 17:39:45 idfx Exp $
 
 # missing (master value = "English")
 languagename = italiano
@@ -353,7 +353,7 @@ start.messageboard.title = colonna messaggi interni
 start.messageboard.no_messages = non ci sono messaggi
 
 # missing (master value = "super-user functions (use with care!)")
-start.superusermenu = 
+start.superusermenu =
 
 
 # topic
@@ -387,7 +387,19 @@ articletype.id =
 articletype.name = 
 
 # missing (master value = "Article types")
-articletypelist.htmltitle = 
+articletypelist.htmltitle =
+
+# mediatypes
+### needs translation
+mediatypelist.htmltitle = Manage Mediatypes
+mediatype.id = id
+mediatype.name = Name
+mediatype.htmltitle = Mediatype
+mediatype.mimetype = MIME-Type
+mediatype.classname = Classname
+mediatype.tablename = Tabelname
+
+
 
 
 
@@ -445,7 +457,9 @@ superusermenu.manage =
 # missing (master value = "topics")
 superusermenu.topics = 
 # missing (master value = "article types")
-superusermenu.articletypes = 
+superusermenu.articletypes =
+superusermenu.mediatypes = Mediatypes
+
 # missing (master value = "comment status values")
 superusermenu.comment_statuses = 
 # missing (master value = "users")
@@ -576,4 +590,4 @@ infomessage.produceAllNewAddedToQueue = la tua richiesta \u008e stata aggiunta a
 ########## HTML-charset ##########
 # missing (master value = "utf-8")
 htmlcharset = 
-
+
diff --git a/bundles/admin_nl.properties b/bundles/admin_nl.properties
index 8a33f383..ec906b20 100755
--- a/bundles/admin_nl.properties
+++ b/bundles/admin_nl.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: dutch
-# $Id: admin_nl.properties,v 1.9 2003/09/03 18:29:00 zapata Exp $
+# $Id: admin_nl.properties,v 1.10 2004/11/06 17:39:45 idfx Exp $
 
 languagename = Nederlands
 
@@ -371,6 +371,15 @@ articletype.name = Naam
 
 articletypelist.htmltitle = Overzicht artikel-soorten
 
+# mediatypes
+### needs translation
+mediatypelist.htmltitle = Manage Mediatypes
+mediatype.id = id
+mediatype.name = Name
+mediatype.htmltitle = Mediatype
+mediatype.mimetype = MIME-Type
+mediatype.classname = Classname
+mediatype.tablename = Tabelname
 
 
 #commentstatus
@@ -417,6 +426,7 @@ superusermenu.htmltitle = Super-user functies
 superusermenu.manage = BEHEER
 superusermenu.topics = Onderwerpen beheren
 superusermenu.articletypes = Artikel-soorten beheren
+superusermenu.mediatypes = Media-soorten beheren
 superusermenu.comment_statuses = Commentaar status waarden beheren
 superusermenu.users = Gebruikers beheren
 superusermenu.languages = Talen beheren
diff --git a/bundles/admin_pt.properties b/bundles/admin_pt.properties
index 215ad106..c5d53926 100755
--- a/bundles/admin_pt.properties
+++ b/bundles/admin_pt.properties
@@ -1,6 +1,6 @@
-########## admin ##########
+# ######### admin ##########
 # language: portuguese
-# $Id: admin_pt.properties,v 1.6 2003/09/03 18:29:00 zapata Exp $
+# $Id: admin_pt.properties,v 1.7 2004/11/06 17:39:45 idfx Exp $
 
 languagename = Portugu\u00eas
 
@@ -25,6 +25,7 @@ delete = delete
 add = adicionar
 filter = filtro
 attach = anexar
+deattach = remover
 list = navegador
 back = voltar
 cancel = cancelar
@@ -45,13 +46,16 @@ no_matches_found = Sem ocorr\u00eancias de $string
 list.next = pr\u00f3ximo
 list.previous = anterior
 
+system.status = Status:
+system.loggedin = Conectado:
 
 # media - used by image, audio, video and other media
+media.urls = Endere\u00e3os web
 media.created = criado
 media.changed = \u00faltima modifica\u00e7\u00e3o
 media.published = publicado
 media.format = formato
-media.rights = Status do copyright 
+media.rights = Status do copyright
 media.type = tipo
 media.mediafolder = Arquivo de m\u00eddia
 media.title = t\u00edtulo
@@ -67,6 +71,8 @@ media.is_published = publicado
 media.icon = \u00edcone
 media.nr_of_media = N\u00famero de \u00cdtens de M\u00eddia(m\u00e1x 20)
 media.nr_of_media.submit = define n\u00famero
+media.comments = Coment\u00e1rios
+media.articles = Artigos
 
 medialist.search_text_in = Procure pelo texto em
 
@@ -94,6 +100,7 @@ other_medialist.htmltitle = Other media overview
 # breaking
 breaking.htmltitle = \u00daltimas not\u00edcias
 breaking.textinfo = (m\u00e1x. 5 linhas / 250 characters)
+breaking.id = id
 breaking.text = texto
 breaking.date = data
 
@@ -113,8 +120,11 @@ comment.url = URL
 comment.creator = Autor(a)
 comment.article = Artigo
 comment.html = HTML?
-comment.status = Status 
+comment.status = Status
 comment.language = L\u00edngua
+comment.allcomments = Todos os coment\u00e1rios
+comment.comment = Coment\u00e1rio interno
+comment.comment.info = (interno)
 
 comment.operation.hide = esconder
 comment.operation.unhide = des-esconder
@@ -135,7 +145,10 @@ commentlist.order.articletitle = t\u00edtulo do artigo
 commentsearch.field = Busca
 commentsearch.field.title = T\u00edtulo
 commentsearch.field.creator = Autor
+commentsearch.field.main_url = Endere\u00e3o web
+commentsearch.field.email = Email
 commentsearch.field.description = Descri\u00e7\u00e3o
+commentsearch.field.comment = Coment\u00e1rio interno
 commentsearch.value = Valor
 
 commentsearch.publishedstate = Data de publica\u00e7\u00e3o
@@ -165,7 +178,7 @@ content.language = L\u00edngua
 content.articletype = Tipo de artigo
 content.topic = Assunto
 content.title = T\u00edtulo longo
-content.subtitle = Sub-t\u00edtulo 
+content.subtitle = Sub-t\u00edtulo
 content.edittitle = Conte\u00fado do t\u00edtulo
 content.location = Localiza\u00e7\u00e3o
 content.creator = Autor(a)
@@ -178,8 +191,15 @@ content.content = Conte\u00fado
 content.html = HTML?
 content.comment = Coment\u00e1rio Interno
 content.internal = (interno)
-
-content.attachments = Arquivos atribuidos
+content.keywords = Palavras chaves
+content.lockedby = Travado por {0}
+# missing (master value = "Lock")
+content.lock = Travar
+content.unlock = Destravar
+# missing (master value = "Force lock")
+content.forcelock = Forcar travar
+
+content.attachments = Arquivos anexados
 content.images = Imagens
 content.audio = \u00c1udio
 content.video = V\u00eddeo
@@ -216,11 +236,17 @@ content.operation.hide = esconder
 content.operation.unhide = des-esconder
 content.operation.newswire = newswire
 
+# missing (master value = "Preview")
+content.preview.default = Pre-visualizacao
+
 contentsearch.value = busca
 contentsearch.field = campo
 contentsearch.field.title = T\u00edtulo
 contentsearch.field.creator = Autor
 contentsearch.field.contents = Conte\u00fado
+contentsearch.field.creator_email = Email
+contentsearch.field.creator_main_url = Endere\u00e3o web
+contentsearch.field.comment = Coment\u00e1rio Interno
 
 contentsearch.publishedstate = estado da publica\u00e7\u00e3o
 contentsearch.publishedstate.hidden = escondido
@@ -244,6 +270,7 @@ contentlist.select = selecionar
 
 # language
 language.htmltitle = L\u00ednguas
+language.id = Id
 language.name = L\u00edngua
 language.code = Linguagem do c\u00f3digo
 
@@ -261,6 +288,7 @@ login.submit = OK
 
 # mediafolder
 mediafolder.htmltitle = mediafolder
+mediafolder.id = id
 mediafolder.date = data
 mediafolder.name = nome
 mediafolder.location = localiza\u00e7\u00e3o
@@ -272,6 +300,7 @@ mediafolderlist.htmltitle = lista dos arquivos de m\u00eddia
 
 # message
 message.htmltitle = mensagens
+message.id = id
 message.date = data
 message.title = t\u00edtulo
 message.creator = Autor(a)
@@ -285,33 +314,40 @@ start.htmltitle = administra\u00e7\u00e3o
 
 start.content.new = novo artigo
 start.show = mostrar
-start.open_by_id = abrir no.
+start.comment.open_by_id = ver coment\u00e1rio #
+start.content.open_by_id = ver artigo #
 
 start.content.hidden = esconder artigos
 start.content.not_published = artigos que (ainda) n\u00e3o foram publicados
 start.content.with_media = com m\u00eddia
-start.content.last_changes = \u00faltimas mudan\u00e7as 
-start.content.with_comments = com coment\u00e1rios internos 
+start.content.last_changes = \u00faltimas mudan\u00e7as
+start.content.with_comments = com coment\u00e1rios internos
 start.content.all = todos artigos
 start.content.search = busca
 
 start.allarticlesoftype = Mostre todos "{0}" artigos
+start.allcommentswithstatus = {0}
 
 start.producers.title = GENERATE MANUALLY
 start.producers.produceAllNew = Generate all new
+start.producers.recipe.allnew = gerar todos os novos
+
 start.producers.advanced = Advanced page (use com cuidado!)
 
 start.administer.title = ADMINISTRAR
 start.administer.comments = coment\u00e1rios
 
+start.comments.title = COMENT\u00c1RIOS
+
 start.breaking.title = \u00daLTIMAS NOT\u00cdCIAS
-start.list.title = LISTAR
+start.articles.title = ARTIGOS
 start.fileedit.includes.title = editar aquivos de inclus\u00e3o
 start.addandedit.title = ADICIONAR / EDITAR
 start.extra.title = EXTRA
 start.search.title = BUSCAR
 start.other_media.title = OUTRA M\u00cdDIA
 start.images.title = FOTOS
+start.images.open_by_id = ver imagem #
 start.video.title = V\u00cdDEO
 start.audio.title = \u00c1UDIO
 start.media.title = M\u00cdDIA
@@ -325,34 +361,55 @@ start.superusermenu = Super-user functions (use com cuidado!)
 
 
 # topic
+
 topic.htmltitle = assunto
+
+topic.id = id
 topic.title = Nome
 topic.description = descri\u00e7\u00e3o
-topic.filename = Nome do arquivo 
+topic.filename = Nome do arquivo
 topic.main_url = p\u00e1gina principal de informa\u00e7\u00e3o
 topic.archive_url = Arquivar url
 
-topiclist.htmltitle = lisa de assuntos 
+topiclist.htmltitle = lisa de assuntos
 
 
 # users
 user.htmltitle = Usu\u00e1rio
 user.login = Login
+user.ownpassword = Sua pr\u00f3pria senha
+user.oldpassword = Senha antiga
 user.password = Senha
 user.password2 = Repita a senha
 user.admin = Administra\u00e7\u00e3o
+user.is_disabled = Desabilitado?
+user.creationdate = Data de cria\u00e7\u00e3o
+user.lastlogindate = \u00faltima data de conex\u00e3o
+user.email = Endere\u00e3o de email
+user.comment = Coment\u00e1rio
+user.profile = Perfil
+
+
+
 
 userlist.htmltitle = Usu\u00e1rios
 
 
 #articletype
-articletype.htmltitle = Tipo de artigo 
+articletype.htmltitle = Tipo de artigo
 articletype.id = identidade
 articletype.name = Nome
 
 articletypelist.htmltitle = Tipo de artigos
 
-
+# mediatypes
+mediatypelist.htmltitle = Manage Mediatypes
+mediatype.id = id
+mediatype.name = Name
+mediatype.htmltitle = Mediatype
+mediatype.mimetype = MIME-Type
+mediatype.classname = Classname
+mediatype.tablename = Tabelname
 
 #commentstatus
 commentstatus.htmltitle = Status dos coment\u00e1rios
@@ -382,10 +439,11 @@ producer.verb.enqueue = enqueue
 producer.job.name = Job
 producer.job.status = Status
 producer.job.date = \u00daltima modifica\u00e7\u00e3o
-producer.job.cancel = cancelar
-producer.job.abort = abortar
 producer.job.empty = Fila vazia
+producer.job.runningtime = Tempo de execu\u00e7\u00e3o
 
+producer.jobqueue.canceljobs = Cancelar os trabalhos selecionados
+producer.jobqueue.cancelalljobs = Cancelar todos os trabalho pendentes
 producer.jobqueue.title = Current jobs
 producer.jobqueue.refresh = refresh
 producer.producerlist.title = Add a new job
@@ -398,11 +456,16 @@ superusermenu.htmltitle = fun\u00e7\u00f5es dos super-usu\u00e1rios
 superusermenu.manage = ADMINISTRAR
 superusermenu.topics = Manuten\u00e7\u00e3o dos assuntos
 superusermenu.articletypes = Manuten\u00e7\u00e3o dos tipos de artigos
+superusermenu.mediatypes = Mediatypes
 superusermenu.comment_statuses = Manuten\u00e7\u00e3o comment status values
 superusermenu.users = Manuten\u00e7\u00e3o de usu\u00e1rios
 superusermenu.languages = Manuten\u00e7\u00e3o de l\u00ednguas
 superusermenu.abuse = aplicar medidas anti-abuso
 superusermenu.imcs = Manuten\u00e7\u00e3o de CMIs (absoleto)
+superusermenu.reload = recarregar pacotes, registros e produtores
+
+infomessage.reloadSuccessfull = recarregamento exitoso
+infomessage.reloadFailed = Um erro ocorreu ao recarregar: <br>{0}
 
 
 #abuse
@@ -426,17 +489,41 @@ abuse.log.time = tempo
 abuse.log.address = n\u00famero IP
 abuse.log.object = Objeto
 abuse.log.browser = Browser
+abuse.log.filtertype = Tipo de filtro
+abuse.log.filterexpression = Express\u00e3o
 
 abuse.filters = Filtros
+abuse.filters.movedown = baixo
+abuse.filters.moveup = cima
+abuse.filters.movebottom = fim
+abuse.filters.movetop = topo
+
 abuse.filter.type = Tipo
+abuse.filter.expression = Express\u00e3o
+abuse.filter.articleaction = Artigo
+abuse.filter.commentaction = Coment\u00e1rio
+abuse.filter.comments = Coment\u00e1rios internos
+abuse.filter.lasthit = \u00faltimo acesso
+abuse.filter.htmltitle = Filtro de edi\u00e7\u00e3o
+
 abuse.filtertype.ip = N\u00famero IP
 abuse.filtertype.regexp = Express\u00e3o Regular
-abuse.filter.expression = Express\u00e3o
+abuse.filtertype.useragent = Browser utilizado
+# missing (master value = "Throttle")
+abuse.filtertype.throttle = Regulador
+abuse.filtertype.hostname = Nome do host
+
+abuse.filtererror.title = Erro:
+abuse.filtererror.invalidtype = Tipo de filtro inv\u00e1lido
+abuse.filtererror.invalidexpression = Express\u00e3o inv\u00e1lida para esse tipo
 
+abuse.filters.htmltitle = Regras de filtros anti-abuso
+abuse.log.htmltitle = Registros anti-abuso da publica\u00e7\u00e3o aberta
 
 # head
 head.start = come\u00e7ar
 head.logout = desconectar
+head.changepassword = senha
 head.help = ajuda
 head.search = busca
 head.logged_in = conectado
@@ -460,8 +547,6 @@ articletypes.startspecial = Startpage-special
 
 # Comment status values
 commentstatus.normal = Normal
-commentstatus.good = Bom
-commentstatus.bad = Mau
 
 
 
@@ -471,7 +556,7 @@ error.title = O sistema causou um erro
 error.text = Isto pode acontecer. Mesmo se voc\u00ea n\u00e3o entender a mensagem de erro, ela pode ajudar muito o <a href="mailto:{0}">{1}</a>:
 error.text2 = Enta\u00f5 por favor mande um email com o <font color="Red">texto em vermelho</font> e coloque informa\u00e7\u00f5es detalhadas sobre o que que aconteceu para chegar a este erro <a href="mailto:{0}">{1}</a>. Obrigada!
 
-usererror.htmltitle = validation error
+usererror.htmltitle = erro de valida\u00e7\u00e3o
 usererror.title = Validation error
 usererror.text = Sua entrada causou o seguinte erro:
 usererror.what_to_do = Por favor pressione a tecla de retorno e tente novamente
@@ -480,8 +565,11 @@ media.error.unsupportedformat = O formato do arquivo que voc\u00ea enviou n\u00e
 user.error.missingpasswords = A nova senha deve ser digitada duas vezes
 user.error.passwordmismatch = As senhas n\u00e3o s\u00e3o iguais
 user.error.missingpassword = Uma senha deve ser digitada
+user.error.incorrectpassword = Senha incorreta
+
+
 
 
 ########## infomessages ##########
 infomessage.htmltitle = Informa\u00e7\u00e3o
-infomessage.produceAllNewAddedToQueue = Seu pedido foi adicionado a fila.
+infomessage.recipeAddedToQueue = Seu pedido foi adicionado a fila.
diff --git a/bundles/admin_ro.properties b/bundles/admin_ro.properties
index e059655f..75ed3e3c 100755
--- a/bundles/admin_ro.properties
+++ b/bundles/admin_ro.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: romanian
-# $Id: admin_ro.properties,v 1.1 2004/11/06 15:59:50 idfx Exp $
+# $Id: admin_ro.properties,v 1.2 2004/11/06 17:39:45 idfx Exp $
 
 languagename=Romana
 
diff --git a/bundles/admin_sv.properties b/bundles/admin_sv.properties
index ec64b43f..d319e042 100755
--- a/bundles/admin_sv.properties
+++ b/bundles/admin_sv.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: svenska
-# $Id: admin_sv.properties,v 1.7 2003/09/03 18:29:00 zapata Exp $
+# $Id: admin_sv.properties,v 1.8 2004/11/06 17:39:45 idfx Exp $
 
 languagename=Svenska
 
@@ -275,6 +275,19 @@ articletype.name=Namn
 
 articletypelist.htmltitle=Artikel typer
 
+# mediatypes
+### needs translation
+mediatypelist.htmltitle = Manage Mediatypes
+mediatype.id = id
+mediatype.name = Name
+mediatype.htmltitle = Mediatype
+mediatype.mimetype = MIME-Type
+mediatype.classname = Classname
+mediatype.tablename = Tabelname
+
+
+
+
 commentstatus.htmltitle=Kommentar status
 commentstatus.id=id
 commentstatus.name=Namn
@@ -311,6 +324,7 @@ producerqueue.htmltitle = Skapa manuellt
 superusermenu.htmltitle = Super-anv&auml;ndarfunktioner
 superusermenu.topics = Behandla teman
 superusermenu.articletypes = Behandla artikeltyper
+superusermenu.mediatypes = Mediatypes
 superusermenu.comment_statuses = Behandla kommentarstatus v&auml;rden
 superusermenu.users = Behandla anv&auml;ndare
 superusermenu.languages = Behandla spr&aring;k
diff --git a/bundles/admin_tr.properties b/bundles/admin_tr.properties
index b078499a..5c1f4f6c 100755
--- a/bundles/admin_tr.properties
+++ b/bundles/admin_tr.properties
@@ -1,5 +1,5 @@
 ########## admin ##########
-# $Id: admin_tr.properties,v 1.12 2003/04/28 01:57:14 zapata Exp $
+# $Id: admin_tr.properties,v 1.13 2004/11/06 17:39:45 idfx Exp $
 
 languagename = T\u00fcrk\u00e7e
 
@@ -433,7 +433,7 @@ start.messageboard.title = Dahili Mesajpanosu
 start.messageboard.no_messages = mesaj yok
 
 # missing (master value = "super-user functions (use with care!)")
-start.superusermenu = 
+start.superusermenu =
 
 
 # topic
@@ -467,8 +467,17 @@ articletype.id =
 articletype.name = 
 
 # missing (master value = "Article types")
-articletypelist.htmltitle = 
+articletypelist.htmltitle =
 
+# mediatypes
+### needs translation
+mediatypelist.htmltitle = Manage Mediatypes
+mediatype.id = id
+mediatype.name = Name
+mediatype.htmltitle = Mediatype
+mediatype.mimetype = MIME-Type
+mediatype.classname = Classname
+mediatype.tablename = Tabelname
 
 
 #commentstatus
@@ -542,7 +551,8 @@ superusermenu.manage =
 # missing (master value = "topics")
 superusermenu.topics = 
 # missing (master value = "article types")
-superusermenu.articletypes = 
+superusermenu.articletypes =
+superusermenu.mediatypes = Mediatypes
 # missing (master value = "comment status values")
 superusermenu.comment_statuses = 
 # missing (master value = "users")
diff --git a/bundles/admin_zh.properties b/bundles/admin_zh.properties
index f8f7ff76..456a6aa3 100755
--- a/bundles/admin_zh.properties
+++ b/bundles/admin_zh.properties
@@ -1,6 +1,6 @@
 ########## admin ##########
 # language: english
-# $Id: admin_zh.properties,v 1.2 2003/04/09 02:06:06 zapata Exp $
+# $Id: admin_zh.properties,v 1.3 2004/11/06 17:39:45 idfx Exp $
 
 
 languagename = Chinese
@@ -285,6 +285,17 @@ articletype.name = Name
 
 articletypelist.htmltitle = Article types
 
+# mediatypes
+### needs translation
+mediatypelist.htmltitle = Manage Mediatypes
+mediatype.id = id
+mediatype.name = Name
+mediatype.htmltitle = Mediatype
+mediatype.mimetype = MIME-Type
+mediatype.classname = Classname
+mediatype.tablename = Tabelname
+
+
 commentstatus.htmltitle = Comment status
 commentstatus.id = id
 commentstatus.name = Name
@@ -332,6 +343,7 @@ producerqueue.htmltitle = \u624b\u52d5\u7522\u751f
 superusermenu.htmltitle = Super-user functions
 superusermenu.topics = Manage topics
 superusermenu.articletypes = Manage article types
+superusermenu.mediatypes = Mediatypes
 superusermenu.comment_statuses = Manage comment status values
 superusermenu.users = Manage users
 superusermenu.languages = Manage languages
diff --git a/dbscripts/create_pg.sql b/dbscripts/create_pg.sql
index 5dcdbc72..31fba74c 100755
--- a/dbscripts/create_pg.sql
+++ b/dbscripts/create_pg.sql
@@ -76,14 +76,18 @@ CREATE SEQUENCE "webdb_users_id_seq" start 1 increment 1 maxvalue 2147483647 min
 
 CREATE TABLE "webdb_users" (
 	"id" integer DEFAULT nextval('webdb_users_id_seq'::text) NOT NULL,
-	"login" character varying(16) NOT NULL,
+	"login" character varying(16) UNIQUE NOT NULL,
 	"password" character varying(255) NOT NULL,
 	"is_admin" boolean DEFAULT '0' NOT NULL,
 	"comment" text,
-	Constraint "webdb_users_pkey" Primary Key ("id")
+	"is_disabled" boolean DEFAULT '0' NOT NULL,
+	"email" character varying(255) DEFAULT '' NOT NULL,
+	"profile" text,
+	"webdb_create"  timestamp with time zone NOT NULL,
+	"lastlogin"  timestamp with time zone,
+	CONSTRAINT "webdb_users_pkey" Primary Key ("id")
 );
 
-CREATE  INDEX "idx_webdb_user_log_pas_is_admin" on "webdb_users" using btree ( "login" "varchar_ops", "password" "varchar_ops", "is_admin" "bool_ops" );
 
 --
 -- article type
@@ -105,7 +109,7 @@ CREATE SEQUENCE "topic_id_seq" start 1 increment 1 maxvalue 2147483647 minvalue
 
 CREATE TABLE "topic" (
 	"id" integer DEFAULT nextval('topic_id_seq'::text) NOT NULL,
-	"parent_id" integer,
+	"parent_id" integer DEFAULT '0' NOT NULL,
 	"title" character varying(80) NOT NULL,
 	"description" text,
 	"filename" character varying(20) NOT NULL,
@@ -115,7 +119,6 @@ CREATE TABLE "topic" (
 );
 
 CREATE        INDEX "idx_topic_title" on "topic"           using btree ( "title" "varchar_ops" );
-CREATE UNIQUE INDEX "idx_topic_id"    on "topic"           using btree ( "id" "int4_ops" );
 
 
 -- 
@@ -150,16 +153,14 @@ CREATE TABLE "comment" (
   "to_language" integer DEFAULT '0' NOT NULL,
   "to_media" integer NOT NULL,
   "to_comment_status" smallint,
-  "checksum" integer,
+	"comment" text,
   "is_html" boolean DEFAULT '0' NOT NULL,
   Constraint "comment_pkey" Primary Key ("id")
 );
 
-CREATE        INDEX "comment_checksum_index" on "comment" using btree ( "checksum" "int4_ops" );
 CREATE        INDEX "idx_comment_to_media" on "comment" using btree ( "to_media" "int4_ops" );
 CREATE        INDEX idx_comment_webdb_create on comment(webdb_create);
 CREATE        INDEX "idx_comment_tomedia_ispublished" on "comment" using btree ( "to_media" "int4_ops", "is_published" "bool_ops" );
-CREATE UNIQUE INDEX "idx_comment_id" on "comment" using btree ( "id" "int4_ops" );
 
 
 
@@ -177,7 +178,12 @@ CREATE UNIQUE INDEX "idx_comment_id" on "comment" using btree ( "id" "int4_ops"
 --
 
 CREATE SEQUENCE "media_id_seq" start 1 increment 1 maxvalue 2147483647 minvalue 1  cache 1 ;
-CREATE TABLE "media" (
+
+--
+-- uploaded_media
+--
+
+CREATE TABLE "uploaded_media" (
 	"id" integer DEFAULT nextval('media_id_seq'::text) NOT NULL,
 	"title" character varying(255),
 	"subtitle" character varying(255),
@@ -191,12 +197,10 @@ CREATE TABLE "media" (
 	"description" text,
 	"comment" text,
 	"source" character varying(255),
-	"publish_date" timestamp with time zone,
 	"publish_server" character varying(255),
 	"publish_path" character varying(255),
 	"is_published" boolean DEFAULT '0' NOT NULL,
 	"is_produced" boolean DEFAULT '0' NOT NULL,
-	"to_feature" integer DEFAULT '0' NOT NULL,
 	"to_media_folder" integer DEFAULT '0' NOT NULL,
 	"to_media_type" smallint DEFAULT '0' NOT NULL,
 	"to_publisher" integer NOT NULL,
@@ -204,19 +208,11 @@ CREATE TABLE "media" (
 	"to_rights" integer DEFAULT '0',
 	"webdb_create" timestamp with time zone NOT NULL,
 	"webdb_lastchange" timestamp with time zone,
-	"to_media" integer
-);
-
---
--- uploaded_media
---
-
-CREATE TABLE "uploaded_media" (
 	"icon_is_produced" boolean DEFAULT '0' NOT NULL,
 	"icon_path" character varying(255),
-	"size" integer
-)
-INHERITS ("media");
+	"size" integer,
+	Constraint "uploaded_media_pkey" Primary Key ("id")
+);
 
 CREATE UNIQUE INDEX "idx_uploaded_media_id" on "uploaded_media" using btree ( "id" "int4_ops" );
 CREATE UNIQUE INDEX "idx_uploaded_media_is_published" on "uploaded_media" using btree ( "id" "int4_ops", "is_published" "bool_ops" );
@@ -240,7 +236,7 @@ CREATE TABLE "images" (
 )
 INHERITS ("uploaded_media");
 
-CREATE        INDEX "idx_images_is_published__icon_i" on "images" using btree ( "is_published" "bool_ops", "icon_is_produced" "bool_ops" );
+CREATE        INDEX "idx_images_is_published" on "images" using btree ( "is_published" "bool_ops", "icon_is_produced" "bool_ops" );
 CREATE UNIQUE INDEX "idx_images_id" on "images" using btree ( "id" "int4_ops" );
 
         --
@@ -322,21 +318,41 @@ CREATE UNIQUE INDEX "idx_othermedia_id" on "other_media" using btree ( "id" "int
 --
 
 CREATE TABLE "content" (
+	"id" integer DEFAULT nextval('media_id_seq'::text) NOT NULL,
+	"title" character varying(255),
+	"subtitle" character varying(255),
+	"edittitle" character varying(255),
+	"date" character(8) NOT NULL,
+	"creator" character varying(80),
+	"creator_main_url" character varying(255),
+	"creator_email" character varying(80),
+	"creator_address" character varying(80),
+	"creator_phone" character varying(80),
+	"description" text,
+	"comment" text,
+	"source" character varying(255),
+	"is_published" boolean DEFAULT '0' NOT NULL,
+	"is_produced" boolean DEFAULT '0' NOT NULL,
+	"to_publisher" integer NOT NULL,
+	"to_language" integer DEFAULT '0',
+	"to_rights" integer DEFAULT '0',
+	"webdb_create" timestamp with time zone NOT NULL,
+	"webdb_lastchange" timestamp with time zone,
 	"content_data" text,
 	"is_html" boolean DEFAULT '0' NOT NULL,
 	"to_article_type" smallint DEFAULT '0' NOT NULL,
 	"to_content" integer,
-	"checksum" integer
-)
-INHERITS ("media");
+	"keywords" text,
+	"to_locking_user" integer,
+  Constraint "content_pkey" Primary Key ("id")
+);
+
 
-CREATE        INDEX "content_checksum_index" on "content" using btree ( "checksum" "int4_ops" );
 CREATE        INDEX "idx_content_to_article_type" on "content" using btree ( "to_article_type" "int2_ops" );
 CREATE        INDEX "idx_content_is_produced" on "content" using btree ( "is_produced" "bool_ops" );
 CREATE        INDEX "idx_content_is_published__to_ar" on "content" using btree ( "is_published" "bool_ops", "to_article_type" "int2_ops" );
 CREATE        INDEX "idx_content_is_published__id" on "content" using btree ( "is_published" "bool_ops", "id" "int4_ops" );
 CREATE        INDEX "idx_content_is_pub__to_art__to_" on "content" using btree ( "is_published" "bool_ops", "to_article_type" "int2_ops", "id" "int4_ops" );
-CREATE UNIQUE INDEX "idx_content_id" on "content" using btree ( "id" "int4_ops" );
 CREATE        INDEX "idx_content_is_published" on "content" using btree ( "is_published" "bool_ops" );
 CREATE        INDEX idx_content_webdb_create on content(webdb_create);
 
@@ -348,8 +364,8 @@ CREATE        INDEX idx_content_webdb_create on content(webdb_create);
       "media_id" integer
     );
 
-    CREATE UNIQUE INDEX "idx_content_media" on "content_x_media" using btree ( "content_id" "int4_ops", "media_id" "int4_ops" );
-    CREATE UNIQUE INDEX "idx_media_content" on "content_x_media" using btree ( "media_id" "int4_ops", "content_id" "int4_ops" );
+    CREATE INDEX "idx_cxm_content" on "content_x_media" using btree ( "content_id" "int4_ops" );
+    CREATE INDEX "idx_cxm_media" on "content_x_media" using btree ( "media_id" "int4_ops" );
 
 --
 -- breaking
diff --git a/dbscripts/createmirdb.sh b/dbscripts/createmirdb.sh
index 1be2e211..82f5f200 100755
--- a/dbscripts/createmirdb.sh
+++ b/dbscripts/createmirdb.sh
@@ -38,7 +38,6 @@ echo "grant all on img_color       to $3;"   >> ${SCRIPT_FILE}
 echo "grant all on language        to $3;"   >> ${SCRIPT_FILE}
 echo "grant all on rights          to $3;"   >> ${SCRIPT_FILE}
 echo "grant all on article_type    to $3;"   >> ${SCRIPT_FILE}
-echo "grant all on media           to $3;"   >> ${SCRIPT_FILE}
 echo "grant all on breaking        to $3;"   >> ${SCRIPT_FILE}
 echo "grant all on messages        to $3;"   >> ${SCRIPT_FILE}
 echo "grant all on comment_status  to $3;"   >> ${SCRIPT_FILE}
diff --git a/dbscripts/extra/changedbowner.sh b/dbscripts/extra/changedbowner.sh
index 4bc139d9..1a20147b 100755
--- a/dbscripts/extra/changedbowner.sh
+++ b/dbscripts/extra/changedbowner.sh
@@ -29,7 +29,6 @@ echo "grant all on language        to $2;"   >> ${SCRIPT_FILE}
 echo "grant all on rights          to $2;"   >> ${SCRIPT_FILE}
 echo "grant all on feature         to $2;"   >> ${SCRIPT_FILE}
 echo "grant all on article_type    to $2;"   >> ${SCRIPT_FILE}
-echo "grant all on media           to $2;"   >> ${SCRIPT_FILE}
 echo "grant all on breaking        to $2;"   >> ${SCRIPT_FILE}
 echo "grant all on messages        to $2;"   >> ${SCRIPT_FILE}
 echo "grant all on comment_status  to $2;"   >> ${SCRIPT_FILE}
@@ -65,6 +64,6 @@ echo "grant all on language_id_seq to $2;"   >> ${SCRIPT_FILE}
 
 
 # execute the script
-psql -f ${SCRIPT_FILE} -d template1
+psql -f ${SCRIPT_FILE} -d template1 |uniq -c
 
 rm ${SCRIPT_FILE}
diff --git a/dbscripts/extra/hashpasswords.sh b/dbscripts/extra/hashpasswords.sh
index 258bf619..a4629d02 100755
--- a/dbscripts/extra/hashpasswords.sh
+++ b/dbscripts/extra/hashpasswords.sh
@@ -19,24 +19,24 @@ if [ $# -ne 1 ]; then
 fi;
 
 
-# to get a backslash in the first pass sql script
-s1="\\"
-# to get a backslash in the second pass sql script
-s2="\\\\"
-# to get an escaped backslash in the second pass sql script:
-s3="\\\\\\\\"
+# to get a backslash in the first pass sql script
+s1="\\"
+# to get a backslash in the second pass sql script
+s2="\\\\"
+# to get an escaped backslash in the second pass sql script:
+s3="\\\\\\\\"
 
  
 SCRIPT_FILE="/tmp/hashpasswords.$$.sql"
 
-echo psql $1 -P format=unaligned -t -X -F "" -c \
-  "select '${s2}set hashedpassword ${s1}'${s2}${s1}'${s1}' \`echo -n \"'||password||'\" | md5sum \`   \
-            \"${TEXT_SOURCE_PATH}\$(basename \"' || trim($2) || '\")\"\` ${s1}'${s2}${s1}'\\'\n',  \
-                'update webdb_users set password=:hashedpassword where id = '||id from webdb_users" > $SCRIPT_FILE
+psql $1 -P format=unaligned -t -X -F "" -c \
+  "select '${s2}set hashedpassword ${s1}'${s2}${s1}'${s1}' \`echo -n \"'||password||'\" | md5sum \`   \
+            \"${TEXT_SOURCE_PATH}\$(basename \"' || trim($2) || '\")\"\` ${s1}'${s2}${s1}'\\'\n',  \
+                'update webdb_users set password=:hashedpassword where id = '||id from webdb_users" > $SCRIPT_FILE
 
 
 # execute the script
 #psql -f ${SCRIPT_FILE} -d template1
-cat SCRIPT_FILE
+cat $SCRIPT_FILE
 
 rm ${SCRIPT_FILE}
diff --git a/dbscripts/help_arttype.sql b/dbscripts/help_arttype.sql
index f4e3d869..0bdad5e7 100755
--- a/dbscripts/help_arttype.sql
+++ b/dbscripts/help_arttype.sql
@@ -4,3 +4,4 @@ INSERT INTO "article_type" VALUES (1,'newswire');
 INSERT INTO "article_type" VALUES (2,'feature');
 INSERT INTO "article_type" VALUES (3,'topicspecial');
 INSERT INTO "article_type" VALUES (4,'startspecial');
+INSERT INTO "article_type" VALUES (5,'translation');
diff --git a/dbscripts/help_lang.sql b/dbscripts/help_lang.sql
index 6cf6a0b2..9af2e5ac 100755
--- a/dbscripts/help_lang.sql
+++ b/dbscripts/help_lang.sql
@@ -2,3 +2,4 @@
 -- \connect - postgres
 INSERT INTO "language" VALUES (0,'deutsch','de');
 INSERT INTO "language" VALUES (1,'english','en');
+INSERT INTO "language" VALUES (2,'other','ot');
diff --git a/dbscripts/help_users.sql b/dbscripts/help_users.sql
index b3b9d0b9..d5dc9857 100755
--- a/dbscripts/help_users.sql
+++ b/dbscripts/help_users.sql
@@ -1,5 +1,5 @@
--- \connect - postgres
-INSERT INTO "webdb_users" VALUES (1,'open','','f');
-INSERT INTO "webdb_users" VALUES (2,'redaktion','indymedia','t');
-INSERT INTO "webdb_users" VALUES (3,'tollendorf','indymedia','t');
-INSERT INTO "webdb_users" VALUES (4,'admin','indymedia','t');
+INSERT INTO webdb_users(login, password, is_admin, comment, is_disabled, email, profile, webdb_create)
+VALUES ('open', '', 'f', 'Default open posting user', 'f', '', '', now());
+
+INSERT INTO webdb_users(login, password, is_admin, comment, is_disabled, email, profile, webdb_create)
+VALUES ('admin', 'indymedia', 't', 'Default admin user', 'f', '', '', now());
diff --git a/dbscripts/populate_mediatyp.sql b/dbscripts/populate_mediatyp.sql
index cc9bc197..351646c8 100755
--- a/dbscripts/populate_mediatyp.sql
+++ b/dbscripts/populate_mediatyp.sql
@@ -7,9 +7,6 @@
 -- Name: media_type Type: TABLE DATA Owner: postgres
 --
 
-
--- \connect - de_indy
-
 INSERT INTO "media_type" VALUES (4,'mp3','audio/mp3','Mp3','Audio',NULL);
 INSERT INTO "media_type" VALUES (13,'mp3','audio/x-mp3','Mp3','Audio',NULL);
 INSERT INTO "media_type" VALUES (14,'mp3','audio/x-mpeg','Mp3','Audio',NULL);
@@ -21,10 +18,11 @@ INSERT INTO "media_type" VALUES (7,'mpg','video/mpeg','Video','Video',NULL);
 INSERT INTO "media_type" VALUES (9,'avi','video/x-msvideo','Video','Video',NULL);
 INSERT INTO "media_type" VALUES (6,'pdf','application/pdf','Generic','Other',NULL);
 INSERT INTO "media_type" VALUES (15,'png','image/png','ImagesPng','Images',NULL);
-INSERT INTO "media_type" VALUES (3,'jpg','- deprecated -','Images','Images',NULL);
+-- INSERT INTO "media_type" VALUES (3,'jpg','- deprecated -','Images','Images',NULL);
 INSERT INTO "media_type" VALUES (5,'jpg','image/*','ImagesJpeg','Images',NULL);
 INSERT INTO "media_type" VALUES (16,'asf','video/x-ms-asf','Video','Video',NULL);
 INSERT INTO "media_type" VALUES (17,'rm','application/vnd.rn-realmedia','RealVideo','Video',NULL);
 INSERT INTO "media_type" VALUES (18,'mp3','audio/mpeg','Mp3','Audio',NULL);
 INSERT INTO "media_type" VALUES (19,'png','image/gif','ImagesPng','Images',NULL);
 INSERT INTO "media_type" VALUES (20,'avi','video/avi','Video','Video',NULL);
+INSERT INTO "media_type" VALUES (21,'ogg','application/x-ogg','Ogg','Audio',NULL);
diff --git a/dbscripts/update_all_sequences.sql b/dbscripts/update_all_sequences.sql
index a874112d..f8272522 100755
--- a/dbscripts/update_all_sequences.sql
+++ b/dbscripts/update_all_sequences.sql
@@ -1,6 +1,10 @@
 -- This script updates all sequences in a postgres mir database
 
-select setval('media_id_seq',         (select max(id) from media));
+select 
+  CASE WHEN (select max(id) from content)>(select max(id) from uploaded_media)
+     THEN setval('media_id_seq', (select max(id) from content))
+     ELSE setval('media_id_seq', (select max(id) from uploaded_media))
+  END;
 select setval('media_folder_id_seq',  (select max(id) from media_folder));
 select setval('topic_id_seq',         (select max(id) from topic));
 select setval('webdb_users_id_seq',   (select max(id) from webdb_users));
@@ -11,7 +15,3 @@ select setval('media_type_id_seq',    (select max(id) from media_type));
 select setval('comment_status_id_seq',(select max(id) from comment_status));
 select setval('article_type_id_seq',  (select max(id) from article_type));
 select setval('language_id_seq',      (select max(id) from language));
-
-
-
-
diff --git a/web/index.html b/web/index.html
index ef6ed28c..d0a782fe 100755
--- a/web/index.html
+++ b/web/index.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title>Mir</title>
-    <meta http-equiv="refresh" content="0;url=admin/index.do">
+    <meta http-equiv="refresh" content="0;url=servlet/Mir">
 </head>
 <body>
    When you're not automatically redirected, click <a href="servlet/Mir">here</a><br>
diff --git a/web/style/admin.css b/web/style/admin.css
index 4b528a46..fb5d8ce3 100755
--- a/web/style/admin.css
+++ b/web/style/admin.css
@@ -187,14 +187,39 @@ a:hover		{
 .lynx	          { display:none; }
 
 .majorbutton {
+	background-color:#DDDDDD; 
+	font-size:0.9em;
+	color: #990000;
+	font-weight: bold;
+  border: 1px solid #990000;
+	margin:2px;
+	padding:2px;
+	padding-left:8px;
+	padding-right:8px;
 }
 
 .minorbutton {
 	background-color:#DDDDDD; 
 	color: #990000;
-	font-size:1em;
+	font-size:0.9em;
+  border: 1px solid #990000;
 	padding:2px;
+	margin:2px;
 	padding-left:8px;
 	padding-right:8px;
 //	border:1px solid #990000;  
 }
+
+.listbutton {
+	background-color:#DDDDDD; 
+	color: #990000;
+	font-size:0.9em;
+	margin: 0px;
+  border: 1px solid #990000;
+	padding:2px;
+/*	
+	padding-left:2px;
+	padding-right:2px;
+*/	
+}
+