[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter_zh.properties newsletter_nl.properties newsletter.properties

2008-12-02 Thread jkoster 
Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv23583/portlets-newsletter/resources

Modified Files:
  Tag: b1_5
newsletter_zh.properties newsletter_nl.properties 
newsletter.properties 
Log Message:
CMSC-1100 - Improve some translations.


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_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.20.2.7
retrieving revision 1.20.2.8
diff -u -b -r1.20.2.7 -r1.20.2.8


Index: newsletter_nl.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties,v
retrieving revision 1.21.2.9
retrieving revision 1.21.2.10
diff -u -b -r1.21.2.9 -r1.21.2.10


Index: newsletter.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.37.2.8
retrieving revision 1.37.2.9
diff -u -b -r1.37.2.8 -r1.37.2.9
--- newsletter.properties   14 Nov 2008 06:59:39 -  1.37.2.8
+++ newsletter.properties   2 Dec 2008 15:05:28 -   1.37.2.9
@@ -14,7 +14,7 @@
 
 site.newsletteredition.new.blank = New edition: empty
 site.newsletteredition.new.withcontent = New edition: clone
-site.newsletteredition.edit = Edit edition
+site.newsletteredition.edit = Edit edition properties
 site.newsletteredition.remove = Remove edition
 site.newsletteredition.publish = Send edition
 site.newsletteredition.test = Send test mail
@@ -240,9 +240,9 @@
 newsletter.publication.link.newsubscriber = New Subscriber
 newsletter.publication.link.newuser = New User
 
-newsletter.icons.title.editproperty= Edit property
+newsletter.icons.title.editproperty= Edit newsletter page
 newsletter.icons.title.sendemail = Send test email
-newsletter.icons.title.sendedition = Send editions to all member
+newsletter.icons.title.sendedition = Send edition to all members
 newsletter.icons.title.userright = View user rights
 newsletter.icons.title.edituser = Edit User
 newsletter.icons.title.user.unsubscribe = Unsubscribe the current newsletter
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter_zh.properties newsletter_nl.properties newsletter.properties

2008-10-31 Thread jkoster 
Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv20950/portlets-newsletter/resources

Modified Files:
  Tag: b1_5
newsletter_zh.properties newsletter_nl.properties 
newsletter.properties 
Log Message:
CMSC-1100 - Other translation improvements and better FMT names.


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_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -b -r1.20.2.2 -r1.20.2.3
--- newsletter_zh.properties24 Oct 2008 14:37:38 -  1.20.2.2
+++ newsletter_zh.properties31 Oct 2008 17:34:21 -  1.20.2.3
@@ -276,4 +276,4 @@
 
 newsletter.subscriber.noresult = 没有找到相关订阅者.
 newsletter.subscriber.search = 查找
-newsletter.subscriber.info = 订阅者信息
\ No newline at end of file
+newsletter.edition.info = Edition Information
\ No newline at end of file


Index: newsletter_nl.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -b -r1.21.2.3 -r1.21.2.4
--- newsletter_nl.properties29 Oct 2008 10:24:51 -  1.21.2.3
+++ newsletter_nl.properties31 Oct 2008 17:34:21 -  1.21.2.4
@@ -61,7 +61,7 @@
 
 selector.newsletterpublications=Nieuwsbrief Editie
 
-newspubs.title=Zoek in de edities
+newspubs.title=Zoek in edities
 newspubs.results=Gevonden edities
 newspubform.title=Titel
 newspubform.description=Beschrijving
@@ -132,7 +132,7 @@
 index.link.exportall = Exporteer alle subscriptie gegevens
 index.link.import = Importeer abonnementsgegevens
 index.link.newsletterstatistic = Nieuwsbrief Log
-index.link.manageterm = Manage Term
+index.link.manageterm = Beheer termen
 index.link.allsubscriber = Alle leden
 index.link.bouncedemail = Bounced email
 index.link.alleditions = Alle edities
@@ -245,8 +245,8 @@
 
 newsletter.term.title = Nieuwsbrief Term
 newsletter.term.add = Nieuwe term
-newsletter.term.name = Name
-newsletter.term.search = Search
+newsletter.term.name = Naam
+newsletter.term.search = Zoeken
 newsletter.term.search.result = Resultaten
 newsletter.term.name.upper = Naam
 newsletter.term.action.upper = Acties
@@ -274,4 +274,4 @@
 
 newsletter.subscriber.noresult = Geen gerelateerde resultaten gevonden.
 newsletter.subscriber.search = Zoeken
-newsletter.subscriber.info = Lid informatie
\ No newline at end of file
+newsletter.edition.info = Editie informatie
\ No newline at end of file


Index: newsletter.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.37.2.3
retrieving revision 1.37.2.4
diff -u -b -r1.37.2.3 -r1.37.2.4
--- newsletter.properties   29 Oct 2008 10:24:51 -  1.37.2.3
+++ newsletter.properties   31 Oct 2008 17:34:21 -  1.37.2.4
@@ -274,4 +274,4 @@
 
 newsletter.subscriber.noresult = No Related results were found.
 newsletter.subscriber.search = Search
-newsletter.subscriber.info = Subscriber Information
\ No newline at end of file
+newsletter.edition.info = Edition Information
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter_zh.properties newsletter_nl.properties newsletter.properties

2008-10-24 Thread jkoster 
Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv12298/portlets-newsletter/resources

Modified Files:
  Tag: b1_5
newsletter_zh.properties newsletter_nl.properties 
newsletter.properties 
Log Message:
CMSC-1100 - Rename a newsletter publication to newsletter edition: some 
forgotten details.


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_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -b -r1.20.2.1 -r1.20.2.2
--- newsletter_zh.properties24 Oct 2008 13:53:54 -  1.20.2.1
+++ newsletter_zh.properties24 Oct 2008 14:37:38 -  1.20.2.2
@@ -195,7 +195,7 @@
 datafile.unsupport = 
您上传的文件不符合要求,请上传CMSC支持的文件(.csv).
 
 #newsletter management
-newsletter.publication.tabs.edit = 编辑
+newsletter.publication.tabs.edit = Editions
 newsletter.publication.tabs.statistics = 统计
 newsletter.publication.tabs.subscribers = 订阅者
 newsletter.publication.tabs.terms = 分类


Index: newsletter_nl.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -b -r1.21.2.1 -r1.21.2.2
--- newsletter_nl.properties24 Oct 2008 13:53:54 -  1.21.2.1
+++ newsletter_nl.properties24 Oct 2008 14:37:38 -  1.21.2.2
@@ -46,7 +46,7 @@
 sendsuccess.title = Verzendresultaat
 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.
+sendsuccess.test.subtitle = De editie is succesvol verstuurd.
 
 newsletter.ispaused = De nieuwsbrief is gepauseerd. 
 
@@ -61,7 +61,7 @@
 
 selector.newsletterpublications=Nieuwsbrief Editie
 
-newspubs.title=Zoek in de edities.
+newspubs.title=Zoek in de edities
 newspubs.results=Gevonden edities
 newspubform.title=Titel
 newspubform.description=Beschrijving
@@ -193,7 +193,7 @@
 datafile.unsupport = Dit databestand wordt niet ondersteund door de CMSc.
 
 #newsletter management
-newsletter.publication.tabs.edit = Bewerk
+newsletter.publication.tabs.edit = Edities
 newsletter.publication.tabs.statistics = Statistieken
 newsletter.publication.tabs.subscribers = Leden
 newsletter.publication.tabs.terms = Termen


Index: newsletter.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -u -b -r1.37.2.1 -r1.37.2.2
--- newsletter.properties   24 Oct 2008 13:53:54 -  1.37.2.1
+++ newsletter.properties   24 Oct 2008 14:37:38 -  1.37.2.2
@@ -59,7 +59,7 @@
 testinput.email.incorrect = Email address is incorrect, please fill in again!
 edition = Edition
 
-selector.newsletterpublications=Newsletter Publication
+selector.newsletterpublications=Newsletter Edition
 
 newspubs.title=Search in Newsletter Editions
 newspubs.results=Found Newsletter Editions
@@ -193,7 +193,7 @@
 datafile.unsupport = The Data file you upload is not supported by CMSC.
 
 #newsletter management
-newsletter.publication.tabs.edit = Edit
+newsletter.publication.tabs.edit = Editions
 newsletter.publication.tabs.statistics = Statistics
 newsletter.publication.tabs.subscribers = Subscribers
 newsletter.publication.tabs.terms = Terms
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter_zh.properties

2008-08-12 Thread lisachen 
Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv31068/resources

Modified Files:
newsletter_zh.properties 
Log Message:
CMSC-956 code improvement after CMSC-990,CMSC-979


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


Index: newsletter_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- newsletter_zh.properties5 Aug 2008 08:21:02 -   1.18
+++ newsletter_zh.properties12 Aug 2008 11:00:43 -  1.19
@@ -136,11 +136,11 @@
 globalstats.total.sentsubscriptions = 发送订阅
 globalstats.total.unsubscribeselect = 取消订阅
 
-newsletteroverview.title = Newsletter subscription overview
-newsletteroverview.newsletter = Newsletter
-newsletteroverview.numberofthemes = Terms
-newsletteroverview.numberofpublications = Publications
-newsletteroverview.numberofsubscriptions = Subscriptions
+newsletteroverview.title = 邮件订阅概况
+newsletteroverview.newsletter = 邮件
+newsletteroverview.numberofthemes = 标签
+newsletteroverview.numberofpublications = 发布
+newsletteroverview.numberofsubscriptions = 订阅
 
 newsletteroverview.link.deleteallsubscriptions = 
删除当前邮件的全部订阅信息
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter_zh.properties

2008-08-05 Thread kevinshen 
Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv21001

Modified Files:
newsletter_zh.properties 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers  Terms tabs,chang *_zh i18n  file


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


Index: newsletter_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- newsletter_zh.properties5 Aug 2008 05:47:14 -   1.17
+++ newsletter_zh.properties5 Aug 2008 08:21:02 -   1.18
@@ -27,7 +27,7 @@
 
 confirm_send.title = 发送邮件
 confirm_send.subtitle = 标题:
-confirm_send.confirm = 您确定删除所选publication(包含子项) ?
+confirm_send.confirm = 您确定发送所选publication到所有订阅者 ?
 confirm_send.yes = 是
 confirm_send.no = 否
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter_zh.properties

2008-07-31 Thread kevinshen 
Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv8589/resources

Modified Files:
newsletter_zh.properties 
Log Message:
CMSC-990,Redesign Newsletter: Subscribers  Terms tabs  improve terms 
management


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


Index: newsletter_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- newsletter_zh.properties29 Jul 2008 03:30:16 -  1.14
+++ newsletter_zh.properties31 Jul 2008 10:56:31 -  1.15
@@ -241,8 +241,8 @@
 newsletter.icons.title.term.unlink = 当前newsletter取消标签
 
 
-newsletter.term.title = Newsletter Term
-newsletter.term.add = New Term
+newsletter.term.title = 邮件标签
+newsletter.term.add = 新建
 newsletter.term.name = 名称
 newsletter.term.search = 搜索
 newsletter.term.search.result = 结果
@@ -259,7 +259,7 @@
 newsletter.term.mandatory = 名称不能为空!
 newsletter.term.action.link = 插入
 
-newsletter.bounce.title = Newsletter Bounce
+newsletter.bounce.title = 邮件退信信息
 newsletter.bounce.number = ID
 newsletter.bounce.subscriber = 订阅者
 newsletter.bounce.newsletter = 新闻列表
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter_zh.properties

2008-07-31 Thread lisachen 
Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv31651/resources

Modified Files:
newsletter_zh.properties 
Log Message:
CMSC-990 property file modify,newsetter Delete, remove relations before delete 
the newsletter Node


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


Index: newsletter_zh.properties
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- newsletter_zh.properties31 Jul 2008 10:56:31 -  1.15
+++ newsletter_zh.properties1 Aug 2008 02:16:58 -   1.16
@@ -128,13 +128,13 @@
 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
 
-globalstats.title = Global newsletter statistics
-globalstats.total.newsletters = newsletters
-globalstats.total.terms = additional terms
-globalstats.total.publications = publications
-globalstats.total.subscriptions = subscriptions
-globalstats.total.sentsubscriptions = sent subscriptions
-globalstats.total.unsubscribeselect = Unsubscribe subscriptions
+globalstats.title = 邮件统计概况
+globalstats.total.newsletters = 邮件
+globalstats.total.terms = 附加标签
+globalstats.total.publications = 发布
+globalstats.total.subscriptions = 订阅
+globalstats.total.sentsubscriptions = 发送订阅
+globalstats.total.unsubscribeselect = 取消订阅
 
 newsletteroverview.title = Newsletter subscription overview
 newsletteroverview.newsletter = Newsletter
@@ -142,45 +142,45 @@
 newsletteroverview.numberofpublications = Publications
 newsletteroverview.numberofsubscriptions = Subscriptions
 
-newsletteroverview.link.deleteallsubscriptions = Delete all subscriptions for 
the selected newsletters
+newsletteroverview.link.deleteallsubscriptions = 
删除当前邮件的全部订阅信息
 
-newsletterdetail.title = Newsletter subscribers overview
-newsletterdetail.username = Username
-newsletterdetail.numberofthemes = Terms
-
-subscriptionoverview.title = Subscriber overview
-subscriptionoverview.username = Username
-subscriptionoverview.status = Status
-subscriptionoverview.mimetype = MIME type
-subscriptionoverview.numberofnewsletters = Newsletters
-subscriptionoverview.numberofthemes = Terms
-
-subscriptiondetail.title = Subscription details for user
-subscriptiondetail.username = Username
-subscriptiondetail.fullname = Fullname
-subscriptiondetail.emailaddress = Email address
-subscriptiondetail.status = Subscription status
-subscriptiondetail.mimetype = Preferred Mime-type
-
-subscriptiondetail.link.update = Save changes
-subscriptiondetail.link.pause = Pause all subscriptions for this user
-subscriptiondetail.link.resume = Resume all subscriptions for this user
-subscriptiondetail.link.unsubscribe = Unsubscribe this user from all 
newsletters and themes
-subscriptiondetail.link.exportselect = Export subscription data
+newsletterdetail.title = 邮件订阅者概况
+newsletterdetail.username = 用户名
+newsletterdetail.numberofthemes = 标签
+
+subscriptionoverview.title = 订阅者浏览
+subscriptionoverview.username = 用户名
+subscriptionoverview.status = 状态
+subscriptionoverview.mimetype = MIME 类型
+subscriptionoverview.numberofnewsletters = 邮件
+subscriptionoverview.numberofthemes = 标签
+
+subscriptiondetail.title = 用户订阅详情
+subscriptiondetail.username = 用户名
+subscriptiondetail.fullname = 全名
+subscriptiondetail.emailaddress = 邮件
+subscriptiondetail.status = 订阅状态
+subscriptiondetail.mimetype = 首选 Mime-type
+
+subscriptiondetail.link.update = 保存修改
+subscriptiondetail.link.pause = 暂停当前用户的全部订阅
+subscriptiondetail.link.resume = 回复当前用户的全部订阅
+subscriptiondetail.link.unsubscribe = 
取消当前用户的全部订阅(邮件及主题)
+subscriptiondetail.link.exportselect = 导出订阅数据
 subscriptiondetail.link.importcsv = 从CSV导入订阅数据
-subscriptiondetail.link.terminate = Terminate this users newsletter account
+subscriptiondetail.link.terminate = 撤销用户(们)邮件帐户
 
-confirm_noselect = You have to select at least one item
-confirm.unsubscribe.newsletter = Are you sure to unsubscribe all subscriptions 
from selected newsletter?
+confirm_noselect = 您至少选择一项
+confirm.unsubscribe.newsletter = 您确定取消当前邮件的全部订阅?
 
-site.newsletter.switchtohtml = Switch to HTML
-unsubscribe.link = Unsubscribe Link
-newsletter.ispaused = The Newsletter is paused
-sendsuccess.publish.subtitle = The publication has been published to live 
successfully
-sendsuccess.test.subtitle = The publication