roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1588757 [20/25] - in /roller/branches/rome2/app/src: main/java/org/apache/roller/ main/java/org/apache/roller/planet/business/ main/java/org/apache/roller/planet/business/fetcher/ main/java/org/apache/roller/planet/business/jpa/ main/java/...
Date Sun, 20 Apr 2014 13:39:01 GMT
Modified: roller/branches/rome2/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/ApplicationResources_ru.properties?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/branches/rome2/app/src/main/resources/ApplicationResources_ru.properties Sun Apr 20 13:38:51 2014
@@ -31,7 +31,6 @@ bookmarkForm.priority=\u0421\u043e\u0440
 bookmarkForm.rssUrl=URL \u041d\u043e\u0432\u043e\u0441\u0442\u0435\u0439
 bookmarkForm.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
 bookmarkForm.url=URL \u0421\u0441\u044b\u043b\u043a\u0438
-bookmarkForm.weight=Display Weight
 
 # ----------------------------------------------------------- BookmarksForm.jsp
 
@@ -55,13 +54,12 @@ bookmarksForm.addFolder=\u0414\u043e\u04
 bookmarksForm.checkAll=\u0412\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u0432\u0441\u0435
 bookmarksForm.checkNone=\u0421\u043d\u044f\u0442\u044c \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435
 bookmarksForm.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u043e\u0435
-bookmarksForm.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
 bookmarksForm.folder=\u041f\u0430\u043f\u043a\u0430 \u0421\u0441\u044b\u043b\u043e\u043a
 bookmarksForm.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c
 bookmarksForm.edit.tip=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0447\u0442\u043e\u0431\u044b \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
 bookmarksForm.move=\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u043e\u0435
 bookmarksForm.name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
-bookmarksForm.path=\u041f\u0443\u0442\u044c
+bookmarksForm.path=\u041F\u0430\u043F\u043A\u0430 \u0421\u0441\u044B\u043B\u043E\u043A
 bookmarksForm.visitLink=\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c
 bookmarksForm.visitLink.tip=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0447\u0442\u043e\u0431\u044b \u043f\u0435\u0440\u0435\u0439\u0442\u0438
 
@@ -106,15 +104,9 @@ categoriesForm.description=\u041e\u043f\
 categoriesForm.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
 categoriesForm.root=root
 categoriesForm.rootTitle=\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438
-categoriesForm.rootPrompt=\
-\u042d\u0442\u043e \u0433\u043b\u0430\u0432\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430. \
-\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 \u0447\u0442\u043e\u0431\u044b \u0443\u043f\u043e\u0440\u044f\u0434\u043e\u0447\u0438\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u0438, \u0438 \u0412\u0430\u0448\u0438 \u0447\u0438\u0442\u0430\u0442\u0435\u043b\u0438 \u043c\u043e\u0433\u0443\u0442 \
-\u043f\u043e\u0434\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u044f \u043d\u0430 \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u0443\u044e \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044e \u0412\u0430\u0448\u0435\u0433\u043e \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430. \
-\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u043f\u043e\u0434-\u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438, \u043d\u043e \u043c\u043d\u043e\u0433\u0438\u0435 \u043c\u0430\u043a\u0440\u043e\u0441\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u044e\u0442 \
-\u0442\u043e\u043b\u044c\u043a\u043e \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 \u0432\u0435\u0440\u0445\u043d\u0435\u0433\u043e \u0443\u0440\u043e\u0432\u043d\u044f.
-categoriesForm.categoryPrompt=\
-\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u0434\u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044e \u0437\u0434\u0435\u0441\u044c, \u043d\u043e \u043c\u043d\u043e\u0433\u0438\u0435 \u043c\u0430\u043a\u0440\u043e\u0441\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u044e\u0442 \
-\u0442\u043e\u043b\u044c\u043a\u043e \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 \u0432\u0435\u0440\u0445\u043d\u0435\u0433\u043e \u0443\u0440\u043e\u0432\u043d\u044f.
+categoriesForm.rootPrompt=\u042D\u0442\u043E \u0433\u043B\u0430\u0432\u043D\u0430\u044F \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044F \u0434\u043D\u0435\u0432\u043D\u0438\u043A\u0430. \
+\u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438 \u0447\u0442\u043E\u0431\u044B \u0443\u043F\u043E\u0440\u044F\u0434\u043E\u0447\u0438\u0442\u044C \u0437\u0430\u043F\u0438\u0441\u0438, \u0438 \u0412\u0430\u0448\u0438 \u0447\u0438\u0442\u0430\u0442\u0435\u043B\u0438 \u043C\u043E\u0433\u0443\u0442 \
+\u043F\u043E\u0434\u043F\u0438\u0441\u0430\u0442\u044C\u0441\u044F \u043D\u0430 \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u0443\u044E \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044E \u0412\u0430\u0448\u0435\u0433\u043E \u0434\u043D\u0435\u0432\u043D\u0438\u043A\u0430.
 categoriesForm.addCategory=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044e
 categoriesForm.checkAll=\u041e\u0442\u043c\u0435\u0442\u0438\u0442 \u0432\u0441\u0435
 categoriesForm.checkNone=\u0421\u043d\u044f\u0442\u044c \u043e\u0442\u043c\u0435\u0442\u043a\u0438
@@ -403,10 +395,10 @@ errorPage.noException=\u041d\u0435\u0442
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=\u0421\u043e\u0437\u0434\u0430\u0439\u0442\u0435 \u043d\u043e\u0432\u0443\u044e \u043f\u0430\u043f\u043a\u0443
-folderForm.add.subtitle=\u0421\u043e\u0437\u0434\u0430\u0439\u0442\u0435 \u043d\u043e\u0432\u0443\u044e \u043f\u0430\u043f\u043a\u0443 \u0437\u0430\u043a\u043b\u0430\u0434\u043e\u043a \u0432 \u043f\u0430\u043f\u043a\u0435 [{0}]
+folderForm.add.subtitle=\u0421\u043E\u0437\u0434\u0430\u0439\u0442\u0435 \u043D\u043E\u0432\u0443\u044E \u043F\u0430\u043F\u043A\u0443 \u0437\u0430\u043A\u043B\u0430\u0434\u043E\u043A
 
 folderForm.edit.title=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u0443\u0439\u0442\u0435 \u043f\u0430\u043f\u043a\u0443
-folderForm.edit.subtitle=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u043a\u043b\u0430\u0434\u043e\u043a \u0432 \u043f\u0430\u043f\u043a\u0435 [{0}]
+folderForm.edit.subtitle=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043F\u0430\u043F\u043A\u0438 \u0437\u0430\u043A\u043B\u0430\u0434\u043E\u043A [{0}]
 
 folderForm.correct.title=\u041a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0439 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u043f\u0430\u043f\u043a\u0438
 folderForm.correct.subtitle=\u041a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0435 \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u043a\u043b\u0430\u0434\u043e\u043a
@@ -675,20 +667,12 @@ pageRemove.pageName=\u0418\u043c\u044f \
 commonPingTargets.subtitle=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043e\u0431\u0449\u0438\u043c\u0438 \u0430\u0434\u0440\u0435\u0441\u0430\u043c\u0438 \u043f\u0438\u043d\u0433\u0430 \u0434\u043b\u044f \u0432\u0441\u0435\u0445 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u043e\u0432
 commonPingTargets.commonPingTargets=\u041e\u0431\u0449\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
 commonPingTargets.explanation=\u042d\u0442\u0438 \u0441\u0430\u0439\u0442\u044b \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0441\u043e \u0432\u0441\u0435\u0445 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u043e\u0432 \u0434\u043b\u044f \u043f\u0438\u043d\u0433\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f
-customPingTargets.customPingTargets=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
-customPingTargets.subtitle=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u043c\u0438 \u0430\u0434\u0440\u0435\u0441\u0430\u043c\u0438 \u043f\u0438\u043d\u0433\u0430 \u0434\u043b\u044f \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430 <span>{0}</span>
-customPingTargets.explanation=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u0443 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0441\u0430\u0439\u0442\u043e\u0432, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u043e\u043f\u0438\u043d\u0433\u043e\u0432\u0430\u0442\u044c, \u043d\u043e \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u043f\u043e\u043a\u0430 \u043d\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0441 \u043e\u0431\u0449\u0438\u0445 \u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u043f\u0438\u043d\u0433\u0430. \u0421\u0430\u0439\u0442\u044b \u0431\u0443\u0434\u0443\u0442 \u0438\u0437\u0432\u0435\u0449\u0430\u0442\u044c \u0412\u0430\u0441 \u043e\u0431 URL \u043f\u0438\u043d\u0433\u0430, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0432\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u0441\u043f\u043e\
 u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c. \u0421\u0430\u0439\u0442\u044b, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0412\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u0435 \u0437\u0434\u0435\u0441\u044c, \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0442\u043e\u043b\u044c\u043a\u043e \u0441 \u044d\u0442\u043e\u0433\u043e \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430. 
 
-customPingTargets.disAllowedExplanation=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430 \u0437\u0430\u043f\u0440\u0435\u0449\u0435\u043d\u043e \u043d\u0430 \u044d\u0442\u043e\u043c \u0441\u0430\u0439\u0442\u0435. \u0427\u0442\u043e\u0431\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043e\u0431\u0449\u0438\u0439 \u0430\u0434\u0440\u0435\u0441 \u043f\u0438\u043d\u0433\u0430, \u043e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043a \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0443.
 pings.title=\u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u043f\u0438\u043d\u0433 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430
 pings.subtitle=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u043f\u0438\u043d\u0433\u0430 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430  <span>{0}</span>
 pings.explanation=\u041f\u0438\u043d\u0433 \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u0412\u0430\u043c \u00ab\u0443\u0432\u0435\u0434\u043e\u043c\u0438\u0442\u044c\u00bb \u0441\u0430\u0439\u0442\u044b \u043e \u0442\u043e\u043c, \u0447\u0442\u043e \u0412\u0430\u0448 \u0434\u043d\u0435\u0432\u043d\u0438\u043a \u0438\u0437\u043c\u0435\u043d\u0438\u043b\u0441\u044f, \u0441 \u0442\u0435\u043c, \u0447\u0442\u043e\u0431\u044b \u0441\u0430\u0439\u0442\u044b \u043c\u043e\u0433\u043b\u0438 \u043f\u0440\u043e\u0447\u0435\u0441\u0442\u044c \u0412\u0430\u0448\u0443 \u043b\u0435\u043d\u0442\u0443 \u0438 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u043f\u0438\u043d\u0433 \u0442\u0435\u0445 \u0441\u0430\u0439\u0442\u043e\u0432, \u043a\u0
 43e\u0442\u043e\u0440\u044b\u0435 \u0445\u043e\u0442\u0435\u043b\u0438 \u0431\u044b \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u044f\u0442\u044c \u043e \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0438 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430 \u043f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u043e. \u0422\u0430\u043a\u0436\u0435 \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u0440\u0443\u0447\u043d\u0443\u044e \u0432\u044b\u0437\u0432\u0430\u0442\u044c \u043f\u0438\u043d\u0433 \u0434\u043b\u044f \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0445 \u0441\u0430\u0439\u0442\u043e\u0432 \u0441 \u044d\u0442\u043e\u0439 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b. \u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435: \u043e\u0436\u0438\u0434\u0430\u0435\u0442\u0441\u044f, \u0447\u0442\u043e \u0412\u044b \u0437\u0430\u0440\u0435\u0433\u0435\u0441\u0442\u0440\u0438\u0440\u0443\u0435\u0442\u0435 \u0434\u043d\u0435\u0432\u043d\u0438\u043
 a \u043d\u0430 \u0441\u0430\u0439\u0442\u0435 \u043f\u0435\u0440\u0435\u0434 \u0442\u0435\u043c, \u043a\u0430\u043a \u043f\u043e\u0441\u044b\u043b\u0430\u0442\u044c \u043f\u0438\u043d\u0433.
 pings.commonPingTargets=\u041e\u0431\u0449\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
 pings.commonPingTargetsExplanation=\u042d\u0442\u0438 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430 \u0431\u044b\u043b\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u044b \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u043e\u043c \u0441\u0430\u0439\u0442\u0430 \u0434\u043b\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c\u0438. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u043e\u0441\u043b\u0430\u0442\u044c \u043f\u0438\u043d\u0433 \u043d\u0430 \u043b\u044e\u0431\u043e\u0439 \u0438\u0437 \u044d\u0442\u0438\u0445 \u0437\u043d\u0430\u043a\u043e\u043c\u044b\u0445 \u0441\u0430\u0439\u0442\u043e\u0432.
-pings.customPingTargets=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
-pings.customPingTargetsExplanationEmpty=\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0430\u0439\u0442, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044f \u043f\u0443\u043d\u043a\u0442 \u043c\u0435\u043d\u044e <strong> \u00ab\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430\u00bb </strong>. \u0412\u0430\u0448\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0442\u043e\u043b\u044c\u043a\u043e \u0412\u0430\u043c. \u0421\u0435\u0439\u0447\u0430\u0441 \u0443 \u0412\u0430\u0441 \u043d\u0435\u0442 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0445 \u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u043f
 \u0438\u043d\u0433\u0430.You can also add sites yourself using the \
-menu item <strong>Custom Ping Targets</strong>.
-pings.customPingTargetsExplanationNonEmpty=\u042d\u0442\u0438 \u0441\u0430\u0439\u0442\u044b \u0437\u0430\u0434\u0430\u043d\u044b \u0434\u043b\u044f \u0412\u0430\u0441 \u043a\u0430\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430. \u041e\u043d\u0438 \u043c\u043e\u0433\u0443\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0412\u0430\u043c\u0438.
 
 ping.successful=\u041f\u0438\u043d\u0433 \u043f\u0440\u043e\u0448\u0435\u043b \u0443\u0441\u043f\u0435\u0448\u043d\u043e
 ping.transmittedButError=\u041f\u0438\u043d\u0433 \u0431\u044b\u043b \u043f\u0435\u0440\u0435\u0434\u0430\u043d, \u043d\u043e \u0441\u0435\u0440\u0432\u0435\u0440 \u043e\u0442\u0432\u0435\u0442\u0438\u043b \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u043c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u043e\u0431 \u043e\u0448\u0438\u0431\u043a\u0435
@@ -701,7 +685,6 @@ pingResult.OK=OK
 
 pingTarget.pingTarget=\u0410\u0434\u0440\u0435\u0441 \u043f\u0438\u043d\u0433\u0430
 
-customPingTarget.subtitle=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430 \u0432 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0435 <span>{0}</span>
 commonPingTarget.subtitle=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043e\u0431\u0449\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
 
 pingTarget.name=\u0418\u043c\u044f
@@ -906,7 +889,6 @@ tabbedmenu.website.members=\u0423\u0447\
 tabbedmenu.website.inviteMember=\u041f\u0440\u0438\u0433\u043b\u0430\u0441\u0438\u0442\u044c \u0443\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0430
 tabbedmenu.website.maintenance=\u041e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u0435
 tabbedmenu.weblog.pingSetup=\u041f\u0438\u043d\u0433\u0438
-tabbedmenu.weblog.customPingTargets=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0430\u0434\u0440\u0435\u0441\u0430\u0442\u044b \u043f\u0438\u043d\u0433\u0430
 tabbedmenu.weblog.export=\u042d\u043a\u0441\u043f\u043e\u0440\u0442
 tabbedmenu.weblog.import=\u0418\u043c\u043f\u043e\u0440\u0442
 tabbedmenu.weblog.flushCache=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043a\u044d\u0448

Modified: roller/branches/rome2/app/src/main/resources/ApplicationResources_sl.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/ApplicationResources_sl.properties?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/ApplicationResources_sl.properties (original)
+++ roller/branches/rome2/app/src/main/resources/ApplicationResources_sl.properties Sun Apr 20 13:38:51 2014
@@ -43,9 +43,6 @@ bookmarkForm.priority=Zaporedje Sortiran
 bookmarkForm.rssUrl=URL naslova Kanala Novic
 bookmarkForm.save=Shrani
 bookmarkForm.url=Zaznamek URL
-bookmarkForm.weight=Prika\u017Ei Ute\u017E
-
-bookmarkForm.error.invalidURL=Nepravilen URL: {0}
 
 # errors from validation
 Bookmark.error.nameNull=Polje za ime je zahtevano
@@ -53,8 +50,6 @@ Bookmark.error.nameSize=Ime ne more biti
 Bookmark.error.descriptionSize=Opis ne more biti dalj\u0161i od 255 znakov
 Bookmark.error.urlNull=Polje za URL je zahtevano
 Bookmark.error.urlBad=Vneseni url ni pravilen
-Bookmark.error.weightNull=Polje za ute\u017E je zahtevano
-Bookmark.error.weightNotInt=Ute\u017E mora biti veljavno celo \u0161tevilo
 Bookmark.error.priorityNull=Polje za prednost je zahtevano
 Bookmark.error.priorityNotInt=Prednost mora biti veljavno celo \u0161tevilo
 Bookmark.error.imageBad=Vneseni url za sliko ni pravilen
@@ -86,15 +81,14 @@ bookmarksForm.checkAll=Izberi Vse
 bookmarksForm.checkNone=Ni\u010Desar ne Izberi
 bookmarksForm.delete=Izbri\u0161i izbrano
 bookmarksForm.delete.confirm=Izbri\u0161em izbrane zaznamke?
-bookmarksForm.description=Opis
 bookmarksForm.folder=Imenik Zaznamka
 bookmarksForm.priority=Priority
 bookmarksForm.edit=urejanje
-bookmarksForm.edit.tip=Klikni za urejanje tega imenika ali zaznamka
+bookmarksForm.edit.tip=Klikni za urejanje tega zaznamka
 bookmarksForm.move=Premakni izbrano
 bookmarksForm.move.confirm=Premakni izbrane zaznamke?
 bookmarksForm.name=Ime
-bookmarksForm.path=Pot
+bookmarksForm.path=Imenik Zaznamka
 bookmarksForm.visitLink=Obisk
 bookmarksForm.visitLink.tip=Klikni za obisk strani
 
@@ -164,15 +158,9 @@ categoriesForm.description=Opis
 categoriesForm.edit=urejanje
 categoriesForm.root=korenski
 categoriesForm.rootTitle=Kategorije
-categoriesForm.rootPrompt=\
-To so va\u0161e weblog kategorije na najvi\u0161jem nivoju. \
+categoriesForm.rootPrompt=To so va\u0161e weblog kategorije na najvi\u0161jem nivoju. \
 Kategorije lahko uporabite za organizacijo va\u0161ih weblog vnosov v va\u0161e \u010Ditalce in tako lahko \
-izbirate lo\u010Dene kanale Novic za vsako va\u0161o kategorijo. \
-Lahko tudi definirate podkategorije, toda ve\u010Dina makrojev Roller-ja prika\u017Ee \
-samo kategorije na vrhnjem nivoju.
-categoriesForm.categoryPrompt=\
-Tukaj lahko dodajate pod-kategorije, vendar ve\u010Dina Roller-jevih makrojev prika\u017Ee \
-samo kategorije na vrhnjem nivoju.
+izbirate lo\u010Dene kanale Novic za vsako va\u0161o kategorijo.
 categoriesForm.addCategory=Dodaj Kategorijo
 categoriesForm.checkAll=Potrdi Vse
 categoriesForm.checkNone=Ni\u010D ne Potrdi 
@@ -602,10 +590,10 @@ errorPage.noException=Ni sklada za slede
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=Dodaj Imenik
-folderForm.add.subtitle=Dodajanje novega imenika zaznamkov v imenik [{0}]
+folderForm.add.subtitle=Dodajanje novega imenika zaznamkov
 
 folderForm.edit.title=urejanje Imenika
-folderForm.edit.subtitle=Urejanje imenika zaznamkov v imeniku [{0}]
+folderForm.edit.subtitle=Urejanje imenika zaznamkov [{0}]
 
 folderForm.popravi.title=Popravi Imenik
 folderForm.popravi.subtitle=Popravljanje urejanja imenika zaznamkov  
@@ -1092,19 +1080,6 @@ commonPingTargets.commonPingTargets=Skup
 commonPingTargets.explanation=Ta ciljna mesta so na razpolago vsem weblogom \
 za popravljanje ping-ov webloga.
 
-customPingTargets.customPingTargets=Weblog Ciljni Ping-i po Meri
-customPingTargets.subtitle=Upravljanje Ciljnih Ping-ov po Meri za weblog <span>{0}</span>
-customPingTargets.explanation=Ta stran je namenjena za nastavitev strani, ki jih \u017Eelite ping-ati \
-ki \u0161e ni na razpolago na skupnih ping ciljih.  \
-Strani bodo normalno ponujale ping url naslove, ki naj bi jih uporabljali. \
-Strani, ki jih konfigurirate tukaj so na razpolago \
-znotraj tega spletnega mesta.
-
-customPingTargets.disAllowedExplanation=Uporaba prikrojenih ciljnih ping-ov ni \
-dovoljena na tem mestu. Za dodajanje skupnega dodatnega ciljnega ping-a, \
-prosim kontaktirajte va\u0161ega administratorja.
-
-
 pings.title=Konfiguracija Avtomati\u010Dnih Pingov Weblog-a
 pings.subtitle=nstavitev avtomati\u010Dnih pingov za weblog <span>{0}</span>
 pings.explanation=Pingi omogo\u010Dajo, da obve\u0161\u010Date spletna mesta, da je va\u0161 weblog spremenjen \
@@ -1118,13 +1093,6 @@ pings.commonPingTargets=Skupni Ciljni Pi
 pings.commonPingTargetsExplanation=Ti ciljni pingi so bili konfigurirani od va\u0161ega \
 administratorja spletnega mesta za vse uporabnike. \
 Vi lahko po\u0161ljete pinge keterim koli znanim spletnim mestom.
-pings.customPingTargets=Uporabni\u0161ki Ciljni Pingi
-pings.customPingTargetsExplanationEmpty=Vi lahko sami dodate strani z uporabo \
-menijske postavke <strong>Uporabni\u0161ki Ciljni Pingi</strong>. \
-Va\u0161i uporabni\u0161ki ciljni pingi so dostopni samo vam.  Trenutno vi \
-nimate nobenih ciljnih pingov.
-pings.customPingTargetsExplanationNonEmpty=Ta mesta ste nastavili za  \
-va\u0161e uporabni\u0161ke ciljne pinge. Na razpolago so samo vam. 
 
 ping.successful=Ping je bil uspe\u0161en.
 ping.transmittedButError=Ping je bil prenesen, toda stre\u017Enik \
@@ -1141,7 +1109,6 @@ pingResult.OK=OK
 
 pingTarget.pingTarget=Ciljni Ping
 
-customPingTarget.subtitle=Urejanje uporabni\u0161kih ciljnih ping-ov v weblog-u <span>{0}</span>
 commonPingTarget.subtitle=Urejanje skupnih ciljnih ping-ov
 
 pingTarget.name=Ime
@@ -1393,7 +1360,6 @@ tabbedmenu.website.members=\u010Clani
 tabbedmenu.website.inviteMember=Povabite \u010Clana
 tabbedmenu.website.maintenance=Vzdr\u017Eevanje
 tabbedmenu.weblog.pingSetup=Pingi
-tabbedmenu.weblog.customPingTargets=Uporabni\u0161ki cilji pinga
 tabbedmenu.weblog.export=Izvoz
 tabbedmenu.weblog.import=Uvoz
 tabbedmenu.weblog.flushCache=Izprazni Predpomnilnik

Modified: roller/branches/rome2/app/src/main/resources/ApplicationResources_vi.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/ApplicationResources_vi.properties?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/ApplicationResources_vi.properties (original)
+++ roller/branches/rome2/app/src/main/resources/ApplicationResources_vi.properties Sun Apr 20 13:38:51 2014
@@ -66,7 +66,6 @@ bookmarkForm.priority=Th\u1ee9 t\u1ee5 \
 bookmarkForm.rssUrl=\u0110\u1ecba ch\u1ec9 Newsfeed
 bookmarkForm.save=L\u01b0u
 bookmarkForm.url=\u0110\u1ecba ch\u1ec9 URL c\u1ee7a th\u1ebb \u0111\u00e1nh d\u1ea5u
-bookmarkForm.weight=Hi\u1ec3n th\u1ecb tr\u1ecdng s\u1ed1
 
 # --------------------------------------------------------- BookmarksForm.jsp
 
@@ -75,13 +74,12 @@ bookmarksForm.addFolder=Th\u00eam th\u01
 bookmarksForm.checkAll=Ch\u1ecdn t\u1ea5t c\u1ea3
 bookmarksForm.checkNone=Kh\u00f4ng ch\u1ecdn g\u00ec c\u1ea3
 bookmarksForm.delete=X\u00f3a nh\u1eefng l\u1ef1a ch\u1ecdn
-bookmarksForm.description=Ch\u00fa th\u00edch
 bookmarksForm.edit=So\u1ea1n
 bookmarksForm.edit.tip=Nh\u1eafp chu\u1ed9t \u0111\u1ec3 so\u1ea1n th\u01b0 m\u1ee5c ho\u1eb7c th\u1ebb \u0111\u00e1nh d\u1ea5u
 bookmarksForm.folder=Th\u01b0 m\u1ee5c
 bookmarksForm.move=D\u1ecbch chuy\u1ec3n l\u1ef1a ch\u1ecdn
 bookmarksForm.name=T\u00ean
-bookmarksForm.path=\u0110\u01b0\u1eddng d\u1eabn
+bookmarksForm.path=Th\u01B0 m\u1EE5c
 bookmarksForm.root=g\u1ed1c
 bookmarksForm.visitLink=Th\u0103m
 bookmarksForm.visitLink.tip=Nh\u1eafp chu\u1ed9t \u0111\u1ec3 v\u00e0o th\u0103m site n\u00e0y

Modified: roller/branches/rome2/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/branches/rome2/app/src/main/resources/ApplicationResources_zh_CN.properties Sun Apr 20 13:38:51 2014
@@ -35,15 +35,13 @@ bookmarkForm.priority=\u6392\u5e8f\u4f18
 bookmarkForm.rssUrl=\u65b0\u95fb\u79cd\u5b50URL
 bookmarkForm.save=\u4fdd\u5b58
 bookmarkForm.url=\u4e66\u7b7eURL
-bookmarkForm.weight=\u663e\u793a\u5bbd\u5ea6
 bookmarksForm.addBookmark=\u6dfb\u52a0\u4e00\u4e2a\u4e66\u7b7e
 bookmarksForm.addFolder=\u6dfb\u52a0\u4e66\u7b7e\u5939
 bookmarksForm.checkAll=\u5168\u90e8\u9009\u62e9
 bookmarksForm.checkNone=\u4e00\u4e2a\u4e0d\u9009
 bookmarksForm.delete=\u5220\u9664\u9009\u4e2d\u7684
-bookmarksForm.description=\u63cf\u8ff0
 bookmarksForm.edit=\u7f16\u8f91
-bookmarksForm.edit.tip=\u70b9\u51fb\uff0c\u7136\u540e\u7f16\u8f91\u6b64\u4e66\u7b7e\u6216\u4e66\u7b7e\u5939
+bookmarksForm.edit.tip=\u70B9\u51FB\uFF0C\u7136\u540E\u7F16\u8F91\u6B64\u4E66\u7B7E
 bookmarksForm.error.move=\u79fb\u52a8\u9519\u8bef\uff0c\u4e0d\u5141\u8bb8\u79fb\u52a8\u7236\u76ee\u5f55\u5230\u5b50\u76ee\u5f55
 bookmarksForm.folder=\u4e66\u7b7e\u5939
 bookmarksForm.folderPrompt=\u8fd9\u662f\u4e00\u4e2a\u4e66\u7b7e\u3002\u60a8\u53ef\u4ee5\u5728\u8fd9\u91cc\u6dfb\u52a0\u4e66\u7b7e\u6216\u8005\u4e66\u7b7e\u5939\uff0c\u4f46\u662f\u5982\u679c\u60a8\u4e0d\u5728\u7f51\u5fd7\u6a21\u677f\u4e2d\u5229\u7528\u5b8f\u6765\u5f15\u7528\uff0c\u4e66\u7b7e\u5c06\u4e0d\u663e\u793a\u3002
@@ -51,7 +49,7 @@ bookmarksForm.folderTitle=\u4e66\u7b7e\u
 bookmarksForm.importBookmarks=\u5bfc\u5165OPML\u683c\u5f0f\u7684\u4e66\u7b7e
 bookmarksForm.move=\u79fb\u52a8\u9009\u4e2d\u7684
 bookmarksForm.name=\u540d\u5b57
-bookmarksForm.path=\u8def\u5f84
+bookmarksForm.path=\u4E66\u7B7E\u5939
 bookmarksForm.root=\u6839
 bookmarksForm.rootPrompt=\u8fd9\u662f\u60a8\u7684\u9876\u5c42\u4e66\u7b7e\u5939\u3002\u8fd9\u91cc\u4fdd\u7559\u7684\u4e66\u7b7e\u5c06\u4f1a\u5728\u60a8\u7684\u7f51\u5fd7\u7684blogroll\u663e\u793a\uff08\u8fd9\u91cc\u5047\u8bbe\u60a8\u4f7f\u7528\u9ed8\u8ba4\u4e3b\u9898\uff09\u3002\u60a8\u4e5f\u53ef\u4ee5\u5efa\u7acb\u4e66\u7b7e\u5939\uff0c\u76f8\u5e94\u7684\uff0c\u5982\u679c\u60a8\u9700\u8981\u663e\u793a\u4e66\u7b7e\u5939\u7684\u5185\u5bb9\uff0c\u5c31\u9700\u8981\u5728\u60a8\u7684\u6a21\u677f\u4e2d\u5f15\u7528\u76f8\u5e94\u7684\u5b8f\u6765\u4f7f\u7528\u5b83\u3002
 bookmarksForm.rootTitle=\u4e66\u7b7e
@@ -72,7 +70,6 @@ calendar.prev=\u524d\u9875
 calendar.summary=\u65e5\u5fd7\u5f52\u6863\u65e5\u5386
 calendar.today=\u4eca\u5929
 categoriesForm.addCategory=\u6dfb\u52a0\u5206\u7c7b
-categoriesForm.categoryPrompt=\u60a8\u53ef\u4ee5\u5728\u8fd9\u91cc\u6dfb\u52a0\u4e00\u4e2a\u5b50\u7c7b\uff0c\u4f46\u662fRoller\u53ea\u63d0\u4f9b\u4e00\u4e9b\u663e\u793a\u9876\u7ea7\u5206\u7c7b\u7684\u5b8f\u3002
 categoriesForm.checkAll=\u5168\u90e8\u9009\u62e9
 categoriesForm.checkNone=\u4e00\u4e2a\u4e0d\u9009
 categoriesForm.delete=\u5220\u9664
@@ -85,7 +82,7 @@ categoriesForm.parent=\u5206\u7c7b
 categoriesForm.path=\u8def\u5f84
 categoriesForm.remove=\u79fb\u9664
 categoriesForm.root=\u6839
-categoriesForm.rootPrompt=\u8fd9\u91cc\u60a8\u7684\u9876\u7ea7\u5206\u7c7b\u3002\u4f60\u53ef\u4ee5\u5229\u7528\u5206\u7c7b\u6765\u7ec4\u7ec7\u60a8\u7684\u65e5\u5fd7\uff0c\u60a8\u7684\u62dc\u8bbf\u8005\u4e5f\u53ef\u4ee5\u901a\u8fc7\u9009\u62e9\u67d0\u4e00\u4e2a\u5206\u7c7b\u6765\u8ba2\u9605\u4ed6\u611f\u5174\u8da3\u7684\u4e13\u9898\u3002\u4f60\u53ef\u4ee5\u5b9a\u4e49\u5b50\u7c7b\uff0c\u4f46\u662fRoller\u53ea\u63d0\u4f9b\u663e\u793a\u9876\u7ea7\u5206\u7c7b\u7684\u5b8f\u3002
+categoriesForm.rootPrompt=\u8FD9\u91CC\u60A8\u7684\u9876\u7EA7\u5206\u7C7B\u3002\u4F60\u53EF\u4EE5\u5229\u7528\u5206\u7C7B\u6765\u7EC4\u7EC7\u60A8\u7684\u65E5\u5FD7\uFF0C\u60A8\u7684\u62DC\u8BBF\u8005\u4E5F\u53EF\u4EE5\u901A\u8FC7\u9009\u62E9\u67D0\u4E00\u4E2A\u5206\u7C7B\u6765\u8BA2\u9605\u4ED6\u611F\u5174\u8DA3\u7684\u4E13\u9898\u3002
 categoriesForm.rootTitle=\u5206\u7c7b
 categoriesForm.subtitle=\u7ba1\u7406\u7f51\u5fd7 <span>{0}</span> \u7684\u5206\u7c7b
 categoriesForm.warn.notMoving=\u4e0d\u80fd\u79fb\u52a8\u7236\u7c7b\u76ee\u5f55 [{0} ]\u5230\u5b83\u7684\u5b50\u7c7b\u4e2d\u53bb
@@ -257,11 +254,6 @@ createWebsite.tip.theme=\u4e3b\u9898\u75
 createWebsite.tip.timezone=\u65f6\u533a\u7528\u6765\u786e\u5b9a\u7f51\u5fd7\u4e2d\u7684\u65e5\u5fd7\u5c06\u4ee5\u4f55\u79cd\u4e60\u60ef\u663e\u793a\u3002
 createWebsite.title=\u5efa\u7acb\u7f51\u5fd7
 createWebsite.weblogUrl=\u7f51\u5fd7URL
-customPingTarget.subtitle=\u7f16\u8f91\u5b9a\u5236\u7f51\u5fd7 <span>{0}</span> \u4e2d\u7684Ping\u76ee\u6807
-customPingTargets.customPingTargets=\u5b9a\u5236\u7f51\u5fd7Ping\u76ee\u6807
-customPingTargets.disAllowedExplanation=\u6b64\u7ad9\u70b9\u7981\u6b62\u4f7f\u7528\u5b9a\u5236Ping\u76ee\u6807\u529f\u80fd\u3002\u5982\u679c\u60f3\u4f7f\u7528\u6b64\u529f\u80fd\uff0c\u8bf7\u540c\u7ba1\u7406\u5458\u8054\u7cfb\u3002
-customPingTargets.explanation=\u4f7f\u7528\u6b64\u9875\u5efa\u7acb\u666e\u901aPing\u5bf9\u8c61\u4e2d\u6ca1\u6709\u7684\u800c\u60a8\u53c8\u60f3\u8981\u7684\u7ad9\u70b9\u3002\u901a\u5e38\u8be5\u7ad9\u70b9\u4f1a\u63d0\u4f9b\u4e00\u4e2aPing\u7684URL\u3002\u8fd9\u91cc\u60a8\u914d\u7f6e\u7684Ping\u53ea\u9650\u4e8e\u60a8\u81ea\u5df1\u4f7f\u7528\u3002
-customPingTargets.subtitle=\u7ba1\u7406\u7f51\u5fd7 <span>{0}</span> \u7684\u5b9a\u5236Ping\u76ee\u6807
 editPages.title.removeOK=\u786e\u8ba4\u79fb\u9664\u6a21\u677f
 email.comment.anonymous=\u533f\u540d\u7528\u6237\u8bc4\u8bba
 email.comment.respond=\u56de\u590d\u6b64\u8bc4\u8bba\u5728
@@ -354,7 +346,7 @@ errors.noslashes={0}  \u4e0d\u80fd\u5305
 errors.range={0}  \u5fc5\u987b\u5728 {1} \u5230 {2} \u7684\u8303\u56f4\u5185\u3002
 errors.required={0} \u5fc5\u987b\u8f93\u5165\u3002
 errors.short={0} \u5fc5\u987b\u662f\u4e00\u4e2a\u77ed\u6574\u6570\u3002
-folderForm.add.subtitle=\u5728\u4e66\u7b7e\u5939 [{0} ]\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7684\u4e66\u7b7e\u5939
+folderForm.add.subtitle=\u6DFB\u52A0\u4E00\u4E2A\u65B0\u7684\u4E66\u7B7E\u5939
 folderForm.add.title=\u6dfb\u52a0\u6587\u4ef6\u5939
 folderForm.addFolder=\u521b\u5efa\u65b0\u7684\u4e66\u7b7e\u5939
 folderForm.cancel=\u53d6\u6d88
@@ -362,7 +354,7 @@ folderForm.correct.subtitle=\u6b63\u5728
 folderForm.correct.title=\u4fee\u6539\u6587\u4ef6\u5939
 folderForm.correctFolder=\u66f4\u6b63\u4e66\u7b7e\u5939
 folderForm.description=\u63cf\u8ff0
-folderForm.edit.subtitle=\u6b63\u5728\u7f16\u8f91\u6587\u4ef6\u5939 [{0}] \u4e2d\u7684\u4e66\u7b7e\u5939
+folderForm.edit.subtitle=\u6B63\u5728\u7F16\u8F91\u6587\u4EF6\u5939 [{0}]
 folderForm.edit.title=\u7f16\u8f91\u6587\u4ef6\u5939
 folderForm.editFolder=\u7f16\u8f91\u4e66\u7b7e\u5939
 folderForm.name=\u540d\u5b57
@@ -584,10 +576,6 @@ pingTarget.saved=Ping\u76ee\u6807\u5df2\
 pingTarget.sendPingNow=\u53d1\u9001Ping\u2026\u2026
 pingTarget.unknownHost=\u8be5URL\u4e3b\u673a\u5730\u5740\u4e0d\u5b58\u5728\u3002
 pings.commonPingTargets=\u666e\u901aPing\u76ee\u6807
-pings.commonPingTargetsExplanation=\u8fd9\u4e9bPing\u76ee\u6807\u5df2\u7ecf\u88ab\u7ad9\u70b9\u7ba1\u7406\u5458\u4e3a\u6240\u6709\u7684\u7528\u6237\u914d\u7f6e\u3002\u4f60\u53ef\u4ee5\u53d1\u9001Ping\u5230\u5176\u4e2d\u4efb\u4f55\u4e00\u4e2a\u7ad9\u70b9\u3002
-pings.customPingTargets=\u5b9a\u5236Ping\u76ee\u6807
-pings.customPingTargetsExplanationEmpty=\u60a8\u4e5f\u53ef\u4ee5\u901a\u8fc7<strong>\u5b9a\u5236Ping\u76ee\u6807</strong>\u9009\u9879\u6765\u6dfb\u52a0\u81ea\u5df1\u7684Ping\u3002\u60a8\u7684\u5b9a\u5236Ping\u76ee\u6807\u53ea\u80fd\u81ea\u5df1\u4f7f\u7528\u3002\u73b0\u5728\u60a8\u8fd8\u6ca1\u6709\u5b9a\u5236Ping\u76ee\u6807\u3002
-pings.customPingTargetsExplanationNonEmpty=\u8fd9\u4e9b\u662f\u60a8\u81ea\u5df1\u5b9a\u5236\u7684Ping\u76ee\u6807\uff0c\u5b83\u4eec\u53ea\u80fd\u4f9b\u60a8\u81ea\u5df1\u4f7f\u7528\u3002
 pings.explanation=Ping\u5141\u8bb8\u60a8\u901a\u77e5\u7ad9\u70b9\u60a8\u7684\u7f51\u5fd7\u5df2\u6709\u66f4\u65b0\uff0c\u53ef\u4ee5\u91cd\u65b0\u8ba2\u9605\u3002\u60a8\u53ef\u4ee5\u4f7f\u7528\u81ea\u52a8\u53d1\u9001Ping\u529f\u80fd\u6765\u968f\u65f6\u63d0\u9192\u90a3\u4e9b\u7ad9\u70b9\u2014\u2014\u60a8\u7684\u7f51\u5fd7\u5df2\u66f4\u65b0\uff0c\u5f53\u7136\uff0c\u60a8\u4e5f\u53ef\u4ee5\u4f7f\u7528\u624b\u52a8\u53d1\u9001\u3002<strong>\u6ce8\u610f\uff1a</strong>\u901a\u5e38\uff0c\u5728\u53d1\u9001Ping\u4e4b\u524d\u60a8\u4e00\u5b9a\u8981\u5148\u6ce8\u518c\u4e00\u4e2a\u7f51\u5fd7\u3002
 pings.subtitle=\u4e3a\u7f51\u5fd7<span>{0}</span> \u8bbe\u5b9a\u81ea\u52a8\u53d1\u9001Ping
 pings.title=\u914d\u7f6e\u7f51\u5fd7\u4e3a\u81ea\u52a8\u53d1\u9001Ping
@@ -727,7 +715,6 @@ tabbedmenu.weblog=\u7f51\u5fd7\u7ba1\u74
 tabbedmenu.weblog.archives=\u5f52\u6863
 tabbedmenu.weblog.categories=\u5206\u7c7b
 tabbedmenu.weblog.commentManagement=\u8bc4\u8bba
-tabbedmenu.weblog.customPingTargets=\u5b9a\u5236Ping\u76ee\u6807
 tabbedmenu.weblog.export=\u5bfc\u51fa
 tabbedmenu.weblog.flushCache=\u540c\u6b65\u7f13\u5b58
 tabbedmenu.weblog.import=\u5bfc\u5165

Modified: roller/branches/rome2/app/src/main/resources/ApplicationResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/ApplicationResources_zh_TW.properties?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/ApplicationResources_zh_TW.properties (original)
+++ roller/branches/rome2/app/src/main/resources/ApplicationResources_zh_TW.properties Sun Apr 20 13:38:51 2014
@@ -67,7 +67,6 @@ bookmarkForm.priority=\u6307\u5b9a\u512a
 bookmarkForm.rssUrl=Newsfeed URL
 bookmarkForm.save=\u5b58\u6a94
 bookmarkForm.url=\u66f8\u7c64URL
-bookmarkForm.weight=\u986f\u793a\u5bec\u5ea6
 
 # --------------------------------------------------------- BookmarksForm.jsp
 
@@ -76,13 +75,12 @@ bookmarksForm.addFolder=\u65b0\u589e\u8c
 bookmarksForm.checkAll=\u5168\u9078
 bookmarksForm.checkNone=\u53cd\u9078\u53d6
 bookmarksForm.delete=\u522a\u9664\u5df2\u9078\u64c7
-bookmarksForm.description=\u5167\u5bb9
 bookmarksForm.edit=\u7de8\u8f2f
 bookmarksForm.edit.tip=\u9ede\u9078\u6b64\u8655\u4ee5\u7de8\u8f2f\u6b64\u66f8\u7c64
 bookmarksForm.folder=\u8cc7\u6599\u593e
 bookmarksForm.move=\u642c\u79fb\u5df2\u9078\u53d6
 bookmarksForm.name=\u540d\u7a31
-bookmarksForm.path=\u8def\u5f91
+bookmarksForm.path=\u8CC7\u6599\u593E
 bookmarksForm.root=\u6839\u8def\u5f91
 bookmarksForm.visitLink=\u700f\u89bd\u7db2\u7ad9
 bookmarksForm.visitLink.tip=\u9ede\u9078\u6b64\u8655\u4ee5\u9020\u8a2a\u6b64\u7db2\u7ad9

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/config/planet.properties
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/planet/config/planet.properties:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/pings/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/pings/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/search/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/search/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/startup/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/startup/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/themes/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/business/themes/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/package.html:r1546818-1588713

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties Sun Apr 20 13:38:51 2014
@@ -156,7 +156,10 @@ search.index.comments=true
 
 comment.notification.hideCommenterAddresses=false
 
-# comment throttleing
+## approval notification of pending comment publication
+comment.notification.onapproval=false
+
+# comment throttling
 comment.throttle.enabled=false
 comment.throttle.threshold=25
 comment.throttle.interval=60
@@ -398,14 +401,14 @@ schemeenforcement.https.urls=/roller_j_s
 /roller-ui/profile.rol,/roller-ui/profile!save.rol,\
 /roller-ui/admin/userAdmin.rol,\
 /roller-ui/admin/createUser.rol,/roller-ui/admin/createUser!save.rol,\
-/roller-ui/authoring/userdata,\
+/roller-ui/admin/userdata,\
 /roller-ui/authoring/membersInvite.rol,/roller-ui/authoring/membersInvite!save.rol
 
 # Ignored extensions otherwise we get SSL mixed content issues
 schemeenforcement.https.ignored=css,gif,png,js
 
 # Ignored urls for salt.  These are for multipart/form-data submissions as we do not get any parameters
-salt.ignored.urls=mediaFileAdd!save.rol,mediaFileEdit!save.rol
+salt.ignored.urls=mediaFileAdd!save.rol,mediaFileEdit!save.rol,bookmarksImport!save.rol
 
 #----------------------------------
 # Single-Sign-On
@@ -542,17 +545,7 @@ pings.initialCommonTargets=\
 # Specify variant options for known buggy ping targets.
 pings.variantOptions={{http://rpc.icerocket.com:10080/}{noname}}
 
-
-# This controls whether users are allowed to add custom ping targets.  
-# Set this to false to disallow adding custom targets; if false, the 
-# Weblog:Custom Ping Targets menu item will not appear and associated actions 
-# will result in access denied messages.  Leave this false or commented for 
-# normal behavior. 
-# CAUTION: Setting this to true will cause the server to remove all users' 
-# existing custom targets on startup.
-pings.disallowCustomTargets=false
-
-# This controls whether the Weblog:Pings menu item and its associated actions 
+# This controls whether the Weblog:Pings menu item and its associated actions
 # are enabled.  Set this to false to disallow users from configuring autopings 
 # and doing manual pings.  If absent, this defaults to true.
 # NOTE: There is a separate runtime property (configurable from the 
@@ -713,10 +706,5 @@ eclipselink.persistence-context.flush-mo
 # for a format that is compatible with Movable Type and Wordpress.
 weblog.export.enabled=false
 
-# Atom-like Admin Publishing Protocol (AAPP) - this is an experimental admin
-# protocol based on ideas from the Atom protocol. 
-# Intended only for interoperability testing. DO NOT ENABLE IN PRODUCTION!
-webservices.adminprotocol.enabled=false
-
 # Allow users to edit the original path setting of media files
 mediafile.originalPathEdit.enabled=false

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html:r1546818-1588713

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml Sun Apr 20 13:38:51 2014
@@ -19,13 +19,13 @@
 
 <!--
   STOP!!!!  This is NOT a Roller configuration file!!
-  Users of Roller should never need to edit this file.  The properties listed
-  here are changed on the Roller Admin Settings page.
+  Users of Roller should never need to edit this file.  The properties
+  listed here should instead be changed on the Roller Admin Settings page.
   
   This file defines what properties are made available to get/set
   during the running of the Roller application.  These properties
-  are stored in the database and the code *must* be able to make
-  use of changed values during runtime.
+  are stored in the database (roller_properties table) and the code *must* be
+  able to make use of changed values during runtime.
   
   Also included in this file is meta-data which defines what class
   of property we are dealing with, it's default value, and information

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/business/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/business/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml:r1546818-1588713

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml Sun Apr 20 13:38:51 2014
@@ -7,17 +7,8 @@
     <entity metadata-complete="true" name="PingTarget"
             class="org.apache.roller.weblogger.pojos.PingTarget" access="PROPERTY">
         <table name="pingtarget"/>
-        <named-query name="PingTarget.getByWebsiteNullOrderByName">
-            <query>SELECT p FROM PingTarget p WHERE p.website IS NULL ORDER BY p.name</query>
-        </named-query>
-        <named-query name="PingTarget.getByWebsiteOrderByName">
-            <query>SELECT p FROM PingTarget p WHERE p.website = ?1 ORDER BY p.name</query>
-        </named-query>
-        <named-query name="PingTarget.removeByPingTarget">
-            <query>DELETE FROM PingTarget p WHERE p.website IS NOT NULL</query>
-        </named-query>
-        <named-query name="PingTarget.removeByWebsiteNotNull">
-            <query>DELETE FROM PingTarget p WHERE p.website IS NOT NULL</query>
+        <named-query name="PingTarget.getPingTargetsOrderByName">
+            <query>SELECT p FROM PingTarget p ORDER BY p.name</query>
         </named-query>
         <attributes>
             <id name="id">
@@ -38,9 +29,6 @@
             <basic name="autoEnabled">
                 <column name="autoenabled" insertable="true" updatable="true" unique="false"/>
             </basic>
-            <many-to-one name="website" target-entity="org.apache.roller.weblogger.pojos.Weblog">
-                <join-column name="websiteid" insertable="true" updatable="true" nullable="true"/>
-            </many-to-one>
         </attributes>
     </entity>
 </entity-mappings>

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml:r1546818-1588713

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml Sun Apr 20 13:38:51 2014
@@ -33,33 +33,11 @@
 			<query>SELECT w FROM Weblog w WHERE w.dateCreated &lt; ?1
                                                ORDER BY w.dateCreated DESC</query>
 		</named-query>
-		<!--
-        <named-query name="Weblog.getByEndDate&amp;StartDate&amp;Enabled&amp;Permissions.user&amp;Permissions.pendingOrderByDateCreatedDesc">
-			<query>SELECT w FROM Weblog w WHERE w.dateCreated &lt; ?1 AND w.dateCreated &gt; ?2
-                                                 AND w.enabled = ?3
-                                                 AND EXISTS (SELECT p from WeblogPermission p where
-                                                         p.weblog = w
-                                                         AND p.user = ?4
-                                                         AND p.pending = ?5 )
-                                               ORDER BY w.dateCreated DESC</query>
-		</named-query>
-        -->
 		<named-query name="Weblog.getByEndDate&amp;StartDate&amp;ActiveOrderByDateCreatedDesc">
 			<query>SELECT w FROM Weblog w WHERE w.dateCreated &lt; ?1 AND w.dateCreated &gt; ?2
                                                  AND w.active = ?3
                                                ORDER BY w.dateCreated DESC</query>
 		</named-query>
-		<!--
-        <named-query name="Weblog.getByEndDate&amp;Enabled&amp;Active&amp;Permissions.user&amp;Permissions.pendingOrderByDateCreatedDesc">
-			<query>SELECT w FROM Weblog w WHERE w.dateCreated &lt; ?1
-                                                AND w.enabled = ?2 AND w.active = ?3
-                                                AND EXISTS (SELECT p from WeblogPermission p where
-                                                           p.weblog = w
-                                                           AND p.user = ?4
-                                                           AND p.pending = ?5 )
-                                             ORDER BY w.dateCreated DESC</query>
-		</named-query>
-        -->
 		<named-query name="Weblog.getByEndDate&amp;Enabled&amp;ActiveOrderByDateCreatedDesc">
 			<query>SELECT w FROM Weblog w WHERE w.dateCreated &lt; ?1
                                                  AND w.enabled = ?2 AND w.active = ?3
@@ -76,16 +54,6 @@
                                                  AND w.active = ?2
                                                ORDER BY w.dateCreated DESC</query>
 		</named-query>
-		<!--
-        <named-query name="Weblog.getByEndDate&amp;Permissions.user&amp;Permissions.pendingOrderByDateCreatedDesc">
-			<query>SELECT w FROM Weblog w WHERE w.dateCreated &lt; ?1
-                                                AND EXISTS (SELECT p from WeblogPermission p where
-                                                        p.weblog = w
-                                                        AND p.user = ?2
-                                                        AND p.pending = ?3 )
-                                              ORDER BY w.dateCreated DESC</query>
-		</named-query>
-        -->
 		<named-query name="Weblog.getCountAllDistinct">
 			<!-- DISTINCT is not required here -->
             <query>SELECT COUNT(w) FROM Weblog w</query>
@@ -195,10 +163,18 @@
 			<many-to-one name="bloggerCategory" target-entity="org.apache.roller.weblogger.pojos.WeblogCategory">
 				<join-column name="bloggercatid" insertable="true" updatable="true"/>
 			</many-to-one>
-			<many-to-one name="defaultCategory" target-entity="org.apache.roller.weblogger.pojos.WeblogCategory">
-				<join-column name="defaultcatid" insertable="true" updatable="true"/>
-			</many-to-one>
-
+            <one-to-many name="weblogCategories" target-entity="org.apache.roller.weblogger.pojos.WeblogCategory" mapped-by="weblog" fetch="EAGER">
+                <order-by>position</order-by>
+                <cascade>
+                    <cascade-remove/>
+                </cascade>
+            </one-to-many>
+            <one-to-many name="bookmarkFolders" target-entity="org.apache.roller.weblogger.pojos.WeblogBookmarkFolder" mapped-by="weblog">
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-remove/>
+                </cascade>
+            </one-to-many>
 			<transient name="theme"/>
 			<transient name="creator"/>
 			<transient name="defaultPage"/>
@@ -212,7 +188,7 @@
 			<transient name="userCount"/>
 			<transient name="entryCount"/>
             <transient name="initializedPlugins"/>
-            <transient name="weblogCategories"/>
+            <transient name="defaultCategory"/>
             <transient name="localeInstance"/>
             <transient name="timeZoneInstance" />
 		</attributes>

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml:r1546818-1588713

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml Sun Apr 20 13:38:51 2014
@@ -6,11 +6,8 @@
     <entity metadata-complete="true" name="WeblogBookmark"
             class="org.apache.roller.weblogger.pojos.WeblogBookmark" access="PROPERTY">
         <table name="bookmark"/>
-        <named-query name="BoomarkData.getByFolder">
-            <query>SELECT b FROM WeblogBookmark b WHERE b.folder = ?1</query>
-        </named-query>
-        <named-query name="BoomarkData.getByFolder.pathLike&amp;Folder.website">
-            <query>SELECT b FROM WeblogBookmark b WHERE b.folder.path LIKE ?1 AND b.folder.website = ?2</query>
+        <named-query name="BookmarkData.getByFolder">
+            <query>SELECT b FROM WeblogBookmark b WHERE b.folder = ?1 order by b.priority</query>
         </named-query>
         <attributes>
             <id name="id">
@@ -25,9 +22,6 @@
             <basic name="url">
                 <column name="url" insertable="true" updatable="true" unique="false"/>
             </basic>
-            <basic name="weight">
-                <column name="weight" insertable="true" updatable="true" unique="false"/>
-            </basic>
             <basic name="priority">
                 <column name="priority" insertable="true" updatable="true" unique="false"/>
             </basic>

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml:r1546818-1588713

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml Sun Apr 20 13:38:51 2014
@@ -7,13 +7,10 @@
             access="PROPERTY">
         <table name="folder"/>
         <named-query name="WeblogBookmarkFolder.getByWebsite">
-            <query>SELECT f FROM WeblogBookmarkFolder f WHERE f.website = ?1</query>
+            <query>SELECT f FROM WeblogBookmarkFolder f WHERE f.weblog = ?1</query>
         </named-query>
-        <named-query name="WeblogBookmarkFolder.getByWebsite&amp;Path">
-            <query>SELECT f FROM WeblogBookmarkFolder f WHERE f.website = ?1 AND f.path = ?2</query>
-        </named-query>
-        <named-query name="WeblogBookmarkFolder.getByWebsite&amp;ParentNull">
-            <query>SELECT f FROM WeblogBookmarkFolder f WHERE f.website = ?1 AND f.parent IS NULL</query>
+        <named-query name="WeblogBookmarkFolder.getByWebsite&amp;Name">
+            <query>SELECT f FROM WeblogBookmarkFolder f WHERE f.weblog = ?1 AND f.name = ?2</query>
         </named-query>
         <attributes>
             <id name="id">
@@ -22,31 +19,11 @@
             <basic name="name">
                 <column name="name" insertable="true" updatable="true" unique="false"/>
             </basic>
-            <basic name="path">
-                <column name="path" insertable="true" updatable="true" unique="false"/>
-            </basic>
-            <basic name="description">
-                <column name="description" insertable="true" updatable="true" unique="false"/>
-            </basic>
-            <many-to-one name="website" target-entity="org.apache.roller.weblogger.pojos.Weblog">
+            <many-to-one name="weblog" target-entity="org.apache.roller.weblogger.pojos.Weblog">
                 <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
             </many-to-one>
-            <many-to-one name="parent" target-entity="org.apache.roller.weblogger.pojos.WeblogBookmarkFolder">
-                <join-column name="parentid" insertable="true" updatable="true" nullable="true"/>
-                <cascade>
-                    <cascade-persist />
-                    <cascade-merge />
-                    <cascade-refresh />
-                </cascade>
-            </many-to-one>
-            <one-to-many name="folders" mapped-by="parent" target-entity="org.apache.roller.weblogger.pojos.WeblogBookmarkFolder"  fetch="LAZY">
-                <cascade>
-                    <cascade-persist />
-                    <cascade-remove/>
-                </cascade>
-            </one-to-many>
             <one-to-many name="bookmarks" mapped-by="folder" target-entity="org.apache.roller.weblogger.pojos.WeblogBookmark" fetch="LAZY">
-                <order-by>name</order-by>
+                <order-by>priority</order-by>
                 <cascade>
                     <cascade-persist />
                     <cascade-remove />

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml:r1546818-1588713

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml Sun Apr 20 13:38:51 2014
@@ -7,17 +7,14 @@
     <entity metadata-complete="true" name="WeblogCategory"
             class="org.apache.roller.weblogger.pojos.WeblogCategory" access="PROPERTY">
         <table name="weblogcategory"/>
-        <named-query name="WeblogCategory.getByPath&amp;Website">
-                <query>SELECT w FROM WeblogCategory w WHERE w.path = ?1 AND w.website = ?2</query>
+        <named-query name="WeblogCategory.getByWeblog">
+            <query>SELECT w FROM WeblogCategory w WHERE w.weblog = ?1 order by w.position</query>
         </named-query>
-        <named-query name="WeblogCategory.getByWebsite">
-                <query>SELECT w FROM WeblogCategory w WHERE w.website = ?1</query>
+        <named-query name="WeblogCategory.getByWeblog&amp;Name">
+            <query>SELECT w FROM WeblogCategory w WHERE w.weblog = ?1 AND w.name = ?2</query>
         </named-query>
-        <named-query name="WeblogCategory.getByWebsite&amp;ParentNull">
-                <query>SELECT w FROM WeblogCategory w WHERE w.website = ?1 AND w.parent IS NULL</query>
-        </named-query>
-        <named-query name="WeblogCategory.getByWebsite&amp;ParentNotNull">
-                <query>SELECT w FROM WeblogCategory w WHERE w.website = ?1 AND w.parent IS NOT NULL</query>
+        <named-query name="WeblogCategory.removeByWeblog">
+            <query>DELETE FROM WeblogCategory w WHERE w.weblog = ?1</query>
         </named-query>
         <attributes>
             <id name="id">
@@ -32,21 +29,13 @@
             <basic name="image">
                 <column name="image" insertable="true" updatable="true" unique="false"/>
             </basic>
-            <basic name="path">
-                <column name="path" insertable="true" updatable="true" unique="false"/>
+            <basic name="position">
+                <column name="position" insertable="true" updatable="true" unique="false"/>
             </basic>
-            <many-to-one name="website" target-entity="org.apache.roller.weblogger.pojos.Weblog">
+            <many-to-one name="weblog" target-entity="org.apache.roller.weblogger.pojos.Weblog">
                 <join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
             </many-to-one>
-            <many-to-one name="parent" target-entity="org.apache.roller.weblogger.pojos.WeblogCategory">
-                <join-column name="parentid" insertable="true" updatable="true" nullable="true"/>
-            </many-to-one>
-            <one-to-many name="weblogCategories" mapped-by="parent" target-entity="org.apache.roller.weblogger.pojos.WeblogCategory" fetch="LAZY">
-                <cascade>
-                    <cascade-remove/>
-                </cascade>
-            </one-to-many>
-            <transient name="inUse"/> 
+            <transient name="inUse"/>
         </attributes>
     </entity>
 </entity-mappings>

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml:r1546818-1588713

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml Sun Apr 20 13:38:51 2014
@@ -12,9 +12,6 @@
         <named-query name="WeblogEntry.getByCategory">
             <query>SELECT w FROM WeblogEntry w WHERE w.category = ?1</query>
         </named-query>
-        <named-query name="WeblogEntry.getByStatus&amp;Category.pathLike&amp;Website">
-            <query>SELECT w FROM WeblogEntry w WHERE w.status = ?1 AND w.category.path LIKE ?2 AND w.website = ?3</query>
-        </named-query>
         <named-query name="WeblogEntry.getByPinnedToMain&amp;statusOrderByPubTimeDesc">
             <query>SELECT w FROM WeblogEntry w WHERE w.pinnedToMain = ?1 AND w.status = ?2 ORDER BY w.pubTime DESC</query>
         </named-query>

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml:r1546818-1588713

Propchange: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/package.html
------------------------------------------------------------------------------
  Merged /roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/package.html:r1546818-1588713

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml Sun Apr 20 13:38:51 2014
@@ -6,44 +6,48 @@ See comments in editor-menu.xml for info
 -->
 <menu-bar>
     
+    <!--  if we already have checked globalPerms="admin" we should -->
+    <!--  not need to recheck on each tab item as they are the same -->
     <menu name="tabbedmenu.admin" globalPerms="admin">
         
-        <menu-item action="globalConfig"       
-                   name="tabbedmenu.admin.config" 
-                   globalPerms="admin" />
-        
-        <menu-item action="userAdmin"          
-                   name="tabbedmenu.admin.userAdmin" 
-                   globalPerms="admin"
+        <!-- globalPerms="admin" -->
+        <menu-item action="globalConfig"
+                   name="tabbedmenu.admin.config" />
+        
+        <!-- globalPerms="admin" -->
+        <menu-item action="userAdmin"
+                   name="tabbedmenu.admin.userAdmin"
                    subactions="createUser,modifyUser" />
         
+        <!-- globalPerms="admin" -->
         <menu-item action="globalCommentManagement" 
-                   name="tabbedmenu.admin.commentManagement" 
-                   globalPerms="admin" />
+                   name="tabbedmenu.admin.commentManagement" />
         
-        <menu-item action="commonPingTargets"  
+        <!-- globalPerms="admin" -->
+        <menu-item action="commonPingTargets"
                    name="tabbedmenu.admin.pingTargets"
-                   globalPerms="admin" 
                    subactions="commonPingTargetAdd,commonPingTargetEdit" />
         
-        <menu-item action="cacheInfo"          
-                   name="tabbedmenu.admin.cacheInfo"
-                   globalPerms="admin" />
+        <!-- globalPerms="admin" -->
+        <menu-item action="cacheInfo"
+                   name="tabbedmenu.admin.cacheInfo" />
     </menu>
     
+    <!--  if we already have checked globalPerms="admin" we should -->
+    <!--  not need to recheck on each tab item as they are the same -->
     <menu name="tabbedmenu.planet" globalPerms="admin" enabledProperty="planet.aggregator.enabled">
         
-        <menu-item action="planetConfig"       
-                   name="tabbedmenu.admin.planetConfig" 
-                   globalPerms="admin" />
-        
-        <menu-item action="planetSubscriptions" 
-                   name="tabbedmenu.admin.planetSubscriptions" 
-                   globalPerms="admin" />
-        
-        <menu-item action="planetGroups"        
-                   name="tabbedmenu.admin.planetGroups" 
-                   globalPerms="admin" />
+        <!-- globalPerms="admin" -->
+        <menu-item action="planetConfig"
+                   name="tabbedmenu.admin.planetConfig" />
+        
+        <!-- globalPerms="admin" -->
+        <menu-item action="planetSubscriptions"
+                   name="tabbedmenu.admin.planetSubscriptions" />
+        
+        <!-- globalPerms="admin" -->
+        <menu-item action="planetGroups"
+                   name="tabbedmenu.admin.planetGroups" />
     </menu>
     
 </menu-bar>

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml Sun Apr 20 13:38:51 2014
@@ -31,26 +31,6 @@
         </field-validator>
     </field>
     
-    <field name="bean.weight">
-        <field-validator type="required">
-            <message key="Bookmark.error.weightNull">unspecified key</message>
-        </field-validator>
-        
-        <field-validator type="int">
-            <message key="Bookmark.error.weightNotInt">unspecified key</message>
-        </field-validator>
-    </field>
-    
-    <field name="bean.priority">
-        <field-validator type="required">
-            <message key="Bookmark.error.priorityNull">unspecified key</message>
-        </field-validator>
-        
-        <field-validator type="int">
-            <message key="Bookmark.error.priorityNotInt">unspecified key</message>
-        </field-validator>
-    </field>
-    
     <field name="bean.image">
         <field-validator type="url">
             <message key="Bookmark.error.imageBad">unspecified key</message>

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml Sun Apr 20 13:38:51 2014
@@ -31,26 +31,6 @@
         </field-validator>
     </field>
     
-    <field name="bean.weight">
-        <field-validator type="required">
-            <message key="Bookmark.error.weightNull">unspecified key</message>
-        </field-validator>
-        
-        <field-validator type="int">
-            <message key="Bookmark.error.weightNotInt">unspecified key</message>
-        </field-validator>
-    </field>
-    
-    <field name="bean.priority">
-        <field-validator type="required">
-            <message key="Bookmark.error.priorityNull">unspecified key</message>
-        </field-validator>
-        
-        <field-validator type="int">
-            <message key="Bookmark.error.priorityNotInt">unspecified key</message>
-        </field-validator>
-    </field>
-    
     <field name="bean.image">
         <field-validator type="url">
             <message key="Bookmark.error.imageBad">unspecified key</message>

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml Sun Apr 20 13:38:51 2014
@@ -13,12 +13,5 @@
             <message key="Folder.error.nameSize">unspecified key</message>
         </field-validator>
     </field>
-    
-    <field name="bean.description">
-        <field-validator type="stringlength">
-            <param name="maxLength">255</param>
-            <message key="Folder.error.descriptionSize">unspecified key</message>
-        </field-validator>
-    </field>
-    
+
 </validators>

Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml Sun Apr 20 13:38:51 2014
@@ -13,12 +13,5 @@
             <message key="Folder.error.nameSize">unspecified key</message>
         </field-validator>
     </field>
-    
-    <field name="bean.description">
-        <field-validator type="stringlength">
-            <param name="maxLength">255</param>
-            <message key="Folder.error.descriptionSize">unspecified key</message>
-        </field-validator>
-    </field>
-    
+
 </validators>



Mime
View raw message