Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv11374/portlets-newsletter/resources

Modified Files:
      Tag: b1_5
        newsletter_nl.properties newsletter_zh.properties 
        newsletter.properties 
        portlets-newslettersubscription.properties 
Log Message:
CMSC-1100 - Rename a newsletter publication to newsletter edition - also made 
resource bundles more similar.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1100


Index: newsletter_nl.properties
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -b -r1.21 -r1.21.2.1
--- newsletter_nl.properties    19 Sep 2008 10:32:02 -0000      1.21
+++ newsletter_nl.properties    24 Oct 2008 13:53:54 -0000      1.21.2.1
@@ -8,33 +8,46 @@
 site.newsletter.edit = Nieuwsbrief bewerken
 site.newsletter.remove = Nieuwsbrief verwijderen
 site.newsletter.publish = Publiceren
-site.newsletter.masspublish = Publiceren met publicaties
-site.newsletter.pause = Halt publication
-site.newsletter.resume = Resume publication
-
-site.newsletterpublication.new.blank = Nieuwe publicatie: leeg
-site.newsletterpublication.new.withcontent = Nieuwe publicatie: kloon
-site.newsletterpublication.edit = Publicatie bewerken
-site.newsletterpublication.remove = Publicatie verwijderen
-site.newsletterpublication.publish = Publicatie versturen
-site.newsletterpublication.test = Test versturen
-
-newsletterpublicationdelete.title = Publicatie verwijderen
-newsletterpublicationdelete.subtitle = Titel:
-newsletterpublicationdelete.confirm = Weet u zeker dat u deze publicatie wilt 
verwijderen ?
-newsletterpublicationdelete.yes = Ja
-newsletterpublicationdelete.no = Nee
+site.newsletter.masspublish = Publiceer edities
+site.newsletter.pause = Pauzeer publicatie
+site.newsletter.resume = Hervat publicatie
+
+site.newsletteredition.new.blank = Nieuwe editie: leeg
+site.newsletteredition.new.withcontent = Nieuwe editie: kloon
+site.newsletteredition.edit = Editie bewerken
+site.newsletteredition.remove = Editie verwijderen
+site.newsletteredition.publish = Editie versturen
+site.newsletteredition.test = Test versturen
+
+newsletteredition.delete.title = Editie verwijderen
+newsletteredition.delete.subtitle = Titel:
+newsletteredition.delete.confirm = Weet u zeker dat u deze editie wilt 
verwijderen ?
+newsletteredition.delete.yes = Ja
+newsletteredition.delete.no = Nee
+
+confirm_send.title = Verstuur nieuwsbrief
+confirm_send.subtitle = Titel:
+confirm_send.confirm = Weet je zeker dat je deze editie naar alle leden wilt 
versturen?
+confirm_send.yes = Ja
+confirm_send.no = Nee
+
+confirm_resend.title = Opnieuw versturen van de nieuwsbrief
+confirm_resend.subtitle = Titel:
+confirm_resend.confirm = Deze editie is al verzonden. Weet je zeker dat je 
deze editie opnieuw wilt versturen naar alle leden?
+confirm_resend.yes = Ja
+confirm_resend.no = Nee
 
 confirmpublication.title = Versturen bevestigen
 confirmpublication.subtitle = Titel:
-confirmpublication.confirm = Weet u zeker dat u deze publicatie nu wilt 
versturen naar alle geabonneerde gebruikers ?
+confirmpublication.confirm = Weet u zeker dat u deze editie nu wilt versturen 
naar alle geabonneerde gebruikers ?
 confirmpublication.yes = Ja
 confirmpublication.no = Nee
 
 sendsuccess.title = Verzendresultaat
-sendsuccess.subtitle = De publicatie is met succes verstuurd naar {0} 
gebruikers.
-sendsuccess.publish.subtitle = De publicatie is met succes verstuurd naar live.
-sendsuccess.test.subtitle = De publicatie is met succes verstuurd.
+sendsuccess.subtitle = De editie is met succes verstuurd naar {0} gebruikers.
+sendsuccess.publish.subtitle = De editie is met succes verstuurd naar live.
+sendsuccess.test.subtitle = De editie is met succes verstuurd.
+
 newsletter.ispaused = De nieuwsbrief is gepauseerd. 
 
 testinput.title = Verstuur test e-mail
@@ -44,13 +57,12 @@
 testinput.email = Email:
 testinput.mimetype =  MIME-Type:
 testinput.email.incorrect = Emailadres is incorrect, aub opnieuw invoeren!
-edition = Publicatie
-
+edition = Editie
 
-selector.newsletterpublications=Nieuwsbrief Publicatie
+selector.newsletterpublications=Nieuwsbrief Editie
 
-newspubs.title=Zoek in de publicaties.
-newspubs.results=Gevonden publicaties
+newspubs.title=Zoek in de edities.
+newspubs.results=Gevonden edities
 newspubform.title=Titel
 newspubform.description=Beschrijving
 newspubform.intro=Introductie
@@ -62,24 +74,27 @@
 newspubsearch.introduction =Introductie
 newspubsearch.lastmodifiercolumn=Gewijzigd door
 newspubsearch.lastmodifieddatecolumn=Wijzigingsdatum
-newspubsearch.icon.edit=Bewerk nieuwsbriefpublicatie
-newspubsearch.icon.delete=Verwijder publicatie
-newspubsearch.icon.info=Nieuwbrief publicatieinformatie
-newspubsearch.noresult=Geen nieuwsbriefpublicaties gevonden
-newspubinfo.title=Nieuwsbrief publicatieinformatie
-newspubinfo.satatus=Status
+newspubsearch.icon.edit=Bewerk nieuwsbriefeditie
+newspubsearch.icon.delete=Verwijder editie
+newspubsearch.icon.info=Nieuwbrief editie-informatie
+newspubsearch.noresult=Geen nieuwsbriefedities gevonden
+newspubinfo.title=Nieuwsbrief editie-informatie
+newspubinfo.status=Status
 newspubinfo.notsend=Nog niet verzonden
 newspubinfo.hassend=Is verzonden
 
-unsubscribe.page.canel=You have canceled the unsubscription!
+unsubscribe.page.cancel=You have canceled the unsubscription!
 unsubscribe.page.finish=You have finished the unsubscription!
 unsubscribe.page.question=Do you want unsubscribe the newsletter?
 unsubscribe.yes=Ja
 unsubscribe.no=Nee
 unsubscribe.link=Unsubscribe Link
 
-##Newsletter Log
+site.newsletter.switchtohtml = Schakel naar HTML
+site.newsletter.switchtoplain = Schakel naar platte tekst.
+site.newsletter.switchtowap = Schakel naar Wap
 
+##Newsletter Log
 newsletterlog.newsletter.log = Newsletter Log
 newsletterlog.newsletter = Nieuwsbrief:
 newsletterlog.from = Van:
@@ -107,10 +122,7 @@
 
 newsletterlog.summary.statistic = Statistieken
 
-newsletterlog.noResults = No Result
-
 #Newsletter Module
-
 index.title = Nieuwsbrief beheer
 
 index.title.overview = Overzicht
@@ -121,13 +133,13 @@
 index.link.import = Importeer abonnementsgegevens
 index.link.newsletterstatistic = Nieuwsbrief Log
 index.link.manageterm = Manage Term
-index.link.allsubscriber = All Subscribers
-index.link.bouncedemail = Bounced Email
-index.link.allpublication = All Publications
-
-index.link.title.subscriptionstats = Subscription Stats
-index.link.title.subscriberstats = Subscriber Stats
-index.link.title.publicationstats = Publication Stats
+index.link.allsubscriber = Alle leden
+index.link.bouncedemail = Bounced email
+index.link.alleditions = Alle edities
+
+index.link.title.subscriptionstats = Ledenstatistieken
+index.link.title.subscriberstats = Ledenstatistieken
+index.link.title.editionstats = Editie statistieken
 
 error.no_items = Er zijn geen gegevens beschikbaar
 error.unknown_action = Deze actie kan niet worden uitgevoerd omdat het nog 
niet aanwezig is.
@@ -161,6 +173,7 @@
 
 subscriptiondetail.title = Abonnementen voor gebruiker
 subscriptiondetail.username = Gebruikersnaam
+subscriptiondetail.fullname = Volledige naam
 subscriptiondetail.emailaddress = Email adres
 subscriptiondetail.status = Status abonnement
 subscriptiondetail.mimetype = Voorkeur MIME-type
@@ -176,25 +189,10 @@
 confirm_noselect = Selecteer tenminste 1 item
 confirm.unsubscribe.newsletter = Weet u zeker dat u de abonnementen van deze 
nieuwsbrief wilt opzeggen?
 
-site.newsletter.switchtohtml = Schakel naar HTML
-confirm_send.subtitle = Titel:
-confirm_resend.title = Opnieuw versturen van de nieuwsbrief
-confirm_send.confirm = Weet je zeker dat je deze publicatie naar alle leden 
wilt versturen?
-confirm_resend.no = Nee
-subscriptiondetail.fullname = Volledige naam
-confirm_resend.yes = Ja
-confirm_resend.confirm = Deze publicatie is al verzonden. Weet je zeker dat je 
deze publicatie opnieuw wilt versturen naar alle leden?
-confirm_send.yes = Ja
-site.newsletter.switchtoplain = Schakel naar platte tekst.
-confirm_send.title = Verstuur nieuwsbrief
-site.newsletter.switchtowap = Schakel naar Wap
 datafile.import.success = Importeeractie voltooid
 datafile.unsupport = Dit databestand wordt niet ondersteund door de CMSc.
-confirm_resend.subtitle = Titel:
-confirm_send.no = Nee
 
 #newsletter management
-
 newsletter.publication.tabs.edit = Bewerk
 newsletter.publication.tabs.statistics = Statistieken
 newsletter.publication.tabs.subscribers = Leden
@@ -219,7 +217,6 @@
 newsletter.publication.result.lastmodifier = Laatste bewerker
 newsletter.publication.result.modificationdate = Bewerkingsdatum
 
-newsletter.publication.result.publication = Publicatie
 newsletter.publication.result.sentat = Verzonden op
 newsletter.publication.result.subscriptions = Leden
 newsletter.publication.result.sentsuccess = Succesvol verzonden
@@ -236,9 +233,10 @@
 
 newsletter.publication.link.newsubscriber = Nieuw lid
 newsletter.publication.link.newuser = Nieuwe gebruiker
+
 newsletter.icons.title.editproperty= Edit property
 newsletter.icons.title.sendemail = Send test email
-newsletter.icons.title.sendpublication = Send publications to all members
+newsletter.icons.title.sendedition = Verstuur editie naar alle leden
 newsletter.icons.title.userright = View user rights
 newsletter.icons.title.edituser = Edit User
 newsletter.icons.title.user.unsubscribe = Unsubscribe the current newsletter
@@ -277,3 +275,6 @@
 newsletter.subscriber.noresult = Geen gerelateerde resultaten gevonden.
 newsletter.subscriber.search = Zoeken
 newsletter.subscriber.info = Lid informatie
+
+
+


Index: newsletter_zh.properties
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -b -r1.20 -r1.20.2.1
--- newsletter_zh.properties    19 Sep 2008 10:32:02 -0000      1.20
+++ newsletter_zh.properties    24 Oct 2008 13:53:54 -0000      1.20.2.1
@@ -8,22 +8,22 @@
 site.newsletter.edit = 编辑邮件
 site.newsletter.remove = 删除邮件
 site.newsletter.publish = 发布
-site.newsletter.masspublish = Publish with publications
+site.newsletter.masspublish = Publish editions
 site.newsletter.pause = Halt publication
 site.newsletter.resume = Resume publication
 
-site.newsletterpublication.new.blank = 新建publication:空
-site.newsletterpublication.new.withcontent = 新建publication: 复制
-site.newsletterpublication.edit = 编辑 publication
-site.newsletterpublication.remove = 删除 publication
-site.newsletterpublication.publish = 发送 publication
-site.newsletterpublication.test = 发送测试邮件
-
-newsletterpublicationdelete.title = 删除邮件publication
-newsletterpublicationdelete.subtitle = 标题:
-newsletterpublicationdelete.confirm = 您确定删除此邮件publication?
-newsletterpublicationdelete.yes = 是
-newsletterpublicationdelete.no = 否
+site.newsletteredition.new.blank = 新建publication:空
+site.newsletteredition.new.withcontent = 新建publication: 复制
+site.newsletteredition.edit = 编辑 publication
+site.newsletteredition.remove = 删除 edition
+site.newsletteredition.publish = 发送 edition
+site.newsletteredition.test = 发送测试邮件
+
+newslettereditiondelete.title = 删除邮件edition
+newslettereditiondelete.subtitle = 标题:
+newslettereditiondelete.confirm = 您确定删除此邮件publication?
+newslettereditiondelete.yes = 是
+newslettereditiondelete.no = 否
 
 confirm_send.title = 发送邮件
 confirm_send.subtitle = 标题:
@@ -37,8 +37,18 @@
 confirm_resend.yes = 是
 confirm_resend.no = 否
 
+confirmpublication.title = Confirm publication
+confirmpublication.subtitle = Title:
+confirmpublication.confirm = Are you sure to send this edition to all 
subscribers?
+confirmpublication.yes = Yes
+confirmpublication.no = No
+
 sendsuccess.title = 发送
 sendsuccess.subtitle = 发布已发送成功!发送到 {0} 用户
+sendsuccess.publish.subtitle = 邮件发布已成功发布到live服务器
+sendsuccess.test.subtitle = 邮件发布已发送成功
+
+newsletter.ispaused = 邮件暂停
 
 testinput.title = 发送测试邮件
 testinput.subtitle = Specify the e-mail address where the test e-mail should 
be sent to and click Send
@@ -49,8 +59,6 @@
 testinput.email.incorrect = 邮件格式不正确,请重新填写!
 edition = 发布
 
-
-
 selector.newsletterpublications=邮件发布
 
 newspubs.title = 查找邮件
@@ -71,12 +79,24 @@
 newspubsearch.icon.info = 邮件信息
 newspubsearch.noresult = 没有找到相关邮件
 newspubinfo.title = 邮件信息
-newspubinfo.satatus = 状态
+newspubinfo.status = 状态
 newspubinfo.notsend = 未发送
 newspubinfo.hassend = 已发送
+sendsuccess.publish.subtitle = 邮件发布已成功发布到live服务器
+sendsuccess.test.subtitle = 邮件发布已发送成功
 
-##Newsletter Log
+unsubscribe.page.cancel= You have canceled the unsubscription!
+unsubscribe.page.finish= 您完成了取消订阅!
+unsubscribe.page.question= 您确定取消当前邮件订阅?
+unsubscribe.yes = yes
+unsubscribe.no= 否
+unsubscribe.link= 取消订阅
+
+site.newsletter.switchtohtml = 切换HTML
+site.newsletter.switchtowap = Switch to Wap
+site.newsletter.switchtoplain = Switch to Plain Text
 
+##Newsletter Log
 newsletterlog.newsletter.log = 时事通讯日志
 newsletterlog.newsletter = 时事通讯
 newsletterlog.from = 开始日期:
@@ -104,10 +124,7 @@
 
 newsletterlog.summary.statistic = 统计
 
-newsletterlog.noResults = 没有结果
-
 #Newsletter Module
-
 index.title = Newsletter 管理
 
 index.title.overview = 概要
@@ -120,11 +137,11 @@
 index.link.manageterm = 管理Term
 index.link.allsubscriber = 全部订阅者
 index.link.bouncedemail = 退信
-index.link.allpublication = 全部发布信息
+index.link.alleditions = 全部发布信息
 
 index.link.title.subscriptionstats = 订阅 Stats
 index.link.title.subscriberstats = 订阅者 Stats
-index.link.title.publicationstats = 发布 Stats
+index.link.title.editionstats = 发布 Stats
 
 error.no_items = There are no items available to display
 error.unknown_action = The specified action cannot be performed because it has 
not been implemented
@@ -174,23 +191,10 @@
 confirm_noselect = 您至少选择一项
 confirm.unsubscribe.newsletter = 您确定取消当前邮件的全部订阅?
 
-site.newsletter.switchtohtml = 切换HTML
-unsubscribe.link = 取消订阅
-newsletter.ispaused = 邮件暂停
-sendsuccess.publish.subtitle = 邮件发布已成功发布到live服务器
-sendsuccess.test.subtitle = 邮件发布已发送成功
-unsubscribe.page.finish = 您完成了取消订阅!
-unsubscribe.page.question = 您确定取消当前邮件订阅?
-unsubscribe.no = 否
-site.newsletter.switchtoplain = Switch to Plain Text
-site.newsletter.switchtowap = Switch to Wap
-unsubscribe.page.canel = You have canceled the unsubscription!
 datafile.import.success = 数据导入成功。
 datafile.unsupport = 
您上传的文件不符合要求,请上传CMSC支持的文件(.csv).
-unsubscribe.yes = yes
 
 #newsletter management
-
 newsletter.publication.tabs.edit = 编辑
 newsletter.publication.tabs.statistics = 统计
 newsletter.publication.tabs.subscribers = 订阅者
@@ -215,7 +219,6 @@
 newsletter.publication.result.lastmodifier = 最后修改人
 newsletter.publication.result.modificationdate = 修改日期
 
-newsletter.publication.result.publication = 发布
 newsletter.publication.result.sentat = 发送时间
 newsletter.publication.result.subscriptions = 订阅
 newsletter.publication.result.sentsuccess = 成功发送
@@ -235,7 +238,7 @@
 
 newsletter.icons.title.editproperty= 编辑属性
 newsletter.icons.title.sendemail = 发送测试邮件
-newsletter.icons.title.sendpublication = 向所有订阅者发送publication
+newsletter.icons.title.sendedition = 向所有订阅者发送publication
 newsletter.icons.title.userright = 查看用户权限
 newsletter.icons.title.edituser = 编辑用户
 newsletter.icons.title.user.unsubscribe = 用户取消订阅当前邮件


Index: newsletter.properties
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -b -r1.37 -r1.37.2.1
--- newsletter.properties       19 Sep 2008 10:32:02 -0000      1.37
+++ newsletter.properties       24 Oct 2008 13:53:54 -0000      1.37.2.1
@@ -8,39 +8,46 @@
 site.newsletter.edit = Edit newsletter
 site.newsletter.remove = Delete newsletter
 site.newsletter.publish = Publish
-site.newsletter.masspublish = Publish with publications
+site.newsletter.masspublish = Publish editions
 site.newsletter.pause = Halt publication
 site.newsletter.resume = Resume publication
 
-site.newsletterpublication.new.blank = New publication: empty
-site.newsletterpublication.new.withcontent = New publication: clone
-site.newsletterpublication.edit = Edit publication
-site.newsletterpublication.remove = Remove publication
-site.newsletterpublication.publish = Send publication
-site.newsletterpublication.test = Send test mail
-
-newsletterpublicationdelete.title = Delete publication
-newsletterpublicationdelete.subtitle = Title:
-newsletterpublicationdelete.confirm = Are you sure you want to delete this 
newsletter publication?
-newsletterpublicationdelete.yes = yes
-newsletterpublicationdelete.no = no
+site.newsletteredition.new.blank = New edition: empty
+site.newsletteredition.new.withcontent = New edition: clone
+site.newsletteredition.edit = Edit edition
+site.newsletteredition.remove = Remove edition
+site.newsletteredition.publish = Send edition
+site.newsletteredition.test = Send test mail
+
+newslettereditiondelete.title = Delete edition
+newslettereditiondelete.subtitle = Title:
+newslettereditiondelete.confirm = Are you sure you want to delete this 
newsletter edition?
+newslettereditiondelete.yes = yes
+newslettereditiondelete.no = no
 
 confirm_send.title = Send newsletter
 confirm_send.subtitle = Title:
-confirm_send.confirm = Are you sure you want to send the selected publication 
to all of its subscribers?
+confirm_send.confirm = Are you sure you want to send the selected edition to 
all of its subscribers?
 confirm_send.yes = Yes
 confirm_send.no = No
 
 confirm_resend.title = Re-send newsletter
 confirm_resend.subtitle = Title:
-confirm_resend.confirm = This publication has already been published. Are you 
sure you want to send this publication again to all it's subscribers?
+confirm_resend.confirm = This edition has already been published. Are you sure 
you want to send this edition again to all it's subscribers?
 confirm_resend.yes = Yes
 confirm_resend.no = No
          
+confirmpublication.title = Confirm publication
+confirmpublication.subtitle = Title:
+confirmpublication.confirm = Are you sure to send this edition to all 
subscribers?
+confirmpublication.yes = Yes
+confirmpublication.no = No
+         
 sendsuccess.title = Send results
-sendsuccess.subtitle = The publication has been sent. {0} users it was sent.
-sendsuccess.publish.subtitle = The publication has been published to live 
successfully
-sendsuccess.test.subtitle = The publication has been sent successfully
+sendsuccess.subtitle = The edition has been sent. {0} users it was sent.
+sendsuccess.publish.subtitle = The edition has been published to live 
successfully
+sendsuccess.test.subtitle = The edition has been sent successfully
+
 newsletter.ispaused = The Newsletter is paused
 
 testinput.title = Send test e-mail
@@ -50,13 +57,12 @@
 testinput.email = Email:
 testinput.mimetype =  MIME-Type:
 testinput.email.incorrect = Email address is incorrect, please fill in again!
-edition = Publication
-
+edition = Edition
 
 selector.newsletterpublications=Newsletter Publication
 
-newspubs.title=Search in Newsletter Publications
-newspubs.results=Found Newsletter Publications
+newspubs.title=Search in Newsletter Editions
+newspubs.results=Found Newsletter Editions
 newspubform.title=Title
 newspubform.description=Description
 newspubform.intro=Introduction
@@ -68,16 +74,16 @@
 newspubsearch.introduction =Introduction
 newspubsearch.lastmodifiercolumn=Last Modifier
 newspubsearch.lastmodifieddatecolumn=Last Modification date
-newspubsearch.icon.edit=Edit Newsletter Publication
-newspubsearch.icon.delete=Delete Publication
-newspubsearch.icon.info=Newsletter Publication Information
-newspubsearch.noresult=No Newsletter Publication was found
-newspubinfo.title=Newsletter Publication Information
-newspubinfo.satatus=Status
+newspubsearch.icon.edit=Edit Newsletter Edition
+newspubsearch.icon.delete=Delete Edition
+newspubsearch.icon.info=Newsletter Edition Information
+newspubsearch.noresult=No Newsletter Edition was found
+newspubinfo.title=Newsletter Edition Information
+newspubinfo.status=Status
 newspubinfo.notsend=Not send yet
 newspubinfo.hassend=Has send
 
-unsubscribe.page.canel=You have canceled the unsubscription!
+unsubscribe.page.cancel=You have canceled the unsubscription!
 unsubscribe.page.finish=You have finished the unsubscription!
 unsubscribe.page.question=Do you want unsubscribe from this newsletter?
 unsubscribe.yes= yes
@@ -114,8 +120,7 @@
 newsletterlog.detail.unsubcribe = Unsubscribe
 newsletterlog.detail.bounces = Bounces
 
-newsletterlog.summary.statistic = Statistic
-
+newsletterlog.summary.statistic = Statistics
 
 #Newsletter Module
 index.title = Newsletter Management
@@ -130,11 +135,11 @@
 index.link.manageterm = Manage Term
 index.link.allsubscriber = All Subscribers
 index.link.bouncedemail = Bounced Email
-index.link.allpublication = All Publications
+index.link.alleditions = All Editions
 
 index.link.title.subscriptionstats = Subscription Stats
 index.link.title.subscriberstats = Subscriber Stats
-index.link.title.publicationstats = Publication Stats
+index.link.title.editionstats = Edition Stats
 
 error.no_items = There are no items available to display
 error.unknown_action = The specified action cannot be performed because it has 
not been implemented
@@ -150,7 +155,7 @@
 newsletteroverview.title = Newsletter subscription overview
 newsletteroverview.newsletter = Newsletter
 newsletteroverview.numberofthemes = Terms
-newsletteroverview.numberofpublications = Publications
+newsletteroverview.numberofpublications = Editions
 newsletteroverview.numberofsubscriptions = Subscriptions
 
 newsletteroverview.link.deleteallsubscriptions = Delete all subscriptions for 
the selected newsletters
@@ -188,7 +193,6 @@
 datafile.unsupport = The Data file you upload is not supported by CMSC.
 
 #newsletter management
-
 newsletter.publication.tabs.edit = Edit
 newsletter.publication.tabs.statistics = Statistics
 newsletter.publication.tabs.subscribers = Subscribers
@@ -213,7 +217,6 @@
 newsletter.publication.result.lastmodifier = Last Modifier
 newsletter.publication.result.modificationdate = Modification Date
 
-newsletter.publication.result.publication = Publication
 newsletter.publication.result.sentat = Sent at
 newsletter.publication.result.subscriptions = Subscriptions
 newsletter.publication.result.sentsuccess = Sent successfully
@@ -233,7 +236,7 @@
 
 newsletter.icons.title.editproperty= Edit property
 newsletter.icons.title.sendemail = Send test email
-newsletter.icons.title.sendpublication = Send publications to all member
+newsletter.icons.title.sendedition = Send editions to all member
 newsletter.icons.title.userright = View user rights
 newsletter.icons.title.edituser = Edit User
 newsletter.icons.title.user.unsubscribe = Unsubscribe the current newsletter


Index: portlets-newslettersubscription.properties
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/portlets-newslettersubscription.properties,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -b -r1.11 -r1.11.2.1
--- portlets-newslettersubscription.properties  20 May 2008 08:48:43 -0000      
1.11
+++ portlets-newslettersubscription.properties  24 Oct 2008 13:53:54 -0000      
1.11.2.1
@@ -31,10 +31,10 @@
 
 subscription.login.title = Community login
 subscription.login.info = You are not logged in at this moment. You need to 
login into the community module in order to be able to see and manage your 
newslettersubscriptions. 
-subscription.login.buttontext = "Login now !"
+subscription.login.buttontext = "Login now!"
 
 subscription.subscribe.title = Newsletter subscription
-subscription.subscribe.buttontext = Subscribe now !
+subscription.subscribe.buttontext = Subscribe now!
 subscription.subscribe.info = You do not have any newslettersubscriptions at 
this time. You can subscribe yourself to newsletters by clicking the button 
below and completing the subscription form.
 subscription.subscribe.tothisnewsletter = Subscribe to this newsletter
 
@@ -85,7 +85,7 @@
 subscription.subscribe.operation.pauseall = Pause All
 subscription.subscribe.operation.resumeall = Resume All
 subscription.subscribe.operation.confirmterminate = Are you sure to terminate 
below newsletters?
-subscription.subscribe.status.nosubscription = You have no subsription.
+subscription.subscribe.status.nosubscription = You have no subscription.
 
 subscription.subscribe.operation.pause.form.title = Pause to get the 
newsletter for some time.
 subscription.subscribe.operation.pause.form.timeduration = Duration
@@ -97,4 +97,4 @@
 
 subscription.nonewsletter = There is no Newsletter can be subscribed yet.
 datafile.unsupport = The Data file you upload is not supported by CMSC.
-datafile.invalid = Teh Date file you upload is not valid.
+datafile.invalid = The date file you upload is not valid.
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to