[MMBASE SCM] r38583 - CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
Author: raintang
Date: 2009-09-14 07:09:15 +0200 (Mon, 14 Sep 2009)
New Revision: 38583
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
Log:
CMSC-1518 Improved messages for asset upload problems
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
===
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
2009-09-14 05:08:16 UTC (rev 38582)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
2009-09-14 05:09:15 UTC (rev 38583)
@@ -53,7 +53,7 @@
-
+
${param.uploaded}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38582 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
Author: raintang
Date: 2009-09-14 07:08:16 +0200 (Mon, 14 Sep 2009)
New Revision: 38582
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
Log:
CMSC-1518 Improved messages for asset upload problems
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
2009-09-14 04:13:55 UTC (rev 38581)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
2009-09-14 05:08:16 UTC (rev 38582)
@@ -53,7 +53,7 @@
-
+
${param.uploaded}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38581 - CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
Author: kevinshen Date: 2009-09-14 06:13:55 +0200 (Mon, 14 Sep 2009) New Revision: 38581 Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml Log: CMSC-1520 Newsletter: add inmenu option of a newsletter in the editwizards Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml === --- CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml 2009-09-14 04:08:45 UTC (rev 38580) +++ CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml 2009-09-14 04:13:55 UTC (rev 38581) @@ -49,6 +49,12 @@ Naam antwoord 收件人 + + In menu + In menu + 在菜单中 + + Paused Pauze Modified: CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml === --- CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml 2009-09-14 04:08:45 UTC (rev 38580) +++ CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml 2009-09-14 04:13:55 UTC (rev 38581) @@ -13,9 +13,10 @@ - + + - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38580 - CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
Author: kevinshen Date: 2009-09-14 06:08:45 +0200 (Mon, 14 Sep 2009) New Revision: 38580 Modified: CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml Log: CMSC-1520 Newsletter: add inmenu option of a newsletter in the editwizards Modified: CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml === --- CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml 2009-09-14 04:07:52 UTC (rev 38579) +++ CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml 2009-09-14 04:08:45 UTC (rev 38580) @@ -49,13 +49,19 @@ Naam antwoord 收件人 + + In menu + In menu + 在菜单中 + + Paused Pauze 暂停 - + Pause Start Pauze van 暂停起始 Modified: CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml === --- CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml 2009-09-14 04:07:52 UTC (rev 38579) +++ CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml 2009-09-14 04:08:45 UTC (rev 38580) @@ -13,7 +13,8 @@ - + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38579 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
Author: kevinshen Date: 2009-09-14 06:07:52 +0200 (Mon, 14 Sep 2009) New Revision: 38579 Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml Log: CMSC-1520 Newsletter: add inmenu option of a newsletter in the editwizards Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml 2009-09-14 03:18:04 UTC (rev 38578) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml 2009-09-14 04:07:52 UTC (rev 38579) @@ -49,6 +49,12 @@ Naam antwoord 收件人 + + In menu + In menu + 在菜单中 + + Paused Pauze Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml === --- CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml 2009-09-14 03:18:04 UTC (rev 38578) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml 2009-09-14 04:07:52 UTC (rev 38579) @@ -13,6 +13,7 @@ + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38578 - CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
Author: raintang
Date: 2009-09-14 05:18:04 +0200 (Mon, 14 Sep 2009)
New Revision: 38578
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
Log:
CMSC-1518 Improved messages for asset upload problems
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
===
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
2009-09-14 03:11:35 UTC (rev 38577)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
2009-09-14 03:18:04 UTC (rev 38578)
@@ -53,7 +53,16 @@
+
+
+ ${param.uploaded}
+
+
+ ${fileName}
+
+
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38577 - in CMSContainer/branches/b1_6/CMSContainer/cmsc: contentrepository/resources contentrepository/src/java/com/finalist/cmsc/repository contentrepository/src/java/com/finalist/cmsc/
Author: raintang
Date: 2009-09-14 05:11:35 +0200 (Mon, 14 Sep 2009)
New Revision: 38577
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
Log:
CMSC-1518 Improved messages for asset upload problems
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-09-14 03:10:44 UTC (rev 38576)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-09-14 03:11:35 UTC (rev 38577)
@@ -425,7 +425,11 @@
assets.upload.submit=Upload
assets.upload.results=Uploaded assets
-assets.upload.error=Upload Failed. Possible reasons: the asset(s) are
too big (max 16MB), even though it is zipped in a ZIP-file that is smaller then
the limit.the ZIP-file does not contain files.the ZIP-file is
secured with a password.the ZIP-file is damaged.some files
already exist in the system.
+assets.upload.error.big=The asset you are trying to upload is too large. The
maximum allowed file size is {0} MB
+assets.upload.error.exsit=The asset you are trying to upload already exists in
the repository. You can find this file in the
+assets.upload.error.exsit.channel= {0}
+assets.upload.error.exsit.filename=The existing file is called: {0}
+assets.upload.error.multiple=Upload Failed. Possible reasons: the
asset(s) are too big (max 16MB), even though it is zipped in a ZIP-file that is
smaller then the limit.the ZIP-file does not contain
files.the ZIP-file is secured with a password.the ZIP-file is
damaged.some files already exist in the system.
asset.upload.explanation=Upload local files to this channel. Also ZIP files
are supported to upload multiple file uploads.
asset.title=Asset
@@ -497,7 +501,7 @@
asset.search.attachment = attachment
asset.search.image = image
-asset.upload.failed.results=Failed Attachments and Images:
-asset.upload.uploaded.results=Uploaded Attachments and Images:
+asset.upload.failed.results=Failed Attachments or Images:
+asset.upload.uploaded.results=Uploaded Attachments or Images:
asset.upload.size.zero=Empty file!
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-09-14 03:10:44 UTC (rev 38576)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-09-14 03:11:35 UTC (rev 38577)
@@ -423,7 +423,11 @@
assets.upload.submit=Upload
assets.upload.results=Ge-uploade assets
-assets.upload.error=Niet alles geupload. Mogelijke oorzaken:de
bijlage(s) kunnen te groot zijn (max 16MB), ook al is deze ingepakt in een
ZIP-bestand dat kleiner is.het ZIP-bestand bevat geen
bijlagenhet ZIP-bestand is beveiligd met een wachtwoordhet
ZIP-bestand is beschadigdbestanden staan al in het CMS.
+assets.upload.error.big=The asset you are trying to upload is too large. The
maximum allowed file size is {0} MB
+assets.upload.error.exsit=The asset you are trying to upload already exists in
the repository. You can find this file in the
+assets.upload.error.exsit.channel= {0}
+assets.upload.error.exsit.filename=The existing file is called: {0}
+assets.upload.error.multiple=Upload Failed. Possible reasons: the
asset(s) are too big (max 16MB), even though it is zipped in a ZIP-file that is
smaller then the limit.the ZIP-file does not contain
files.the ZIP-file is secured with a password.the ZIP-file is
damaged.some files already exist in the system.
asset.upload.explanation=Selecteer een lokaal asset bestand, of een
ZIP-bestand dat meerdere assets kan bevatten.
asset.title=Asset
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
===
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
2009-09-
[MMBASE SCM] r38576 - in CMSContainer/trunk/CMSContainer/cmsc: contentrepository/resources contentrepository/src/java/com/finalist/cmsc/repository contentrepository/src/java/com/finalist/cmsc/reposito
Author: raintang
Date: 2009-09-14 05:10:44 +0200 (Mon, 14 Sep 2009)
New Revision: 38576
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
Log:
CMSC-1518 Improved messages for asset upload problems
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-09-12 23:08:59 UTC (rev 38575)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-09-14 03:10:44 UTC (rev 38576)
@@ -431,7 +431,11 @@
assets.upload.submit=Upload
assets.upload.results=Uploaded assets
-assets.upload.error=Upload Failed. Possible reasons: the asset(s) are
too big (max 16MB), even though it is zipped in a ZIP-file that is smaller then
the limit.the ZIP-file does not contain files.the ZIP-file is
secured with a password.the ZIP-file is damaged.some files
already exist in the system.
+assets.upload.error.big=The asset you are trying to upload is too large. The
maximum allowed file size is {0} MB
+assets.upload.error.exsit=The asset you are trying to upload already exists in
the repository. You can find this file in the
+assets.upload.error.exsit.channel= {0}
+assets.upload.error.exsit.filename=The existing file is called: {0}
+assets.upload.error.multiple=Upload Failed. Possible reasons: the
asset(s) are too big (max 16MB), even though it is zipped in a ZIP-file that is
smaller then the limit.the ZIP-file does not contain
files.the ZIP-file is secured with a password.the ZIP-file is
damaged.some files already exist in the system.
asset.upload.explanation=Upload local files to this channel. Also ZIP files
are supported to upload multiple file uploads.
asset.title=Asset
@@ -505,8 +509,8 @@
asset.search.attachment = attachment
asset.search.image = image
-asset.upload.failed.results=Failed Attachments and Images:
-asset.upload.uploaded.results=Uploaded Attachments and Images:
+asset.upload.failed.results=Failed Attachments or Images:
+asset.upload.uploaded.results=Uploaded Attachments or Images:
asset.upload.size.zero=Empty file!
simple.editor.title = Simple Editor
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-09-12 23:08:59 UTC (rev 38575)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-09-14 03:10:44 UTC (rev 38576)
@@ -428,7 +428,11 @@
assets.upload.submit=Upload
assets.upload.results=Ge-uploade assets
-assets.upload.error=Niet alles geupload. Mogelijke oorzaken:de
bijlage(s) kunnen te groot zijn (max 16MB), ook al is deze ingepakt in een
ZIP-bestand dat kleiner is.het ZIP-bestand bevat geen
bijlagenhet ZIP-bestand is beveiligd met een wachtwoordhet
ZIP-bestand is beschadigdbestanden staan al in het CMS.
+assets.upload.error.big=The asset you are trying to upload is too large. The
maximum allowed file size is {0} MB
+assets.upload.error.exsit=The asset you are trying to upload already exists in
the repository. You can find this file in the
+assets.upload.error.exsit.channel= <{0}>
+assets.upload.error.exsit.filename=The existing file is called: {0}
+assets.upload.error.multiple=Niet alles geupload. Mogelijke
oorzaken:de bijlage(s) kunnen te groot zijn (max 16MB), ook al is deze
ingepakt in een ZIP-bestand dat kleiner is.het ZIP-bestand bevat geen
bijlagenhet ZIP-bestand is beveiligd met een wachtwoordhet
ZIP-bestand is beschadigdbestanden staan al in het CMS.
asset.upload.explanation=Selecteer een lokaal asset bestand, of een
ZIP-bestand dat meerdere assets kan bevatten.
asset.title=Asset
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
2009-09-12 23:08:59 UTC (rev 38575)
+++
CMSContainer/trunk/CMSContainer/cmsc/cont
