You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/05 16:37:15 UTC

svn commit: r1608022 [3/3] - in /roller/trunk: app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/ app/src/main/resources/ app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/ app/src/main/webapp/roller-ui/ app/src/main/web...

Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1608022&r1=1608021&r2=1608022&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Sat Jul  5 14:37:13 2014
@@ -1,8 +1,27 @@
-#Russian messages for Roller v. 2.0
-#Created by Alexandr Sgibnev (sae(at)inbox.kz) 12 may 2006
-
-#Since java properties can use only ASCII, cyrillic letters are escaped by native2ascii
-#You can unescape this file by "native2ascii -reverse" command
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+#
+# To find unused strings, see <roller-trunk>/docs/examples/i18n/compare-vs-default-file.py
+# (Usage instructions given at the top of that script)
+#
+# Russian messages for Apache Roller
+# Created by Alexandr Sgibnev (sae(at)inbox.kz) 12 may 2006
+#
+# Since java properties can use only ASCII, cyrillic letters are escaped by native2ascii
+# You can unescape this file by "native2ascii -reverse" command
 
 generic.all=\u0412\u0441\u0435
 generic.none=\u041d\u0435\u0442

Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1608022&r1=1608021&r2=1608022&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Sat Jul  5 14:37:13 2014
@@ -1,5 +1,5 @@
 # Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  The ASF licenses this file to You
+# contributor license agreements.  The ASF licenses this file to You
 # under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -11,41 +11,36 @@
 # limitations under the License.  For additional information regarding
 # copyright in this work, please see the NOTICE file in the top level
 # directory of this distribution.
+#
+# To find unused strings, see <roller-trunk>/docs/examples/i18n/compare-vs-default-file.py
+# (Usage instructions given at the top of that script)
+#
 
+generic.all=\u6240\u6709
+generic.none=\u4ec0\u4e48\u4e5f\u6ca1\u6709
 generic.cancel=\u53d6\u6d88
 generic.done=\u6267\u884c
-generic.no=\u5426
-generic.none=\u4ec0\u4e48\u4e5f\u6ca1\u6709
-generic.all=\u6240\u6709
 generic.yes=\u662f
+generic.no=\u5426
+generic.description=\u63cf\u8ff0
+generic.save=\u4fdd\u5b58
+generic.edit=\u7f16\u8f91
+generic.delete=\u5220\u9664
+
 bookmarkForm.add.subtitle=\u5728\u6587\u4ef6\u5939 [{0}] \u6dfb\u52a0\u65b0\u7684\u4e66\u7b7e
 bookmarkForm.add.title=\u6dfb\u52a0\u65b0\u4e66\u7b7e
-bookmarkForm.addBookmark=\u589e\u52a0\u4e00\u4e2a\u65b0\u4e66\u7b7e
-bookmarkForm.cancel=\u53d6\u6d88
-bookmarkForm.correct.subtitle=\u68c0\u67e5\u6240\u586b\u5199\u7684\u5185\u5bb9\uff0c\u91cd\u65b0\u63d0\u4ea4
-bookmarkForm.correct.title=\u7f16\u8f91\u4e66\u7b7e
-bookmarkForm.correctBookmark=\u66f4\u6b63\u4e66\u7b7e
-bookmarkForm.description=\u63cf\u8ff0
 bookmarkForm.edit.subtitle=\u6b63\u5728\u7f16\u8f91\u6587\u4ef6\u5939 [{0}] \u4e2d\u7684\u4e66\u7b7e
 bookmarkForm.edit.title=\u7f16\u8f91\u4e66\u7b7e
-bookmarkForm.editBookmark=\u7f16\u8f91\u4e66\u7b7e
-bookmarkForm.folder=\u4e66\u7b7e\u5939
 bookmarkForm.image=\u56fe\u50cfURL
-bookmarkForm.priority=\u6392\u5e8f\u4f18\u5148\u7ea7
 bookmarkForm.rssUrl=\u65b0\u95fb\u79cd\u5b50URL
-bookmarkForm.save=\u4fdd\u5b58
 bookmarkForm.url=\u4e66\u7b7eURL
 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.edit=\u7f16\u8f91
 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
-bookmarksForm.folderTitle=\u4e66\u7b7e\u5939 [{0}]
 bookmarksForm.importBookmarks=\u5bfc\u5165OPML\u683c\u5f0f\u7684\u4e66\u7b7e
 bookmarksForm.move=\u79fb\u52a8\u9009\u4e2d\u7684
 bookmarksForm.path=\u4E66\u7B7E\u5939
@@ -55,7 +50,6 @@ bookmarksForm.rootTitle=\u4e66\u7b7e
 bookmarksForm.subtitle=\u7ba1\u7406 <span>{0}</span> \u7f51\u5fd7\u4e2d\u7684\u4e66\u7b7e
 bookmarksForm.visitLink=\u8bbf\u95ee
 bookmarksForm.visitLink.tip=\u70b9\u51fb\uff0c\u7136\u540e\u8bbf\u95ee\u6b64\u7ad9\u70b9
-bookmarksForm.warn.notMoving=\u4e0d\u80fd\u7531\u7236\u6587\u4ef6\u5939 [{0}] \u79fb\u52a8\u5230\u5b83\u7684\u5b50\u6587\u4ef6\u5939\u4e2d
 bookmarksImport.error=\u5bfc\u5165\u4e66\u7b7e\u9519\u8bef\uff1a {0}
 bookmarksImport.imported=\u5bfc\u5165OPML\u683c\u5f0f\u4e66\u7b7e\u5230\u6587\u4ef6\u5939 [{0}]
 bookmarksImport.prompt=\u5bfc\u5165\u6807\u51c6OPML\u683c\u5f0f\u4e66\u7b7e\u5230\u4e66\u7b7e\u5939\u3002\u8fd9\u4e9b\u4e66\u7b7e\u5c06\u4f1a\u5bfc\u5165\u5230\u4e00\u4e2a\u65b0\u7684\u4e66\u7b7e\u5939\uff08\u4e66\u7b7e\u5939\u7684\u540d\u5b57\u4f7f\u7528\u9ed8\u8ba4\u7684\u65f6\u95f4\u6233\uff09\u3002\u5bfc\u5165\u4e4b\u540e\u60a8\u5c31\u53ef\u4ee5\u7f16\u8f91\u6216\u8005\u79fb\u52a8\u5230\u5176\u6240\u5c5e\u7684\u4e66\u7b7e\u5939\u5185\u3002
@@ -69,21 +63,12 @@ calendar.prev=\u524d\u9875
 calendar.summary=\u65e5\u5fd7\u5f52\u6863\u65e5\u5386
 calendar.today=\u4eca\u5929
 categoriesForm.addCategory=\u6dfb\u52a0\u5206\u7c7b
-categoriesForm.checkAll=\u5168\u90e8\u9009\u62e9
-categoriesForm.checkNone=\u4e00\u4e2a\u4e0d\u9009
-categoriesForm.delete=\u5220\u9664
-categoriesForm.description=\u63cf\u8ff0
-categoriesForm.edit=\u7f16\u8f91
-categoriesForm.error.move=\u79fb\u52a8\u9519\u8bef\uff0c\u4e0d\u80fd\u7531\u7236\u76ee\u5f55\u79fb\u52a8\u5230\u5b83\u7684\u5b50\u76ee\u5f55
 categoriesForm.move=\u79fb\u52a8
-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
 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
 categoryDeleteOK.areYouSure=\u60a8\u786e\u8ba4\u8981\u5220\u9664\u8fd9\u4e2a\u65e5\u5fd7\u5206\u7c7b\u5417?
 categoryDeleteOK.moveToWhere=\u628a\u8fd9\u4e9b\u5185\u5bb9\u8f6c\u79fb\u5230\u53e6\u4e00\u4e2a\u5206\u7c7b:
 categoryDeleteOK.noEntriesInCat=\u6b64\u5206\u7c7b\u4e2d\u5df2\u7ecf\u6ca1\u6709\u65e5\u5fd7\u4e86\uff0c\u53ef\u4ee5\u5b89\u5168\u5220\u9664\u3002
@@ -92,36 +77,21 @@ categoryDeleteOK.warningCatInUse=\u8b66\
 categoryDeleteOK.youMustMoveEntries=\u60a8\u5fc5\u987b\u5148\u628a\u6b64\u5206\u7c7b\u4e2d\u7684\u65e5\u5fd7\u8f6c\u79fb\u5230\u53e6\u4e00\u4e2a\u5206\u7c7b\uff0c\u7528\u9009\u62e9\u6846\u6765\u9009\u4e2d\u8981\u63a5\u6536\u8fd9\u4e9b\u65e5\u5fd7\u7684\u5206\u7c7b\u3002</p>
 categoryForm.add.subtitle=\u6b63\u5728\u6dfb\u52a0\u5206\u7c7b
 categoryForm.add.title=\u6dfb\u52a0\u5206\u7c7b
-categoryForm.addCategory=\u589e\u52a0\u5206\u7c7b
-categoryForm.cancel=\u53d6\u6d88
-categoryForm.correct.subtitle=\u6b63\u5728\u4fee\u6539\u5206\u7c7b
-categoryForm.correct.title=\u4fee\u6539\u5206\u7c7b
-categoryForm.correctCategory=\u66f4\u6b63\u5206\u7c7b
-categoryForm.description=\u63cf\u8ff0
-categoryForm.edit.subtitle=\u6b63\u5728\u7f16\u8f91\u5206\u7c7b
 categoryForm.edit.title=\u7f16\u8f91\u5206\u7c7b
-categoryForm.editCategory=\u7f16\u8f91\u5206\u7c7b
 categoryForm.image=\u56fe\u50cf
-categoryForm.save=\u4fdd\u5b58
-commentManagement.all=\u6240\u6709
-commentManagement.approved=\u6279\u51c6
 commentManagement.columnApproved=\u6279\u51c6
 commentManagement.columnComment=\u8bc4\u8bba
-commentManagement.columnDelete=\u5220\u9664
 commentManagement.columnSpam=\u5783\u573e\u8bc4\u8bba
 commentManagement.commentBy=\u8bc4\u8bba\u4eba\u2014\u2014
 commentManagement.commentByBoth={0} (<a href="mailto:{1}">{2}</a>) \u6765\u81ea\u4e8eIP {3}
 commentManagement.commentByIP=\u7528\u6237IP {0}
 commentManagement.commentByName={0} \u6765\u81ea\u4e8eIP {1}
-commentManagement.editEntry=\u7f16\u8f91
 commentManagement.endDate=\u622a\u81f3\u65e5\u671f
 commentManagement.entry.subtitle=\u7ba1\u7406\u65e5\u5fd7 <span>{0}</span> \u7684\u8bc4\u8bba
 commentManagement.entryTitled=\u5bf9\u4e8e
 commentManagement.globalTip=\u6700\u4e3a\u4e00\u4e2a\u8d85\u7ea7\u7ba1\u7406\u5458\uff0c\u60a8\u53ef\u4ee5\u66f4\u6539\u5783\u573e\u8bc4\u8bba\u72b6\u6001\uff0c\u53ef\u4ee5\u901a\u8fc7\u9009\u4e2d\u4e0b\u9762\u7684\u9009\u62e9\u6846\u5220\u9664\u8bc4\u8bba\u3002\u4f46\u662f\u60a8\u4e0d\u80fd\u66f4\u6539\u5904\u4e8e\u7b49\u5f85\u548c\u6838\u51c6\u72b6\u6001\u7684\u7684\u8bc4\u8bba\uff0c\u4e5f\u5c31\u662f\u8bf4\u60a8\u4e0d\u80fd\u4ecb\u5165\u5e72\u6270\u4efb\u4f55\u4eba\u6279\u51c6\u8bc4\u8bba\u7684\u5de5\u4f5c\u6d41\u7a0b\u3002\u5982\u679c\u60a8\u505a\u4e86\u4efb\u4f55\u66f4\u6539\uff0c\u4e0d\u8981\u5fd8\u4e86\u70b9\u51fb\u9876\u90e8\u7684 <em>\u4fdd\u5b58\u66f4\u6539</em> \u6765\u4f7f\u5176\u751f\u6548\u3002
 commentManagement.next=\u4e0b\u9875
 commentManagement.noCommentsFound=\u6ca1\u6709\u8bc4\u8bba
-commentManagement.noSpam=\u6ca1\u6709\u5783\u573e\u8bc4\u8bba
-commentManagement.none=\u4ec0\u4e48\u4e5f\u6ca1\u6709
 commentManagement.nowShowing=\u663e\u793a <b>{0}</b> \u8bc4\u8bba
 commentManagement.onlyApproved=\u5df2\u6279\u51c6\u7684
 commentManagement.onlyDisapproved=\u672a\u6279\u51c6\u7684
@@ -129,17 +99,14 @@ commentManagement.onlyPending=\u6392\u96
 commentManagement.onlySpam=\u5783\u573e\u8bc4\u8bba
 commentManagement.pending=\u6392\u961f\u7b49\u5f85\u4e2d
 commentManagement.pendingStatus=\u5904\u4e8e\u7b49\u5f85\u72b6\u6001
-commentManagement.pendingTip=\ <em>\u6709\u8bc4\u8bba\u9700\u8981\u6279\u51c6</em>\u3002<br /><br /> \u8bf7\u518d\u6b21\u6d4f\u89c8\u6279\u51c6\u548c\u5783\u573e\u8bc4\u8bba\u9009\u62e9\u6846\u4ee5\u786e\u8ba4\u6b63\u786e\u65e0\u7591\u3002\u7136\u540e\u70b9\u51fb <em>\u4fdd\u5b58\u66f4\u6539</em>\u6309\u94ae\u6765\u4fdd\u5b58\uff08\u5373\u4f7f\u60a8\u6ca1\u6709\u66f4\u6539\uff09\u3002\ 
 commentManagement.postTime=\u53d1\u5e03\u5728
 commentManagement.prev=\u524d\u9875
 commentManagement.query=\u67e5\u8be2
-commentManagement.returnToEntry=\u8fd4\u56de\u65e5\u5fd7
 commentManagement.searchString=\u641c\u7d22\u8bcd\u7ec4
 commentManagement.select=\u9009\u62e9
 commentManagement.sidebarDescription=\u901a\u8fc7\u641c\u7d22\u8bcd\uff0c\u72b6\u6001\uff0c\u548c\uff08\u6216\u8005\uff09\u65e5\u671f\u7b49\u8fc7\u6ee4\u8bc4\u8bba
 commentManagement.sidebarTitle=\u8bc4\u8bba\u8fc7\u6ee4\u5668
 commentManagement.spam=\u5783\u573e\u8bc4\u8bba
-commentManagement.spamStatus=\u5783\u573e\u8bc4\u8bba\u72b6\u6001
 commentManagement.startDate=\u5f00\u59cb\u65e5\u671f
 commentManagement.subtitle=\u7ba1\u7406\u7cfb\u7edf\u4e2d\u6240\u6709\u7f51\u5fd7\u7684\u8bc4\u8bba
 commentManagement.tip=\u6709\u8bc4\u8bba\u3002\u60a8\u53ef\u4ee5\u901a\u8fc7\u4e0b\u9762\u7684\u9009\u62e9\u6846\u6539\u53d8\u6279\u51c6\uff0c\u5783\u573e\u8bc4\u8bba\u72b6\u6001\u548c\u5220\u9664\u8bc4\u8bba\u3002\u5982\u679c\u60a8\u505a\u4e86\u4efb\u4f55\u66f4\u6539\uff0c\u8bb0\u5f97\u70b9\u51fb\u9876\u90e8\u7684 <em>\u4fdd\u5b58\u66f4\u6539</em>\u6309\u94ae\u3002\ 
@@ -149,56 +116,30 @@ commentManagement.updateError=\u66f4\u65
 commentManagement.updateSuccess=\u66f4\u65b0\u8bc4\u8bba\u6210\u529f
 commentManagement.website.subtitle=\u7ba1\u7406\u7f51\u5fd7 <span>{0}</span> \u4e2d\u7684\u8bc4\u8bba
 commentServlet.commentMarkedAsSpam=\u60a8\u7684\u8bc4\u8bba\u5df2\u7ecf\u88ab\u6807\u8bb0\u4e3a\u5783\u573e\u8bc4\u8bba\uff0c\u5c06\u4e0d\u4f1a\u663e\u793a\u3002
-commentServlet.previewMarkedAsSpam=\u5982\u679c\u60a8\u63d0\u4ea4\u8fd9\u4e2a\u8bc4\u8bba\uff0c\u5c06\u4f1a\u88ab\u89c6\u4e3a\u5783\u573e\u8bc4\u8bba\u800c\u4e0d\u4f1a\u663e\u793a\u3002
 commentServlet.submittedToModerator=\u60a8\u7684\u8bc4\u8bba\u5df2\u7ecf\u63d0\u4ea4\uff0c\u671f\u5f85\u6279\u51c6\u3002
 comments.at=\u5728
-comments.cancel=\u53d6\u6d88
 comments.disabled=\u8be5\u65e5\u5fd7\u8bc4\u8bba\u529f\u80fd\u88ab\u7981\u7528\u4e86\u3002
 comments.email=\u7535\u5b50\u90ae\u7bb1\uff1a
 comments.header=\u53d1\u8868\u8bc4\u8bba
 comments.header2=\u8bc4\u8bba\uff1a
-comments.htmldisabled=\u7981\u7528
 comments.htmlenabled=\u542f\u7528
-comments.htmlsyntax=HTML\u8bed\u6cd5\uff1a
 comments.mathAuthenticatorQuestion=\u8bf7\u56de\u7b54\u8fd9\u4e2a\u7b80\u5355\u7684\u6570\u5b66\u9898
-comments.name=\u59d3\u540d\uff1a
-comments.please=\u8bf7\u7559\u4e0b\u60a8\u7684\u8bc4\u8bba\u3002
-comments.post=\u53d1\u5e03
-comments.postedBy=\u8bc4\u8bba\u4eba
-comments.preview=\u9884\u89c8
-comments.preview.edit=\u7f16\u8f91\u60a8\u7684\u8bc4\u8bba
-comments.preview.title=\u8bc4\u8bba
-comments.rememberInfo=\u8bb0\u4f4f\u8fd9\u4e9b\u4fe1\u606f?
 comments.title=\u8bc4\u8bba
-comments.url=URL\uff1a
 commonPingTarget.subtitle=\u7f16\u8f91\u666e\u901aPing\u76ee\u6807
 commonPingTargets.commonPingTargets=\u666e\u901a\u7f51\u5fd7Ping\u76ee\u6807
 commonPingTargets.explanation=\u8fd9\u4e9b\u76ee\u6807\u7ad9\u70b9\u5bf9\u6240\u6709\u7f51\u5fd7\u7684Ping\u66f4\u65b0\u9002\u7528\u3002
 commonPingTargets.subtitle=\u7ba1\u7406\u9002\u7528\u4e8e\u6240\u6709\u7f51\u5fd7\u7684\u7f51\u5fd7Ping\u529f\u80fd\u3002
 configForm.absoluteUrl=\u7ad9\u70b9\u7684\u7edd\u5bf9URL\u8def\u5f84 (\u5047\u82e5\u4f60\u9700\u8981\u8bbe\u7f6e)
-configForm.adminUsers=\u7ba1\u7406\u5458\u7528\u6237
-configForm.algorithm=\u52a0\u5bc6\u7b97\u6cd5
 configForm.allowCustomTheme=\u5141\u8bb8\u4e2a\u6027\u5316\u5b9a\u5236\u4e3b\u9898\uff1f
 configForm.allowNewUsers=\u5141\u8bb8\u65b0\u7528\u6237?
 configForm.allowedExtensions=\u5141\u8bb8\u7684\u6587\u4ef6\u6269\u5c55\u540d
-configForm.autoformatComments=\u81ea\u52a8\u5bf9\u8bc4\u8bba\u683c\u5f0f\u5316?
-configForm.cacheIncomingRss=\u5bf9\u8bfb\u5165\u7684RSS\u65b0\u95fb\u79cd\u5b50\u8fdb\u884c\u7f13\u5b58\uff1f
 configForm.commentSettings=\u8bc4\u8bba\u548c\u53cd\u5411\u8ddf\u8e2a\u8bbe\u7f6e
-configForm.debugMode=\u5141\u8bb8\u8c03\u8bd5\u6a21\u5f0f\uff1f
-configForm.debuggingSettings=\u8c03\u8bd5\u8bbe\u7f6e
-configForm.defaultEntries=\u9ed8\u8ba4\u65e5\u5fd7\u6570\u76ee
 configForm.editorPages=\u7f16\u8f91\u5668
 configForm.emailComments=\u8bc4\u8bba\u81ea\u52a8\u7535\u5b50\u90ae\u7bb1\u63d0\u9192\uff1f
-configForm.emailNotification=\u7535\u5b50\u90ae\u4ef6\u901a\u77e5\uff1f
 configForm.enableComments=\u5141\u8bb8\u8bc4\u8bba\u7f51\u5fd7\uff1f
 configForm.enableFileUploads=\u5141\u8bb8\u6587\u4ef6\u4e0a\u4f20?
-configForm.enableLinkback=\u5141\u8bb8\u89e3\u6790\u53cd\u5411\u94fe\u63a5\uff1f
-configForm.enableMemoryDebugging=\u542f\u7528\u5185\u5b58\u8c03\u8bd5\uff08Memory Debugging\uff09\uff1f
-configForm.enableRssAggregator=\u542f\u7528RSS\u65b0\u95fb\u805a\u5408\u5668\uff1f
 configForm.enableTrackbackValidation=\u5141\u8bb8\u53cd\u5411\u8ddf\u8e2a\u94fe\u63a5\u9a8c\u8bc1
 configForm.enableTrackbacks=\u5141\u8bb8\u7f51\u5fd7\u53cd\u5411\u8ddf\u8e2a\uff1f
-configForm.encryptPasswords=\u52a0\u5bc6\u53e3\u4ee4\uff1f
-configForm.escapeCommentHtml=\u5bf9\u8bc4\u8bba\u8fdb\u884cHTML\u8f6c\u4e49\uff1f
 configForm.fileUploadSettings=\u6587\u4ef6\u4e0a\u4f20\u8bbe\u7f6e
 configForm.forbiddenExtensions=\u7981\u6b62\u7684\u6587\u4ef6\u6269\u5c55\u540d
 configForm.maxDirSize=\u6700\u5927\u76ee\u5f55\u5927\u5c0f (MB)
@@ -206,15 +147,8 @@ configForm.maxFileSize=\u6700\u5927\u658
 configForm.moderationRequired=\u6240\u6709\u7f51\u5fd7\u9700\u8981\u9002\u5ea6\u8bc4\u8bba
 configForm.newUserThemes=\u65b0\u7528\u6237\u7684\u9ed8\u8ba4\u4e3b\u9898
 configForm.newsfeedMaxEntries=\u65e5\u5fd7\u7684\u6700\u5927\u503c
-configForm.newsfeedSettings=\u65b0\u95fb\u79cd\u5b50\u8bbe\u7f6e
 configForm.prompt=\u60a8\u5728\u8fd9\u91cc\u505a\u7684\u4fee\u6539\u5bf9\u6240\u6709\u65e5\u5fd7\u751f\u6548\u3002\u6ce8\u610f\u8fd9\u4ec5\u4ec5\u662f<i>runtime</i>\u5c5e\u6027\u3002\u5177\u4f53\u64cd\u4f5c\u8bf7\u67e5\u8be2Roller\u6587\u6863\u5173\u4e8e\u8986\u76d6Roller <i>startup</i>\u5c5e\u6027\u90e8\u5206\uff08\u5728roller.proerties\u6587\u4ef6\u4e2d\uff09\u3002
-configForm.rebuildIndex=\u91cd\u65b0\u6784\u5efa\u641c\u7d22\u7d22\u5f15\uff08\u5bf9\u6240\u6709\u7528\u6237\uff09
 configForm.registrationUrl=\u5916\u90e8\u6ce8\u518cURL
-configForm.rssAggregatorSettings=RSS\u805a\u5408\u5668\u8bbe\u7f6e
-configForm.rssNewsfeedCacheTime=RSS\u65b0\u95fb\u79cd\u5b50\u7f13\u5b58\u65f6\u95f4\uff08\u79d2\uff09
-configForm.save=\u4fdd\u5b58
-configForm.saved=\u8bbe\u7f6e\u5df2\u88ab\u4fdd\u5b58
-configForm.searchIndexDir=\u641c\u7d22\u7d22\u5f15\u76ee\u5f55<br />\uff08\u4f7f\u7528 ${user.home} \u4f5c\u4e3a\u7cfb\u7edf\u5c5e\u6027\uff09
 configForm.shortName=\u7b80\u79f0\uff08\u663e\u793a\u5728\u7ad9\u70b9\u6a2a\u5e45\u4e2d\uff09
 configForm.siteAdminEmail=\u7ba1\u7406\u5458\u7535\u5b50\u90ae\u4ef6\u5730\u5740
 configForm.siteDescription=\u7ad9\u70b9\u63cf\u8ff0\uff08\u51fa\u73b0\u5728\u4e3bRSS feed\u4e2d\uff09
@@ -224,17 +158,11 @@ configForm.subtitle=\u66f4\u6539\u7f51\u
 configForm.suspendPingProcessing=\u652f\u6301\u6240\u6709\u7684Ping\u5904\u7406\uff1f
 configForm.themeSettings=\u4e3b\u9898\u8bbe\u7f6e
 configForm.title=Roller\u914d\u7f6e
-configForm.uploadDir=\u4e0a\u4f20\u76ee\u5f55
-configForm.uploadPath=\u4e0a\u4f20\u6587\u4ef6\u7684\u672c\u5730\u8def\u5f84
 configForm.userSettings=\u7528\u6237\u8bbe\u7f6e
 createWeblog.error.handleExists=\u76f8\u540c\u7684\u7f51\u5fd7\u5730\u5740\u5df2\u7ecf\u5b58\u5728
 createWeblog.error.invalidHandle=\u60a8\u5b9a\u4e49\u7684\u7f51\u5fd7\u5730\u5740\u65e0\u6548
-createWeblog.error.missingEmailAddress=\u60a8\u5fc5\u987b\u952e\u5165\u4e00\u4e2a\u6709\u6548\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740
-createWeblog.error.missingHandle=\u60a8\u5fc5\u987b\u952e\u5165\u4e00\u4e2a\u6709\u6548\u7684\u7f51\u5fd7\u5730\u5740
-createWebsite.button.cancel=\u53d6\u6d88
 createWebsite.button.save=\u5efa\u7acb\u7f51\u5fd7
 createWebsite.created=\u65b0\u7f51\u5fd7 [<b>{0}</b>] \u5efa\u7acb\u6210\u529f\uff01
-createWebsite.description=\u63cf\u8ff0
 createWebsite.emailAddress=\u7535\u5b50\u90ae\u4ef6\u5730\u5740
 createWebsite.handle=\u7f51\u5fd7\u5730\u5740
 createWebsite.locale=\u672c\u5730\u5316\u8bbe\u7f6e
@@ -255,32 +183,13 @@ email.comment.anonymous=\u533f\u540d\u75
 email.comment.respond=\u56de\u590d\u6b64\u8bc4\u8bba\u5728
 email.comment.title=\u8bc4\u8bba
 email.comment.wrote=\u64b0\u5199
-error.add.blogcat=\u521b\u5efa\u7f51\u5fd7\u5206\u7c7b\u65f6\u51fa\u9519
-error.add.blogentry=\u6dfb\u52a0\u65e5\u5fd7\u65f6\u5019\u51fa\u9519
-error.add.bookmark=\u6dfb\u52a0\u4e66\u7b7e\u65f6\u5019\u51fa\u9519
-error.add.folder=\u6dfb\u52a0\u4e66\u7b7e\u5939\u65f6\u5019\u51fa\u9519\ 
-error.add.newsfeed=\u6dfb\u52a0\u65b0\u95fb\u79cd\u5b50\u65f6\u5019\u51fa\u9519
 error.add.user.badUserName=\u7528\u6237\u540d\u975e\u6cd5\uff08\u53ea\u5141\u8bb8\u5b57\u6bcd\u548c\u6570\u5b57\uff09\u3002
 error.add.user.missingEmailAddress=\u8bf7\u8f93\u5165\u5408\u6cd5\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3002
 error.add.user.missingPassword=\u8bf7\u8f93\u5165\u5bc6\u7801\u3002
 error.add.user.missingUserName=\u60a8\u5fc5\u987b\u6307\u5b9a\u7528\u6237\u540d\u3002
 error.add.user.userNameInUse=\u7528\u6237\u540d\u5df2\u7ecf\u88ab\u5360\u7528\u3002
-error.bake.weblog=\u7f51\u5fd7\u4fdd\u5b58(baking)\u51fa\u9519
 error.commentAuthFailed=\u8bc4\u8bba\u9a8c\u8bc1\u5931\u8d25\uff01
-error.edit.blogcat=\u663e\u793a\u7f16\u8f91\u7f51\u5fd7\u5206\u7c7b\u9875\u9762\u65f6\u5019\u51fa\u9519
-error.edit.blogentry=\u663e\u793a\u7f51\u5fd7\u7f16\u8f91\u9875\u9762\u51fa\u9519
-error.edit.bookmark=\u663e\u793a\u7f16\u8f91\u4e66\u7b7e\u9875\u9762\u51fa\u9519
-error.edit.comment=\u663e\u793a\u8bc4\u8bba\u9875\u9762 {0} \u51fa\u9519
-error.edit.folder=\u663e\u793a\u7f16\u8f91\u4e66\u7b7e\u5939\u9875\u9762\u51fa\u9519
-error.edit.newsfeed=\u663e\u793a\u7f16\u8f91\u65b0\u95fb\u79cd\u5b50\u9875\u9762\u51fa\u9519
-error.editall.blogcat=\u663e\u793a\u7f16\u8f91\u7f51\u5fd7\u5206\u7c7b\u9875\u9762\u51fa\u9519
-error.editall.folder=\u663e\u793a\u7f16\u8f91\u4e66\u7b7e\u9875\u9762\u51fa\u9519
 error.general=\u9519\u8bef\uff1a [{0}] \u5df2\u7ecf\u767b\u5f55\u3002
-error.importing.bookmarks=\u5bfc\u5165\u4e66\u7b7e\u51fa\u9519
-error.importing.entries=\u65e0\u6cd5\u5206\u6790\u9009\u4e2d\u7684\u6587\u4ef6
-error.internationalized={0}
-error.move.bookmarks=\u79fb\u9664\u4e66\u7b7e\u51fa\u9519
-error.noTrackbackUrlSpecified=\u672a\u6307\u5b9a\u53cd\u5411\u8ddf\u8e2a(Trackback)URL.
 error.password.mismatch=\u7528\u6237\u540d\u6216\u5bc6\u7801\u9519
 error.permissionDenied.prompt=\u53ef\u80fd\u7684\u539f\u56e0\uff1a
 error.permissionDenied.reason0=\u60a8\u5728\u8bd5\u56fe\u7f16\u8f91\u4e00\u4e2a\u60a8\u672a\u88ab\u5141\u8bb8\u7684\u65e5\u5fd7\uff08\u4e5f\u53ef\u80fd\u60a8\u5df2\u7ecf\u63d0\u4ea4\u6b63\u5728\u9884\u89c8\uff1f\uff09\u3002
@@ -288,19 +197,6 @@ error.permissionDenied.reason1=\u60a8\u5
 error.permissionDenied.reason2=\u767b\u5f55\u65f6\u60a8\u7684\u7528\u6237\u540d\u5927\u5c0f\u5199\u4e0d\u6b63\u786e\u3002\u89e3\u51b3\u8fd9\u4e2a\u95ee\u9898\uff0c\u8bf7\u6ce8\u9500\u5e76\u91cd\u65b0\u4f7f\u7528\u6b63\u786e\u5730\u62fc\u5199\u767b\u5f55\u3002
 error.permissionDenied.reason3=\u60a8\u7684\u7f51\u7edc\u65e5\u5fd7\u540c\u6570\u636e\u5e93\u8fde\u63a5\u4e0d\u4e0a\uff0c\u89e3\u51b3\u8fd9\u4e2a\u95ee\u9898\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u3002
 error.permissionDenied.title=\u62d2\u7edd
-error.permissions.deniedSave=\u62d2\u7edd\u8bbf\u95ee\uff08\u60a8\u662f\u4e0d\u662f\u4f7f\u7528\u4e0d\u540c\u7684\u7528\u6237\u767b\u5f55\u4e86\uff1f\uff09
-error.preview.comment=\u751f\u6210\u8bc4\u8bba\u9884\u89c8\u65f6\u5019\u51fa\u9519 {0}
-error.remove.blogcat=\u79fb\u9664\u7f51\u5fd7\u5206\u7c7b\u51fa\u9519
-error.remove.blogentry=\u79fb\u9664\u7f51\u5fd7\u4e2d\u7684\u65e5\u5fd7\u65f6\u5019\u51fa\u9519
-error.remove.bookmark=\u79fb\u9664\u4e66\u7b7e\u51fa\u9519
-error.remove.bookmarks=\u79fb\u9664\u4e66\u7b7e\u51fa\u9519
-error.remove.folder=\u79fb\u9664\u4e66\u7b7e\u5939\u51fa\u9519
-error.remove.newsfeed=\u79fb\u9664\u65b0\u95fb\u79cd\u5b50\u51fa\u9519
-error.removeok.blogcat=\u663e\u793a\u79fb\u9664\u7f51\u5fd7\u5206\u7c7b\u9875\u9762\u65f6\u51fa\u9519 \ 
-error.removeok.blogentry=\u663e\u793a\u79fb\u9664\u65e5\u5fd7\u9875\u9762\u51fa\u9519
-error.removeok.bookmark=\u663e\u793a\u79fb\u9664\u4e66\u7b7e\u9875\u9762\u51fa\u9519
-error.removeok.folder=\u663e\u793a\u79fb\u9664\u4e66\u7b7e\u5939\u9875\u9762\u51fa\u9519
-error.removeok.newsfeed=\u663e\u793a\u79fb\u9664\u65b0\u95fb\u79cd\u5b50\u9875\u9762\u51fa\u9519
 error.searchProblem=\u60a8\u7684\u641c\u7d22\u6709\u95ee\u9898\u3002
 error.text.403=\u60a8\u6ca1\u6709\u8fdb\u5165\u8be5\u9875\u7684\u6743\u9650\u3002
 error.text.404=\u60a8\u8bf7\u6c42\u7684\u9875\u9762\u4e0d\u5b58\u5728\u3002
@@ -309,56 +205,17 @@ error.title.404=\u5bf9\u4e0d\u8d77\uff01
 error.trackback=\u53d1\u9001\u53cd\u5411\u8ddf\u8e2a(trackback)\u51fa\u9519\u3002\u53ef\u80fd\u662f\u53cd\u5411\u8ddf\u8e2a\u7684URL\u9519\u8bef{0}
 error.trackbackNotAllowed=\u53d1\u9001\u53cd\u5411\u8ddf\u8e2a\u5931\u8d25\u3002\u8be5\u7ad9\u70b9\u7ba1\u7406\u5458\u4e0d\u5141\u8bb8\u5411\u8be5URL\u53d1\u9001\u53cd\u5411\u8ddf\u8e2a\u3002
 error.untranslated={0}
-error.update.blogcat=\u66f4\u65b0\u7f51\u5fd7\u5206\u7c7b\u9875\u9762\u51fa\u9519
-error.update.blogentry=\u66f4\u65b0\u65e5\u5fd7\u9875\u9762\u51fa\u9519
-error.update.bookmark=\u66f4\u65b0\u4e66\u7b7e\u9875\u9762\u51fa\u9519
-error.update.comment=\u4fdd\u5b58\u8bc4\u8bba{0}\u51fa\u9519
-error.update.folder=\u66f4\u65b0\u4e66\u7b7e\u5939\u9875\u9762\u51fa\u9519
-error.update.newsfeed=\u66f4\u65b0\u65b0\u95fb\u79cd\u5b50\u9875\u9762\u51fa\u9519
-error.update.rollerConfig=\u66f4\u65b0Roller\u914d\u7f6e\u51fa\u9519
 error.upload.dirmax=\u60a8\u4e0d\u80fd\u8d85\u8fc7\u76ee\u5f55\u7684\u6700\u5927\u9650\u989d\uff1a {0} MB\u3002
 error.upload.disabled=\u6587\u4ef6\u4e0a\u4f20\u529f\u80fd\u88ab\u7981\u7528
 error.upload.file=\u5199\u5165\u6587\u4ef6\u5931\u8d25
 error.upload.filemax=\u60a8\u4e0d\u80fd\u8d85\u8fc7\u5355\u4e2a\u6587\u4ef6\u7684\u6700\u5927\u9650\u989d\uff1a {0} MB
 error.upload.forbiddenFile=\u60a8\u53ea\u80fd\u4e0a\u4f20\u4ee5 {0} \u7ed3\u5c3e\u7684\u6587\u4ef6
 errorPage.message=Roller\u9047\u5230\u4e00\u4e2a\u610f\u5916\u9519\u8bef\u3002
-errorPage.noException=\u65e0\u6cd5\u83b7\u5f97\u5806\u6808\u8ddf\u8e2a\u4fe1\u606f\u3002
-errorPage.reason=\u539f\u56e0
 errorPage.title=\u610f\u6599\u4e4b\u5916\u7684\u9519\u8bef
-errors.byte={0} \u5fc5\u987b\u662f\u4e00\u4e2a\u5b57\u8282\u3002
-errors.creditcard={0} \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u4fe1\u7528\u5361\u53f7\u7801\u3002
-errors.date={0} \u5fc5\u987b\u662f\u4e00\u4e2a\u65e5\u671f\u3002
-errors.double={0} \u5fc5\u987b\u662f\u4e00\u4e2a\u53cc\u7cbe\u5ea6\u6d6e\u70b9\u6570\u3002
-errors.email={0} \u53ea\u80fd\u5305\u542b\u82f1\u6587\u5b57\u7b26\uff0c\u6570\u5b57\u548c\u7a7a\u683c\u3002
-errors.float={0}\u5fc5\u987b\u662f\u4e00\u4e2a\u6d6e\u70b9\u6570\u3002
-errors.footer=</ul></div>
-errors.header=<div class="error"><ul>
-errors.integer={0} \u5fc5\u987b\u662f\u4e00\u4e2a\u6574\u6570\u3002
-errors.invalid={0} \u975e\u6cd5\u3002
-errors.long={0} \u5fc5\u987b\u662f\u4e00\u4e2a\u957f\u6574\u6570\u3002
-errors.maxlength={0} \u4e0d\u80fd\u591a\u4e8e {1} \u4e2a\u5b57\u7b26\u3002
-errors.minlength={0} \u4e0d\u80fd\u5c11\u4e8e {1} \u4e2a\u5b57\u7b26\u3002
-errors.noslashes={0}  \u4e0d\u80fd\u5305\u542b'/'\u5b57\u7b26\u3002
-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=\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
-folderForm.correct.subtitle=\u6b63\u5728\u4fee\u6539\u4e66\u7b7e\u5939
-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}]
 folderForm.edit.title=\u7f16\u8f91\u6587\u4ef6\u5939
-folderForm.editFolder=\u7f16\u8f91\u4e66\u7b7e\u5939
-folderForm.save=\u4fdd\u5b58
-folderForm.save.exception=\u4fdd\u5b58\u4e66\u7b7e\u5939\u51fa\u9519,\u662f\u5426\u540d\u5b57\u5df2\u7ecf\u88ab\u5360\u7528\uff1f\u9519\u8bef\u4fe1\u606f\u662f{0}
-footer.macros=\u5b8f
-footer.mailingLists=\u90ae\u4ef6\u5217\u8868
-footer.reportIssue=\u62a5\u544a\u95ee\u9898
-footer.userGuide=\u7528\u6237\u6307\u5357
 inviteMember.administrator=\u7ba1\u7406\u5458
 inviteMember.author=\u4f5c\u8005
 inviteMember.button.save=\u53d1\u51fa\u9080\u8bf7
@@ -374,9 +231,6 @@ inviteMember.subtitle=\u9080\u8bf7\u4e00
 inviteMember.title=\u9080\u8bf7\u65b0\u6210\u5458
 inviteMember.userInvited=\u7528\u6237\u9080\u8bf7\u6210\u529f
 inviteMember.userName=\u7528\u6237\u540d
-inviteMemberDone.inviteAnother=\u518d\u9080\u8bf7\u4e00\u4e2a
-inviteMemberDone.message=\u7528\u6237 [{0}] \u5df2\u7ecf\u88ab\u9080\u8bf7\u53c2\u52a0\u8fd9\u4e2a\u7f51\u5fd7
-inviteMemberDone.title=\u9080\u8bf7\u88ab\u53d1\u9001
 loginPage.login=\u767b\u5f55
 loginPage.password=\u5bc6\u7801
 loginPage.prompt=\u8bf7\u952e\u5165\u60a8\u7684\u7528\u6237\u540d\u548c\u5bc6\u7801\u6765\u767b\u5f55\u3002
@@ -384,53 +238,26 @@ loginPage.rememberMe=\u8bb0\u4f4f\u6211
 loginPage.reset=\u91cd\u7f6e
 loginPage.title=\u6b22\u8fce\u6765\u5230Roller
 loginPage.userName=\u7528\u6237\u540d
-macro.bookmark.error=\u6293\u53d6\u4e66\u7b7e\u5939\u76ee\u5f55\u51fa\u9519\uff1a {0}
 macro.bookmark.urlFeed=\u7f51\u7ad9RSS\u79cd\u5b50\u7684URL\u5730\u5740
-macro.referer.furtherReading=\u6df1\u5165\u9605\u8bfb\u4eca\u65e5\u5e16\u5b50\uff1a
-macro.referer.todaysHits=\u4eca\u65e5\u70b9\u51fb\uff1a
-macro.rss.all=\u5168\u90e8
-macro.rss.excerpts=\u6458\u8981
-macro.searchresults.again=\u91cd\u65b0\u641c\u7d22
 macro.searchresults.hits_1=\u627e\u5230\u4e86<strong>{0}</strong>\u4e2a\u65e5\u5fd7\u3002<br />\u4f60\u4e5f\u53ef\u4ee5<em>
 macro.searchresults.hits_2=\u5728<a href="http://google.com">Google</a>\u8fdb\u884c\u540c\u6837\u7684\u641c\u7d22\u3002</em>
-macro.searchresults.results=\u641c\u7d22\u7ed3\u679c
-macro.searchresults.searchFor=\u60a8\u641c\u7d22{0}\u6240\u4f7f\u7528\u7684\u6765\u6e90
-macro.searchresults.title=Dictionary.com\u3000\u5b9a\u4e49\u7684'{0}'
-macro.searchresultsday.categorypermalink.title=\u663e\u793a\u6b64\u5206\u7c7b\u4e2d\u7684\u65e5\u5fd7
-macro.searchresultsday.entrypermalink.title=\u5230\u6b64\u65e5\u5fd7\u7684\u6c38\u4e45\u94fe\u63a5
-macro.searchresultsday.userpermalink.title=\u8fde\u63a5\u5230\u7528\u6237\u7684\u9996\u9875
-macro.weblog.addcomment=\u6dfb\u52a0\u8bc4\u8bba
-macro.weblog.allcategories=\u5168\u90e8\u5206\u7c7b
-macro.weblog.clear=\u6e05\u9664\u60a8\u7684\u4fe1\u606f
 macro.weblog.comment=\u8bc4\u8bba
 macro.weblog.commentpermalink.title=\u8bc4\u8bba\u7684\u6c38\u4e45\u94fe\u63a5
 macro.weblog.comments=\u8bc4\u8bba
 macro.weblog.commentwarning=\u8bf7\u5199\u4e00\u6761\u8bc4\u8bba\u3002
-macro.weblog.date.timestampFormat=yyyy\u5e74MM\u6708dd\u65e5, hh:mm:ss a z
 macro.weblog.date.toStringFormat=EEEE yyyy\u5e74MM\u6708dd\u65e5
 macro.weblog.datepattern=yyyy\u5e74MM\u6708dd\u65e5, hh:mm aa z
-macro.weblog.daypermalink.title=\u4eca\u65e5\u6c38\u4e45\u94fe\u63a5
-macro.weblog.editentry=\u7f16\u8f91
 macro.weblog.email=\u7535\u5b50\u90ae\u4ef6\u5730\u5740\uff1a
-macro.weblog.entrypermalink.edit=\u7f16\u8f91
-macro.weblog.entrypermalink.title=\u6b64\u65e5\u5fd7\u7684\u6c38\u4e45\u94fe\u63a5
 macro.weblog.htmldisabled=\u7981\u7528
 macro.weblog.htmlenabled=\u542f\u7528
 macro.weblog.htmlsyntax=HTML\u8bed\u6cd5\uff1a
-macro.weblog.linkbacks=\u94fe\u56de
 macro.weblog.name=\u59d3\u540d\uff1a
-macro.weblog.noEntriesForDate=\u8be5\u65e5\u671f\u6ca1\u6709\u65e5\u5fd7
-macro.weblog.nolanguages=\u672c\u7ad9\u70b9\u4e0d\u652f\u6301\u591a\u79cd\u8bed\u8a00\u3002
 macro.weblog.notifyMeOfComments=\u5982\u679c\u6709\u65b0\u8bc4\u8bba\uff0c\u7ed9\u6211\u53d1\u9001\u7535\u5b50\u90ae\u4ef6\u901a\u77e5
 macro.weblog.on=\u5728
 macro.weblog.post=\u53d1\u8868
 macro.weblog.postcomment=\u53d1\u8868\u8bc4\u8bba
 macro.weblog.postcommentHeader=\u53d1\u8868\u4e00\u6761\u8bc4\u8bba\uff1a
 macro.weblog.postedby=\u53d1\u8868\u4e8e
-macro.weblog.postedbyanonymous=\u533f\u540d\u53d1\u8868\u4e8e
-macro.weblog.postedbyanonymousemail=email:<a href="mailto:{0}">\u533f\u540d</a>\u53d1\u8868\u4e8e
-macro.weblog.postedbyemail=\u7531<a href="mailto:{0}">{1}</a>\u53d1\u8868\u4e8e
-macro.weblog.postedbywebsite=<br/>\u7ad9\u70b9\uff1a <a rel="nofollow" href="{0}">{1}</a>
 macro.weblog.preview=\u9884\u89c8
 macro.weblog.rememberinfo=\u8bb0\u4e0b\u60a8\u7684\u4fe1\u606f\uff1f
 macro.weblog.searchagain=\u91cd\u65b0\u641c\u7d22
@@ -439,31 +266,14 @@ macro.weblog.searchbutton=\u641c\u7d22
 macro.weblog.searchdictionary=\u5728"<a href="http://dictionary.com/search?q={0}" title="Define '{1}' on Dictionary.com" class="dictionary">{2}</a>"\u4e2d\u641c\u7d22\u3002
 macro.weblog.searchgoogle=<em>\u60a8\u4e5f\u53ef\u4ee5\u4f7f\u7528<a href="http://google.com">Google</a>\u6765\u641c\u7d22<a href="http://google.com/search?q={0}%20site:{1}/{2}/{3}" class="google">\u8fd9\u4e2a\u94fe\u63a5</a>\u3002</em>
 macro.weblog.searchhits=\u627e\u5230<strong>{0}</strong>\u6761\u65e5\u5fd7\u3002
-macro.weblog.trackback=\u53cd\u5411\u8ddf\u8e2a URL\uff1a
 macro.weblog.url=URL\uff1a
-macro.weblog.website=<br/>\u7ad9\u70b9\uff1a<a href="{0}">{1}</a>
 macro.weblog.yourcomment=\u60a8\u7684\u8bc4\u8bba\uff1a
 mainPage.actions=\u52a8\u4f5c
-mainPage.adminWarning=\u60a8\u62e5\u6709 <b>\u8d85\u7ea7\u7ba1\u7406\u5458</b><br />\u7684\u6743\u5229\uff0c\u8bf7\u73cd\u60dc\u4f7f\u7528\u3002
 mainPage.category=\u5206\u7c7b
 mainPage.currentWebsite=\u7f16\u8f91\u7f51\u5fd7
-mainPage.frontPage=Roller
-mainPage.hits=\u70b9\u51fb\u6570
-mainPage.hotWeblogs=\u70ed\u95e8\u7f51\u7edc\u65e5\u5fd7\uff1a\u65e5\u70b9\u51fb\u6570
-mainPage.link=\u94fe\u63a5
 mainPage.loggedInAs=\u60a8\u767b\u5f55\u4e3a
 mainPage.mainMenu=\u4e3b\u83dc\u5355
-mainPage.pinnedEntries=\u7279\u8272\u7f51\u5fd7
-mainPage.postedBy=\u7531
-mainPage.read=\u9605\u8bfb
-mainPage.recentEntries=\u6700\u65b0\u65e5\u5fd7
-mainPage.rss.instructions=\u5355\u51fb\u53f3\u952e\uff0c\u590d\u5236\u94fe\u63a5\uff0c\u7136\u540e\u7c98\u8d34\u5230\u4f60\u7684\u65b0\u95fb\u805a\u5408\u9605\u8bfb\u5668\u3002
-mainPage.rss.tip=\u7ad9\u70b9RSS\u79cd\u5b50\u3002
-mainPage.searchButton=\u641c\u7d22
 mainPage.searchWeblogs=\u641c\u7d22\u7f51\u5fd7
-mainPage.sidebarHelpTitle=\u8fd9\u662f\u4ec0\u4e48\uff1f
-mainPage.status=\u72b6\u6001
-mainPage.weblog=\u6b63\u5728\u5199\u65e5\u5fd7\u2026\u2026
 maintenance.button.flush=\u540c\u6b65\u7f13\u5b58\uff08\u5199\u5165\u786c\u76d8\uff09
 maintenance.button.index=\u91cd\u5efa\u641c\u7d22\u7d22\u5f15
 maintenance.message.flushed=\u60a8\u7684Roller\u7f51\u7ad9\u7684\u9875\u9762\u5df2\u7ecf\u6210\u529f\u5730\u88ab\u540c\u6b65\u4e86
@@ -474,7 +284,6 @@ maintenance.subtitle=\u8fdb\u884c\u7f51\
 maintenance.title=\u7f51\u5fd7\u6301\u4e45\u5316
 memberPermissions.administrator=\u7ba1\u7406\u5458
 memberPermissions.author=\u4f5c\u8005
-memberPermissions.button.save=\u4fdd\u5b58
 memberPermissions.confirmRemove=\u60a8\u786e\u4fe1\u8981\u4ece\u8fd9\u4e2a\u7f51\u5fd7\u4e2d\u5220\u9664\u8be5\u6210\u5458\u5417\uff1f
 memberPermissions.description=\u60a8\u53ef\u4ee5\u66f4\u6539\u7f51\u5fd7\u6210\u5458\u7684\u6743\u9650\uff0c\u6216\u8005\u4f7f\u7528\u4e0b\u9762\u8868\u683c\u5185\u7684\u63a7\u5236\u9762\u677f\u5220\u9664\u4ed6\u4eec\u7136\u540e\u4fdd\u5b58\u66f4\u6539\u3002\u6ce8\u610f\uff0c\u60a8\u4e0d\u80fd\u66f4\u6539\u6216\u8005\u5220\u9664\u81ea\u5df1\u3002
 memberPermissions.inviteMember=\u9080\u8bf7\u65b0\u6210\u5458
@@ -489,49 +298,24 @@ memberPermissions.subtitle=\u7ba1\u7406\
 memberPermissions.title=\u7f51\u5fd7\u6210\u5458\u8bb8\u53ef\u534f\u8bae
 memberPermissions.userName=\u7528\u6237\u540d
 memberPermissions.whyInvite=\u9080\u8bf7\u4e00\u4e9b\u4eba\u5e2e\u60a8\u5199\u7f51\u5fd7\u3002
-navigationBar.header=\u5bfc\u822a
 navigationBar.login=\u767b\u5f55
 navigationBar.logout=\u9000\u51fa
-navigationBar.main=\u4e3b\u9875\u9762
 navigationBar.newEntry=\u64b0\u5199\u65b0\u65e5\u5fd7
 navigationBar.register=\u6ce8\u518c\u65b0\u7528\u6237
 navigationBar.settings=\u8bbe\u7f6e
-navigationBar.youMay=\u60a8\u53ef\u4ee5
 # additions 20041024
 newUser.addNewUser=\u65b0\u7528\u6237\u6ce8\u518c
-newUser.created=\u65b0\u7528\u6237\u521b\u5efa\u6210\u529f\uff0c\u521b\u5efa\u53e6\u4e00\u4e2a\u7528\u6237\uff1f
-newUser.error.mismatchedPasswords=\u9519\u8bef\uff1a\u5bc6\u7801\u4e0d\u5339\u914d
-newuser.eMailAddress=\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u5730\u5740
-newuser.fullName=\u5168\u540d
-newuser.locale=\u672c\u5730\u5316\u8bbe\u7f6e
-newuser.loginName=\u7528\u6237\u540d
-newuser.newUserCreationDisabled=\u62b1\u6b49\uff0c\u7ad9\u70b9\u7ba1\u7406\u5458\u5173\u95ed\u4e86\u7528\u6237\u6ce8\u518c\u529f\u80fd\u3002
-newuser.password=\u5bc6\u7801
-newuser.theme=\u4e3b\u9898
-newuser.timeZone=\u65f6\u533a
-newuser.timezone=\u65f6\u533a
 # ------------------------------------------------- Success Messages in Actions
-pageCache.flushed=\u9875\u9762\u7f13\u5b58\u5df2\u7ecf\u88ab\u540c\u6b65\u3002
-pageForm.description=\u63cf\u8ff0
-pageForm.editPage=\u7f16\u8f91\u6a21\u677f
 pageForm.link=\u94fe\u63a5
 pageForm.save=\u4fdd\u5b58
 pageForm.save.success=\u6a21\u677f\u6210\u529f\u66f4\u65b0\u3002
 pageForm.template=\u6a21\u677f
-pageForm.title=\u7f16\u8f91\u6a21\u677f
 pageRemove.pageId=\u9875\u9762ID
 pageRemove.pageName=\u9875\u9762\u540d\u5b57
 pageRemove.subtitle=\u786e\u5b9a\u5220\u9664\u9875\u9762
 pageRemove.youSure=\u60a8\u786e\u4fe1\u8981\u79fb\u9664\u8fd9\u4e2a\u9875\u9762\u5417\uff1f
-pagesForm.=\u540d\u5b57
 pagesForm.add=\u6dfb\u52a0
 pagesForm.addNewPage=\u6dfb\u52a0\u65b0\u6a21\u677f
-pagesForm.addNewPage.success=\u65b0\u6a21\u677f\u6dfb\u52a0\u6210\u529f\uff1a <strong>{0}</strong> \u3002
-pagesForm.description=\u63cf\u8ff0
-pagesForm.edit=\u7f16\u8f91
-pagesForm.emptyPage=\u7a7a\u6a21\u677f\u2026\u2026
-pagesForm.hiddenNote=\u6ce8\u610f\uff1a\u540d\u5b57\u4ee5"_"\u4e0b\u5212\u7ebf\u4e3a\u5f00\u5934\u7684\u9875\u9762\u662f\u9690\u85cf\u7684\u3002\u4ed6\u4eec\u4e0d\u4f1a\u5728\u5bfc\u822a\u6761\u4e2d\u663e\u793a\u3002
-pagesForm.link=\u94fe\u63a5
 pagesForm.remove=\u79fb\u9664
 pagesForm.required=\uff08\u5fc5\u9700\u7684\uff09
 pagesForm.subtitle=\u7ba1\u7406\u7f51\u5fd7 <span>{0}</span> \u7684\u6a21\u677f
@@ -544,16 +328,12 @@ ping.successful=Ping\u6210\u529f\uff01
 ping.transmissionFailed=Ping\u5931\u8d25\u3002\u68c0\u67e5\u60a8\u7684Ping\u76ee\u6807URL\u662f\u5426\u6b63\u786e\u3002
 ping.transmittedButError=Ping\u6210\u529f\u53d1\u9001\uff0c\u4f46\u662f\u670d\u52a1\u5668\u8fd4\u56de\u5982\u4e0b\u9519\u8bef\u4fe1\u606f\u3002
 ping.unknownHost=Ping\u76ee\u6807\u7684\u4e3b\u673aURL\u672a\u77e5\u3002
-pingResult.OK=\u6210\u529f
-pingTarget.addNew=\u65b0\u5efa
 pingTarget.auto=\u81ea\u52a8
 pingTarget.cancel=\u53d6\u6d88
 pingTarget.confirmCommonRemove=\u79fb\u9664\u8fd9\u4e2a\u76ee\u6807\u5c06\u4f1a\u79fb\u9664\u6240\u6709\u7528\u6237\u7684\u4f7f\u7528\u6b64\u76ee\u6807\u81ea\u52a8Ping\u914d\u7f6e\u3002\u60a8\u8981\u7ee7\u7eed\u5417\uff1f
-pingTarget.confirmCustomRemove=\u79fb\u9664\u8fd9\u4e2a\u76ee\u6807\u5c06\u4f1a\u79fb\u9664\u60a8\u7684\u4f7f\u7528\u6b64\u76ee\u6807\u81ea\u52a8Ping\u914d\u7f6e\u3002\u60a8\u8981\u7ee7\u7eed\u5417\uff1f
 pingTarget.confirmRemoveTitle=\u79fb\u9664Ping\u76ee\u6807\u914d\u7f6e
 pingTarget.disable=\u5931\u6548
 pingTarget.disabled=\u5173\u95ed
-pingTarget.edit=\u7f16\u8f91
 pingTarget.enable=\u751f\u6548
 pingTarget.enabled=\u5f00\u542f
 pingTarget.malformedUrl=URL\u683c\u5f0f\u4e0d\u6b63\u786e\u3002
@@ -563,7 +343,6 @@ pingTarget.pingTarget=Ping\u76ee\u6807
 pingTarget.pingUrl=Ping URL\u5730\u5740
 pingTarget.remove=\u5220\u9664
 pingTarget.removeOK=\u5220\u9664\u6210\u529f
-pingTarget.save=\u4fdd\u5b58
 pingTarget.saved=Ping\u76ee\u6807\u5df2\u4fdd\u5b58\u3002
 pingTarget.sendPingNow=\u53d1\u9001Ping\u2026\u2026
 pingTarget.unknownHost=\u8be5URL\u4e3b\u673a\u5730\u5740\u4e0d\u5b58\u5728\u3002
@@ -571,53 +350,14 @@ pings.commonPingTargets=\u666e\u901aPing
 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
-planet.description.unconfigured=\u884c\u661f\u65b0\u95fb\u805a\u5408\u5668\u5df2\u7ecf\u6fc0\u6d3b\u4f46\u662f\u8fd8\u6ca1\u6709\u914d\u7f6e\u3002
-planet.hotBlogs=\u672c\u7ad9\u70ed\u95e8\u65e5\u5fd7
-planet.links=\u94fe\u63a5
-planet.rankings=Technorati\u7b49\u7ea7
-planet.title.unconfigured=\u884c\u661f\u65b0\u95fb\u805a\u5408\u5668\uff08\u672a\u914d\u7f6e\uff09
-planetConfig.adminEmail=\u7ba1\u7406\u5458\u7535\u5b50\u90ae\u4ef6
-planetConfig.button.post=\u4fdd\u5b58
-planetConfig.button.refreshEntries=\u5237\u65b0\u65e5\u5fd7
-planetConfig.button.syncWebsites=\u540c\u6b65Roller\u7f51\u5fd7
-planetConfig.cacheDir=\u7f13\u5b58\u76ee\u5f55
-planetConfig.description=\u63cf\u8ff0
-planetConfig.error.badProxyPort=\u4ee3\u7406\u670d\u52a1\u5668\u7aef\u53e3\u65e0\u6548
-planetConfig.error.cacheDirNotFound=\u672a\u53d1\u73b0\u7f13\u5b58\u76ee\u5f55
-planetConfig.error.cacheDirNotWritable=\u7f13\u5b58\u76ee\u5f55\u4e0d\u53ef\u5199\u5165
-planetConfig.numSubscrtions=Roller\u63d0\u4f9b\u7684\u8ba2\u9605\u6570\u91cf
-planetConfig.numWebsites=Roller\u63d0\u4f9b\u7684\u7f51\u5fd7\u6570\u91cf
-planetConfig.pageTitle=\u884c\u661f\u914d\u7f6e
 planetConfig.prompt=\u8bbe\u7f6e\u6807\u9898\u3001\u63cf\u8ff0\u3001\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u548c\u5c06\u8981\u5728\u4ea7\u751f\u65b0\u95fb\u79cd\u5b50\u65f6\u5019\u4f7f\u7528\u7684\u7ad9\u70b9URL\u3002\u5982\u679c\u60a8\u7684\u7f51\u7edc\u9700\u8981\u60a8\u4e5f\u53ef\u4ee5\u5efa\u7acb\u4e00\u4e2a\u4ee3\u7406\u670d\u52a1\u5668\u3002
-planetConfig.prompt.control=\u4e0b\u8f7d\u9ed8\u8ba4\u4efb\u52a1\uff08\u4ec5\u7528\u4e8e\u6d4b\u8bd5\uff09\u3002
-planetConfig.proxyHost=\u4ee3\u7406\u670d\u52a1\u5668URL
-planetConfig.proxyPort=\u4ee3\u7406\u670d\u52a1\u5668\u7aef\u53e3
-planetConfig.siteUrl=\u7ad9\u70b9URL
 planetConfig.subtitle=\u914d\u7f6eRoller\u65b0\u95fb\u805a\u5408\u5668\u3002
-planetConfig.success.refreshed=\u5237\u65b0\u64cd\u4f5c\u5df2\u7ecf\u5f00\u59cb
-planetConfig.success.saved=\u914d\u7f6e\u4fdd\u5b58\u5b8c\u6bd5
-planetConfig.success.synced=\u7f51\u5fd7\u540c\u6b65\u5df2\u7ecf\u5f00\u59cb
-planetConfig.tip.adminEmail=\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u5c06\u88ab\u7528\u4e8e\u65b0\u95fb\u79cd\u5b50\u7684\u5f00\u59cb\u90e8\u5206
-planetConfig.tip.cacheDir=\u7528\u4e8e\u7f13\u5b58\u65b0\u95fb\u6570\u636e\u7684\u76ee\u5f55
-planetConfig.tip.description=\u7528\u4e8e\u65b0\u95fb\u79cd\u5b50\u5f00\u59cb\u90e8\u5206\u7684\u63cf\u8ff0
-planetConfig.tip.proxyHost=\u4ee3\u7406\u670d\u52a1\u5668\u7684URL\uff08\u5982\u679c\u9700\u8981\uff09
-planetConfig.tip.proxyPort=\u4ee3\u7406\u670d\u52a1\u5668\u7aef\u53e3\uff08\u5982\u679c\u9700\u8981\uff09
-planetConfig.tip.siteUrl=\u7528\u4e8e\u65b0\u95fb\u79cd\u5b50\u5f00\u59cb\u90e8\u5206\u7684URL
-planetConfig.tip.title=\u7528\u4e8e\u65b0\u95fb\u79cd\u5b50\u5f00\u59cb\u90e8\u5206\u7684\u6807\u9898
 planetConfig.title=\u884c\u661f\u914d\u7f6e
-planetConfig.title.control=\u884c\u661f\u5b9e\u9a8c\u63a7\u5236\u9762\u677f
-planetGroups.button.cancel=\u53d6\u6d88
-planetGroups.button.delete=\u5220\u9664
-planetGroups.button.save=\u4fdd\u5b58
-planetGroups.column.edit=\u7f16\u8f91
-planetGroups.column.feedUrl=\u79cd\u5b50URL
 planetGroups.column.handle=\u5904\u7406\uff08Handle\uff09
 planetGroups.column.subscriptions=\u8ba2\u9605
 planetGroups.column.title=\u6807\u9898
 planetGroups.edit=\u7f16\u8f91
 planetGroups.edit.tip=\u7f16\u8f91\u8fd9\u4e2a\u7fa4\u7ec4
-planetGroups.error.deleting=\u5220\u9664\u9519\u8bef
-planetGroups.error.duringSave=\u590d\u5236\u7fa4\u7ec4\uff1f\uff0d{0}
 planetGroups.error.handle=\u63a7\u5236\u5668\uff08Handle\uff09\u662f\u5fc5\u987b\u7684
 planetGroups.error.nameReserved=\u4e0d\u80fd\u4f7f\u7528all\u6216\u8005external\u4f5c\u4e3a\u63a7\u5236\u5668\uff08Handle\uff09
 planetGroups.error.title=\u6807\u9898\u662f\u5fc5\u987b\u7684
@@ -628,55 +368,30 @@ planetGroups.pagetitle=\u5b9a\u5236\u884
 planetGroups.prompt.add=\u5efa\u7acb\u4e00\u4e2a\u7fa4\u7ec4\u3002\u5148\u952e\u5165\u4e00\u4e2a\u663e\u793a\u540d\u5b57\u548c\u4e00\u4e2a\u552f\u4e00\u7684\u63a7\u5236\u5668\uff08Handle\uff0c\u5c06\u8981\u5728\u65b0\u95fb\u79cd\u5b50URL\u4e2d\u4f7f\u7528\uff09\uff0c\u7136\u540e\u4fdd\u5b58\u3002
 planetGroups.prompt.edit=\u60a8\u6b63\u5728\u7f16\u8f91\u4e00\u4e2a\u5b9a\u5236\u65b0\u95fb\u805a\u5408\u5668\u7fa4\u7ec4\u3002\u4e00\u65e6\u66f4\u6539\u8bf7\u4fdd\u5b58\u3002\u6216\u8005\u4f7f\u7528\u5220\u9664\u952e\u5220\u9664\u5b83\u3002
 planetGroups.subtitle=\u6dfb\u52a0\u5b9a\u5236\u65b0\u95fb\u805a\u5408\u5668\u7fa4\u7ec4\uff0c\u6bcf\u4e00\u4e2a\u4f1a\u4ea7\u751f\u4e00\u4e2a\u65b0\u95fb\u79cd\u5b50\u3002
-planetGroups.success.deleted=\u7fa4\u7ec4\u5220\u9664\u6210\u529f\uff01
 planetGroups.success.saved=\u4fdd\u5b58\u7fa4\u7ec4
 planetGroups.tip.handle=\u8fd9\u4e2a\u7fa4\u7ec4\u7684\u63a7\u5236\u5668\uff08Handle\uff09
-planetGroups.tip.subscriptions=\u7f16\u8f91\u7fa4\u7ec4\u8ba2\u9605
 planetGroups.tip.title=\u7fa4\u7ec4\u6807\u9898
 planetGroups.title=\u6807\u9898
-planetGroups.unconfigured=Roller\u884c\u661f\u672a\u914d\u7f6e
-planetSubscription.edit=\u7f16\u8f91
-planetSubscription.edit.tip=\u7f16\u8f91\u8fd9\u4e2a\u8ba2\u9605
 planetSubscription.error=\u5fc5\u987b\u6307\u5b9a\u65b0\u95fb\u79cd\u5b50URL
 planetSubscription.error.deleting=\u5220\u9664\u65f6\u5019\u53d1\u751f\u9519\u8bef
 planetSubscription.error.feedUrl=\u65b0\u95fb\u79cd\u5b50URL\u662f\u5fc5\u987b\u7684
-planetSubscription.error.siteUrl=\u7f51\u7ad9URL\u662f\u5fc5\u987b\u7684
-planetSubscription.error.title=\u6807\u9898\u662f\u5fc5\u987b\u7684
 planetSubscription.feedUrl=\u65b0\u95fb\u79cd\u5b50URL
 planetSubscription.foundExisting=\u53d1\u73b0\u5df2\u7ecf\u5b58\u5728\u8ba2\u9605 [{0}] \uff0c\u66ff\u6362\u5417
-planetSubscription.siteUrl=\u7ad9\u70b9URL
 planetSubscription.success.deleted=\u8ba2\u9605\u6210\u529f\u5220\u9664
 planetSubscription.success.saved=\u8ba2\u9605\u5df2\u4fdd\u5b58
-planetSubscription.tip.feedUrl=\u65e5\u5fd7\u65b0\u95fb\u79cd\u5b50URL
-planetSubscription.tip.siteUrl=\u65e5\u5fd7URL
-planetSubscription.tip.title=\u65e5\u5fd7\u6807\u9898
-planetSubscription.title=\u6807\u9898
-planetSubscriptions.button.cancel=\u53d6\u6d88
-planetSubscriptions.button.delete=\u5220\u9664
-planetSubscriptions.button.save=\u4fdd\u5b58
-planetSubscriptions.column.edit=\u7f16\u8f91
 planetSubscriptions.column.feedUrl=\u65b0\u95fb\u79cd\u5b50URL
 planetSubscriptions.column.title=\u6807\u9898
 planetSubscriptions.error.duringSave=\u590d\u5236\u8ba2\u9605\uff1f\uff0d{0}
-planetSubscriptions.existingPrompt=\u9009\u62e9\u4e00\u4e2a\u5b58\u5728\u7684\u8ba2\u9605\u5e76\u4e14\u7f16\u8f91\u3002
 planetSubscriptions.existingTitle=\u5b58\u5728\u7684\u8ba2\u9605
 planetSubscriptions.prompt.add=\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7684\u8ba2\u9605\u5f88\u7b80\u5355\uff1a\u8f93\u5165\u6807\u9898\u3001\u65b0\u95fb\u79cd\u5b50URL\u7136\u540e\u4fdd\u5b58\u3002
 planetSubscriptions.prompt.addMain=\u5728\u8fd9\u4e2a\u9875\u9762\u4e2d\u6dfb\u52a0\u3001\u7f16\u8f91\u8ba2\u9605\uff1a\u65b0\u95fb\u79cd\u5b50\u5217\u8868\u5728\u884c\u661f\u65b0\u95fb\u805a\u5408\u5668\u9875\u9762\u4e4b\u4e2d\u3002\u6dfb\u52a0\u4e00\u4e2a\u65b0\u8ba2\u9605\u5f88\u7b80\u5355\uff1a\u8f93\u5165\u6807\u9898\u3001\u65b0\u95fb\u79cd\u5b50URL\u7136\u540e\u4fdd\u5b58\u3002
-planetSubscriptions.prompt.edit=\u66f4\u6539\u5e76\u4fdd\u5b58\u3002\u6216\u8005\uff0c\u70b9\u51fb\u5220\u9664\u6765\u5220\u6389\u5b83\u3002
 planetSubscriptions.subtitle.add=\u7ba1\u7406\u7fa4\u7ec4 [<b>{0}</b>] \u7684\u8ba2\u9605\u3002
 planetSubscriptions.subtitle.addMain=\u7ba1\u7406\u4e3b\u65b0\u95fb\u8ba2\u9605\u5217\u8868\u3002
-planetSubscriptions.subtitle.edit=\u7f16\u8f91\u4e00\u4e2a\u5b58\u5728\u7684\u8ba2\u9605\u3002
 planetSubscriptions.title=\u8ba2\u9605
-planetSubscriptions.titleGroup=\u8ba2\u9605 [{0}]
-planetSubscriptions.unconfigured=Roller\u884c\u661f\u672a\u914d\u7f6e
-search.title=\u641c\u7d22\u7ed3\u679c
-searchForm.alert=\u8bf7\u8f93\u5165\u5173\u952e\u8bcd\u5e76\u641c\u7d22\u3002
-searchForm.button=\u641c\u7d22
 tabbedmenu.admin=\u670d\u52a1\u5668\u7ba1\u7406
 tabbedmenu.admin.cacheInfo=\u7f13\u5b58\u4fe1\u606f
 tabbedmenu.admin.commentManagement=\u8bc4\u8bba
 tabbedmenu.admin.config=\u7ba1\u7406\u914d\u7f6e
-tabbedmenu.admin.createUser=\u65b0\u7528\u6237
 tabbedmenu.admin.pingTargets=Ping\u76ee\u6807
 tabbedmenu.admin.planetConfig=\u914d\u7f6e
 tabbedmenu.admin.planetGroups=\u5b9a\u5236\u7fa4\u7ec4
@@ -684,86 +399,35 @@ tabbedmenu.admin.planetSubscriptions=\u8
 tabbedmenu.admin.userAdmin=\u7528\u6237\u7ba1\u7406
 tabbedmenu.bookmarks=\u4e66\u7b7e
 tabbedmenu.bookmarks.allFolders=\u4e66\u7b7e\u5939
-tabbedmenu.bookmarks.import=\u5bfc\u5165
-tabbedmenu.createWebsite=\u65b0\u5efa\u7f51\u5fd7
-tabbedmenu.main=\u4e3b\u9875\u9762
 tabbedmenu.planet=\u884c\u661f\u7ba1\u7406\u5458
-tabbedmenu.planet.localEntries=\u6700\u65b0\u65e5\u5fd7
-tabbedmenu.planet.planetEntries=\u884c\u661f
-tabbedmenu.user.websites=\u60a8\u7684\u7f51\u5fd7
 tabbedmenu.weblog=\u7f51\u5fd7\u7ba1\u7406
 tabbedmenu.weblog.archives=\u5f52\u6863
 tabbedmenu.weblog.categories=\u5206\u7c7b
-tabbedmenu.weblog.commentManagement=\u8bc4\u8bba
 tabbedmenu.weblog.export=\u5bfc\u51fa
-tabbedmenu.weblog.flushCache=\u540c\u6b65\u7f13\u5b58
-tabbedmenu.weblog.import=\u5bfc\u5165
 tabbedmenu.weblog.newEntry=\u64b0\u5199\u65b0\u65e5\u5fd7
 tabbedmenu.weblog.pingSetup=Pings
 tabbedmenu.website=\u4e2a\u6027\u5b9a\u5236
-tabbedmenu.website.files=\u6587\u4ef6\u4e0a\u4f20
-tabbedmenu.website.inviteMember=\u9080\u8bf7\u6210\u5458
 tabbedmenu.website.maintenance=\u7ef4\u62a4
 tabbedmenu.website.members=\u6210\u5458
 tabbedmenu.website.pages=\u6a21\u677f
 tabbedmenu.website.settings=\u7ad9\u70b9\u8bbe\u7f6e
 tabbedmenu.website.themes=\u4e3b\u9898
-tabbedmenu.website.user=\u7528\u6237\u8d44\u6599
-themeEditor.cancel=\u53d6\u6d88
-themeEditor.customize=\u5b9a\u5236
 themeEditor.preview=\u9884\u89c8
 themeEditor.save=\u4fdd\u5b58
-themeEditor.savePrompt=\u60a8\u662f\u5426\u613f\u610f\u628a\u5b83\u4fdd\u5b58\u4e3a\u60a8\u9875\u9762\u7684\u65b0\u4e3b\u9898?
-themeEditor.saveWarning=\u8b66\u544a : \u6b64\u52a8\u4f5c\u4f1a\u5bfc\u81f4\u60a8\u4e22\u5931\u6240\u6709\u5728\u524d\u4e00\u4e2a\u4e3b\u9898\u7684\u9875\u9762\u6a21\u677f\u4e2d\u8fdb\u884c\u7684\u4fee\u6539\u3002
 themeEditor.selectTheme=\u9009\u62e9\u4e00\u4e2a\u6a21\u677f
 themeEditor.subtitle=\u4e3a\u7f51\u5fd7 <span>{0}</span> \u9009\u62e9\u4e3b\u9898
-themeEditor.themeBelowIsCalled=\u4e0b\u9762\u663e\u793a\u7684\u4e3b\u9898\u540d\u4e3a\uff1a
-themeEditor.tip=\u60a8\u53ef\u4ee5\u4e3a\u8fd9\u4e2a\u7f51\u5fd7\u9009\u62e9\u4e00\u4e2a\u65b0\u4e3b\u9898\u3002\u6ce8\u610f\uff1a\u5982\u679c\u60a8\u5df2\u7ecf\u901a\u8fc7\u7f16\u8f91\u6a21\u677f\u5b9a\u5236\u4e86\u5f53\u524d\u4e3b\u9898\uff0c\u5982\u679c\u60a8\u66f4\u6362\u4e3b\u9898\uff0c\u5f53\u524d\u7684\u5b9a\u5236\u5c06\u5168\u90e8\u5931\u6548\u3002
 themeEditor.title=\u9009\u62e9\u60a8\u7684\u7f51\u5fd7\u6a21\u677f
-themeEditor.youMayCustomize=\u5982\u679c\u60a8\u613f\u610f\uff0c\u60a8\u53ef\u4ee5\u5b9a\u5236\u5f53\u524d\u4e3b\u9898\u7684\u4e00\u4e2a\u526f\u672c\uff0c\u4f7f\u5176\u66f4\u52a0\u5f70\u663e\u60a8\u7684\u4e2a\u6027\u3002
 themeEditor.yourCurrentTheme=\u60a8\u5f53\u524d\u7684\u4e3b\u9898\u662f
-themeEditor.yourThemeIsShownBelow=\u4e0b\u9762\u663e\u793a\u7684\u662f\u60a8\u7684\u5f53\u524d\u4e3b\u9898\u3002
-uploadFiles.button.delete=\u5220\u9664\u9009\u62e9\u7684\u6587\u4ef6
-uploadFiles.deletedFiles=\u5220\u9664\u6587\u4ef6 [{0}]
-uploadFiles.exceededQuota=\u60a8\u8d85\u51fa\u4e86\u60a8\u7684\u6587\u4ef6\u4e0a\u4f20\u9650\u989d\u3002
-uploadFiles.manageFiles=\u7ba1\u7406\u4e0a\u4f20\u7684\u6587\u4ef6
-uploadFiles.noFiles=\u6ca1\u6709\u627e\u5230\u6587\u4ef6\u3002
-uploadFiles.noFilesSpecified=\u60a8\u6ca1\u6709\u9009\u62e9\u4e0a\u4f20\u7684\u6587\u4ef6
-uploadFiles.quotaNote=\u60a8\u53ef\u4ee5\u4e0a\u4f20\u4e0d\u5927\u4e8e{0} MB\u7684\u6587\u4ef6\uff0c\u6240\u6709\u6587\u4ef6\u7684\u603b\u5927\u5c0f\u4e0d\u5f97\u8d85\u8fc7{1} MB\u3002
-uploadFiles.subtitle=\u4e0a\u4f20\u7f51\u5fd7 <span>{0}</span> \u4e2d\u5c06\u8981\u4f7f\u7528\u7684\u6587\u4ef6
-uploadFiles.tip=\u60a8\u53ef\u4ee5\u4e0a\u4f20\u7f51\u5fd7\u4e2d\u9700\u8981\u7684\u6587\u4ef6\u3002\u5982\u679c\u60a8\u4e0a\u4f20\u4e86\u4e00\u4e2a\u56fe\u50cf\u6587\u4ef6\uff0c\u60a8\u53ef\u4ee5\u5728\u60a8\u7684\u7f51\u5fd7\u4e2d\u901a\u8fc7\u4f7f\u7528\u8d85\u6587\u672c\u8bed\u8a00<img src="\u56fe\u50cf\u6587\u4ef6URL"/>\u6807\u7b7e\u6765\u4f7f\u7528\u5b83\u3002\u5982\u679c\u60a8\u4e0a\u4f20\u4e86\u4e00\u4e2a\u5a92\u4f53\u6587\u4ef6\uff0c\u60a8\u53ef\u4ee5\u4f7f\u7528\u6761\u76ee\u540e\u9762\u7684MediaCast\u6765\u4f7f\u7528\u5b83\u3002
-uploadFiles.title=\u6587\u4ef6\u4e0a\u4f20
 uploadFiles.upload=\u4e0a\u4f20
-uploadFiles.uploadDisabled=\u4e0a\u4f20\u529f\u80fd\u88ab\u7981\u6b62\u3002
-uploadFiles.uploadPrompt=\u9009\u62e9\u8981\u4e0a\u4f20\u7684\u6587\u4ef6\uff1a
 uploadFiles.uploadedFile={0}
 uploadFiles.uploadedFiles=\u4e0a\u4f20\u6587\u4ef6\uff1a
-userAdmin.cookieLogin=\u60a8\u662f\u901a\u8fc7\u767b\u5f55\u754c\u9762\u4e2d\u7684<strong>\u8bb0\u4f4f\u6211\u7684\u4fe1\u606f</strong>\u529f\u80fd\u767b\u5f55\u7684\uff0c\u4e3a\u5b89\u5168\u8d77\u89c1\uff0c\u6b64\u65f6\u4e0d\u80fd\u6539\u53d8\u5bc6\u7801\u3002\u8bf7\u9000\u51fa\uff0c\u4f7f\u7528\u5bc6\u7801\u91cd\u65b0\u6b63\u5f0f\u767b\u5f55\uff0c\u624d\u80fd\u4fee\u6539\u5bc6\u7801\u3002
-userAdmin.delete=\u5220\u9664
-userAdmin.deleted=\u8bf7\u6307\u5b9a\u8981\u5220\u9664\u7684\u7528\u6237
-userAdmin.edit=\u7f16\u8f91
 userAdmin.editEntries=\u7f16\u8f91\u65e5\u5fd7
-userAdmin.editUser=\u7f16\u8f91\u7528\u6237
-userAdmin.editUserTitle=\u7f16\u8f91\u7528\u6237 [{0}]
-userAdmin.email=\u7535\u5b50\u90ae\u4ef6
 userAdmin.enabled=\u6fc0\u6d3b
-userAdmin.enterUserName=\u8bf7\u8f93\u5165\u8981\u7f16\u8f91\u7684\u7528\u6237\u540d
-userAdmin.fullname=\u5168\u540d
-userAdmin.invalidNewUserName=\u6307\u5b9a\u7684\u7528\u6237\u4e0d\u5b58\u5728
 userAdmin.manage=\u7ba1\u7406
-userAdmin.name=\u59d3\u540d
 userAdmin.newEntry=\u65b0\u65e5\u5fd7
-userAdmin.password=\u5bc6\u7801
-userAdmin.passwordConfirm=\u5bc6\u7801\uff08\u786e\u8ba4\uff09
 userAdmin.prompt.createANewUser=\u5efa\u7acb\u65b0\u7528\u6237
-userAdmin.prompt.editUser=\u60a8\u53ef\u4ee5\u66f4\u6539\u4e00\u4e2a\u7528\u6237\u7684\u4e2a\u4eba\u8d44\u6599\u3001\u8bb8\u53ef\u534f\u8bae\u7b49\u3002\u6ce8\u610f\uff1a\u60a8\u4e5f\u53ef\u4ee5\u91cd\u7f6e\u4e00\u4e2a\u7528\u6237\u7684\u5bc6\u7801\uff0c\u4f46\u662f\u5982\u679c\u4ed6\u4eec\u4f7f\u7528Roller\u7684\u8bb0\u4f4f\u5bc6\u7801\u529f\u80fd\uff0c\u4ed6\u4eec\u5c06\u4e0d\u5f97\u4e0d\u5220\u9664\u4ee5\u524d\u767b\u5f55\u65f6\u5019\u6d4f\u89c8\u5668\u8bb0\u4f4f\u7684cookies\u7b49\u3002
-userAdmin.prompt.newUser=\u5efa\u7acb\u65b0\u7528\u6237
 userAdmin.prompt.orYouCan=\u6216\u8005\uff0c\u4f60\u53ef\u4ee5
 userAdmin.prompt.searchUser=\u901a\u8fc7\u952e\u5165\u7528\u6237\u540d\u6216\u8005\u5bc6\u7801\u7684\u7b2c\u4e00\u4e2a\u5b57\u6bcd\u67e5\u627e\u7528\u6237\u3002\u9009\u62e9\u7528\u6237\uff0c\u70b9\u51fb\u7f16\u8f91\u6309\u94ae\uff0c\u7f16\u8f91\u7528\u6237\u8d44\u6599\u548c\u7528\u6237\u7684\u7f51\u5fd7\u3002
-userAdmin.rebuildIndex=\u91cd\u5efa\u7528\u6237\u7684\u641c\u7d22\u7d22\u5f15
-userAdmin.save=\u4fdd\u5b58
-userAdmin.saved=\u7528\u6237\u8bbe\u7f6e\u5df2\u4fdd\u5b58
-userAdmin.searchUserTitle=\u67e5\u627e\u8981\u7f16\u8f91\u7684\u7528\u6237
 userAdmin.subtitle.createNewUser=\u5efa\u7acb\u65b0\u7528\u6237\uff0c\u6240\u6709\u533a\u57df\u90fd\u662f\u5fc5\u9700\u7684\u3002
 userAdmin.subtitle.editUser=\u66f4\u6539\u7528\u6237\u8d44\u6599\u548c\u7ba1\u7406\u5458\u6743\u9650
 userAdmin.subtitle.searchUser=\u9009\u62e9\u4e00\u4e2a\u7528\u6237\u4f7f\u5176\u6210\u4e3a\u7ba1\u7406\u5458
@@ -773,7 +437,6 @@ userAdmin.tip.enabled=\u5931\u6548\u7684
 userAdmin.tip.fullName=\u7528\u6237\u7684\u5168\u540d\uff08\u4e0d\u80fd\u4f7f\u7528HTML\uff09\u3002
 userAdmin.tip.locale=\u7528\u6237\u9884\u7f6e\u7684\u672c\u5730\u5316\u8bbe\u7f6e\u3002
 userAdmin.tip.password=\u7528\u6237\u7684\u5bc6\u7801\u3002
-userAdmin.tip.passwordConfirm=\u786e\u8ba4\u7528\u6237\u7684\u5bc6\u7801\u3002
 userAdmin.tip.timeZone=\u7528\u6237\u9884\u7f6e\u65f6\u533a\u3002
 userAdmin.tip.userAdmin=\u9009\u4e2d\u4ee5\u7ed9\u8fd9\u4e2a\u7528\u6237\u8d85\u7ea7\u7ba1\u7406\u5458\u7684\u8bb8\u53ef\u534f\u8bae\u3002
 userAdmin.tip.userName=\u4f7f\u7528\u4e00\u4e2a\u7b80\u77ed\u7684\u7528\u6237\u540d\u4f5c\u4e3a\u7528\u6237\u7684\u8d26\u53f7\u3002\u4ec5\u9650\u4e8eASCII\u5b57\u7b26\uff08a\uff0dz\uff0cA\uff0dZ\u548c0\uff0d9\uff09\uff0c\u4e0d\u80fd\u4f7f\u7528HTML\u3002
@@ -784,10 +447,7 @@ userAdmin.title.searchUser=\u67e5\u627e\
 userAdmin.userAdmin=\u7ba1\u7406\u5458
 userAdmin.userHasNoWeblogs=\u8be5\u7528\u6237\u6ca1\u6709\u7f51\u5fd7\u3002
 userAdmin.userMemberOf=\u8be5\u7528\u6237\u662f\u4e0b\u5217\u7f51\u5fd7\u7684\u6210\u5458
-userAdmin.userSettings=\u7528\u6237\u8bbe\u7f6e
 userAdmin.userWeblogs=\u7528\u6237\u7684\u7f51\u5fd7
-userAdmin.warning=\u6ce8\u610f\uff1a\u6b64\u64cd\u4f5c\u65e0\u6cd5\u53d6\u6d88\uff01\uff01
-userRegister.button.cancel=\u53d6\u6d88
 userRegister.button.save=\u6ce8\u518c\u7528\u6237
 userRegister.prompt=\u4f7f\u7528\u8fd9\u4e2a\u8868\u5355\u6ce8\u518c\u4e00\u4e2a\u65b0\u7684Roller\u7528\u6237\uff0c\u6bcf\u4eba\u53ea\u5141\u8bb8\u6ce8\u518c\u4e00\u4e2a\u5e10\u53f7\u3002
 userRegister.tip.email=\u8bf7\u952e\u5165\u6709\u6548\u7535\u5b50\u90ae\u4ef6\u5730\u5740\uff0c\u5982\u679c\u901a\u8fc7\u8be5\u90ae\u4ef6\u4e0d\u80fd\u8054\u7cfb\u5230\u60a8\uff0c\u7f51\u7ad9\u7ba1\u7406\u5458\u5c06\u5c01\u6389\u8be5\u5e10\u53f7\u3002
@@ -797,45 +457,22 @@ userRegister.tip.password=\u60a8\u7684\u
 userRegister.tip.passwordConfirm=\u786e\u8ba4\u60a8\u7684\u5bc6\u7801\u3002
 userRegister.tip.timeZone=\u60a8\u7684\u65f6\u533a\u3002
 userRegister.tip.userName=\u4f7f\u7528\u4e00\u4e2a\u7b80\u77ed\u7684\u7528\u6237\u540d\u4f5c\u4e3a\u7528\u6237\u7684\u5e10\u53f7\u3002\u4ec5\u9650\u4e8eASCII\u5b57\u7b26\uff08a\uff0dz\uff0cA\uff0dZ\u548c0\uff0d9\uff09\uff0c\u4e0d\u80fd\u4f7f\u7528HTML\u3002
-userSettings.button.cancel=\u53d6\u6d88
 userSettings.button.save=\u4fdd\u5b58\u4e2a\u4eba\u8d44\u6599
-userSettings.cookieLogin=\u60a8\u662f\u901a\u8fc7\u767b\u5f55\u754c\u9762\u4e2d\u7684<strong>\u8bb0\u4f4f\u6211\u7684\u4fe1\u606f</strong>\u529f\u80fd\u767b\u5f55\u7684\uff0c\u4e3a\u5b89\u5168\u8d77\u89c1\uff0c\u6b64\u65f6\u4e0d\u80fd\u6539\u53d8\u5bc6\u7801\u3002\u8bf7\u9000\u51fa\uff0c\u4f7f\u7528\u5bc6\u7801\u91cd\u65b0\u6b63\u5f0f\u767b\u5f55\uff0c\u624d\u80fd\u4fee\u6539\u5bc6\u7801\u3002
 userSettings.email=\u7535\u5b50\u90ae\u4ef6
 userSettings.fullname=\u5168\u540d
 userSettings.locale=\u672c\u5730\u5316\u8bbe\u7f6e
-userSettings.name=\u5168\u540d
-userSettings.needPasswordTwice=\u5bc6\u7801\u548c\u786e\u8ba4\u5bc6\u7801\u90fd\u5fc5\u987b\u8f93\u5165\u3002
 userSettings.password=\u5bc6\u7801
 userSettings.passwordConfirm=\u5bc6\u7801\uff08\u786e\u8ba4\uff09
-userSettings.passwordResetError=\u5bc6\u7801\u91cd\u7f6e\u6ca1\u6709\u6210\u529f\u3002\u4e24\u4e2a\u5bc6\u7801\u6846\u8f93\u5165\u4e0d\u4e00\u81f4\uff1f
-userSettings.save=\u4fdd\u5b58
-userSettings.saved=\u7528\u6237\u8bbe\u7f6e\u4fdd\u5b58\u6210\u529f\u3002
 userSettings.timeZone=\u65f6\u533a
-userSettings.timezone=Timezone(\u65f6\u533a)
-userSettings.userSettings=\u7528\u6237\u8bbe\u7f6e
 userSettings.username=\u7528\u6237\u540d
-weblogEdit.actionCol=\u52a8\u4f5c
 weblogEdit.allowComments=\u5141\u8bb8\u7559\u8a00
-weblogEdit.autoformat=\u81ea\u52a8\u683c\u5f0f\u5316
-weblogEdit.calendarTitle=\u65e5\u5fd7\u5f52\u6863
-weblogEdit.cancelSpelling=\u53d6\u6d88\u62fc\u5199\u68c0\u67e5
 weblogEdit.category=\u5206\u7c7b
 weblogEdit.changesSaved=\u4fee\u6539\u5df2\u88ab\u4fdd\u5b58
-weblogEdit.check=\u62fc\u5199\u68c0\u67e5
 weblogEdit.comment=\u7559\u8a00
 # additions 20040606
-weblogEdit.commentCount=\u7559\u8a00\u6570
 weblogEdit.commentDays=\u5728
-weblogEdit.commentDelete=\u5220\u9664
-weblogEdit.commentSettings=\u8bc4\u8bba\u8bbe\u7f6e
-weblogEdit.commentSpam=\u5783\u573e
-weblogEdit.commenterEmail=E-Mail
-weblogEdit.commenterName=\u7559\u8a00\u8005
-weblogEdit.commenterUrl=URL
 weblogEdit.comments=\u8bc4\u8bba
 weblogEdit.content=\u5185\u5bb9
-weblogEdit.correctSpelling=\u91c7\u7eb3\u62fc\u5199\u68c0\u67e5\u7684\u7ea0\u6b63 \t
-weblogEdit.date=\u65e5\u671f
 weblogEdit.days1=1 \u5929
 weblogEdit.days10=10 \u5929
 weblogEdit.days2=2 \u5929
@@ -850,47 +487,25 @@ weblogEdit.days90=90 \u5929
 weblogEdit.deleteEntry=\u5220\u9664\u65e5\u5fd7
 weblogEdit.draft=\u8349\u7a3f
 weblogEdit.draftEntries=\u6700\u65b0\u7684\u8349\u7a3f
-weblogEdit.edit=\u7f16\u8f91
-weblogEdit.entryCol=\u65e5\u5fd7
 weblogEdit.entryRemoved=\u65e5\u5fd7\u5df2\u7ecf\u5220\u9664
-weblogEdit.entrySaved=\u65e5\u5fd7\u6210\u529f\u4fdd\u5b58
-weblogEdit.error.incompleteEntry=\u6bcf\u4e2a\u65e5\u5fd7\u5fc5\u987b\u6709\u4e00\u4e2a\u6807\u9898
-weblogEdit.formatEntryWith=\u7528\u4e0b\u5217\u63d2\u4ef6\u683c\u5f0f\u5316\u65e5\u5fd7\uff1a
 weblogEdit.hasComments=\u8bc4\u8bba [{0}]
-weblogEdit.hours=\u5c0f\u65f6
-weblogEdit.link=\u94fe\u63a5
 weblogEdit.mediaCastFailedFetchingInfo=\u4e0d\u80fd\u94fe\u63a5\u5230MediaCast\u670d\u52a1\u5668\u3002\u68c0\u67e5\u4e3b\u673aURL\u3002
 weblogEdit.mediaCastLacksContentTypeOrLength=\u4e0d\u80fd\u4f7f\u7528MediaCast URL\u3002\u670d\u52a1\u5668\u4e0d\u63d0\u4f9b\u8be5\u7c7b\u578b\u5185\u5bb9\u6216\u8005\u957f\u5ea6\u4e0d\u5bf9\u3002
 weblogEdit.mediaCastResponseError=MediaCast\u670d\u52a1\u5668\u8fd4\u56de\u4e00\u4e2a\u9519\u8bef\u3002\u60a8\u7684URL\u6b63\u786e\u5417\uff1f
 weblogEdit.mediaCastUrlMalformed=MediaCast URL\u683c\u5f0f\u4e0d\u6b63\u786e\u3002
-weblogEdit.minutes=\u5206\u949f
 weblogEdit.miscSettings=\u6742\u9879\u8bbe\u7f6e
-weblogEdit.noComments=\u5c1a\u672a\u6709\u7559\u8a00
-weblogEdit.noUpdateTime=\u672a\u66f4\u65b0
-weblogEdit.otherSettings=\u5176\u4ed6\u8bbe\u7f6e
-weblogEdit.pageTitle=\u7f16\u8f91\u65e5\u5fd7
 weblogEdit.pending=\u7b49\u5f85\u4e2d\u2026\u2026
 weblogEdit.pendingEntries=\u7b49\u5f85\u4e2d\u7684\u65e5\u5fd7
 weblogEdit.permaLink=\u6c38\u4e45\u94fe\u63a5
-weblogEdit.ping=Ping Weblogs.com
 weblogEdit.pinnedToMain=\u52a0\u5165\u5230\u4e3b\u9875\u7684"\u7279\u522b\u5173\u6ce8".
 weblogEdit.pluginsToApply=\u9700\u8981\u4f7f\u7528\u7684\u63d2\u4ef6
 weblogEdit.post=\u53d1\u5e03\u65e5\u5fd7
-weblogEdit.previewContent=\u9884\u89c8\uff1a\u5185\u5bb9
-weblogEdit.previewMode=\u9884\u89c8
-weblogEdit.previewSummary=\u9884\u89c8\uff1a\u6458\u8981
 weblogEdit.pubTime=\u53d1\u8868\u65f6\u95f4
 weblogEdit.published=\u5df2\u53d1\u8868
 weblogEdit.publishedEntries=\u6700\u65b0\u65e5\u5fd7
-weblogEdit.recentEntries=\u6700\u65b0\u65e5\u5fd7
-weblogEdit.remove=\u79fb\u9664
-weblogEdit.returnToEditMode=\u8fd4\u56de\u5230\u7f16\u8f91\u72b6\u6001
 weblogEdit.rightToLeft=\u4ece\u53f3\u5f80\u5de6\u8bfb\u7684\u6587\u672c
 weblogEdit.save=\u4fdd\u5b58\u4e3a\u8349\u7a3f
-weblogEdit.seconds=\u79d2
 weblogEdit.sendTrackback=\u53d1\u9001\u53cd\u5411\u8ddf\u8e2a
-weblogEdit.spellCheckContent=\u62fc\u5199\u68c0\u67e5\uff1a\u5185\u5bb9
-weblogEdit.spellMode=\u62fc\u5199\u68c0\u67e5
 weblogEdit.status=\u72b6\u6001
 weblogEdit.submitForReview=\u63d0\u4ea4\u5e76\u9884\u89c8
 weblogEdit.submittedForReview=\u63d0\u4ea4\u8be5\u65e5\u5fd7\u5e76\u9884\u89c8
@@ -901,92 +516,46 @@ weblogEdit.title=\u6807\u9898
 weblogEdit.title.editEntry=\u7f16\u8f91\u65e5\u5fd7
 weblogEdit.title.newEntry=\u65b0\u65e5\u5fd7
 weblogEdit.trackback=\u53cd\u5411\u8ddf\u8e2a
-weblogEdit.trackbackResults=<b>\u53cd\u5411\u8ddf\u8e2a\u56de\u5e94\uff1a(\u5982\u679c\u662f0\u8868\u793a\u6210\u529f)\uff1a</b><br /><br />{0}
-weblogEdit.trackbackStatusCodeBad=\u9519\u8bef\uff1a\u76ee\u6807\u65e5\u5fd7\u8fd4\u56deHTTP\u56de\u5e94\u4ee3\u7801 {0}
-weblogEdit.trackbackStatusCodeGood=\u76ee\u6807\u65e5\u5fd7\u8fd4\u56deHTTP\u56de\u5e94\u4ee3\u7801 {0}
 weblogEdit.trackbackUrl=\u53cd\u5411\u8ddf\u8e2aURL
-weblogEdit.trackbacks=\u53cd\u5411\u8ffd\u8e2a
 weblogEdit.unlimitedCommentDays=\u65e0\u65e5\u671f\u9650\u5236
 weblogEdit.unsaved=\u5c1a\u672a\u4fdd\u5b58
-weblogEdit.updateComments=\u66f4\u65b0\u7559\u8a00
 weblogEdit.updateTime=\u6700\u540e\u66f4\u65b0\uff1a
 weblogEntry.notFound=\u627e\u4e0d\u5230\u8bf7\u6c42\u7684\u65e5\u5fd7
 weblogEntry.pendingEntryContent=\u7528\u6237[{0}]\u5df2\u7ecf\u63d0\u4ea4\u4e86\u4e00\u4e2a\u65e5\u5fd7\uff0c\u5e76\u4e14\u671f\u5f85\u60a8\u7684\u6d4f\u89c8\u3002\u8bf7\u6d4f\u89c8\u540e\u53d1\u5e03\u6216\u8005\u4fdd\u5b58\u4e3a\u8349\u7a3f\u4ee5\u4f7f\u5176\u4ed6\u4eba\u53ef\u4ee5\u518d\u6b21\u4fee\u6539\u3002\u94fe\u63a5\u5230\u7f16\u8f91\u7b49\u5f85\u4e2d\u65e5\u5fd7\uff1a <{2}>
 weblogEntry.pendingEntrySubject=Roller\uff1a\u7f51\u5fd7"{0}"({1})\u4e2d\u7684\u65b0\u65e5\u5fd7\u671f\u5f85\u9884\u89c8\u3002
-weblogEntryExport.exportFiles={0}\ 
-weblogEntryExport.exportSuccess={0}\ 
 # ------------------------------------------------------------- Weblog Entry Export/Import
-weblogEntryExport.title=\u5bfc\u51fa\u65e5\u5fd7
-weblogEntryImport.XMLFile=XML\u6587\u4ef6\uff1a
-weblogEntryImport.button.import=\u5bfc\u5165
-weblogEntryImport.importFiles={0}
-weblogEntryImport.selectXML=\u9009\u62e9\u5305\u542b\u8981\u5bfc\u5165\u65e5\u5fd7\u7684XML\u6587\u4ef6
-weblogEntryImport.title=\u4eceAtom/RSS\u5bfc\u5165\u6761\u76ee
-weblogEntryQuery.button.export=\u5bfc\u51fa
 weblogEntryQuery.button.query=\u8fc7\u6ee4
 weblogEntryQuery.category=\u5206\u7c7b
 weblogEntryQuery.draft=\u8349\u7a3f
-weblogEntryQuery.edit=\u7f16\u8f91
-weblogEntryQuery.filterByCategory=\u6309\u5206\u7c7b\u8fc7\u6ee4
-weblogEntryQuery.filterByPublishTime=\u6309\u7167\u53d1\u5e03\u65f6\u95f4\u8fc7\u6ee4
 # additions 20040714
-weblogEntryQuery.filterByStatus=\u6309\u72b6\u6001\u8fc7\u6ee4
 weblogEntryQuery.label.allEntries=\u6240\u6709\u65e5\u5fd7
-weblogEntryQuery.label.any=\u4efb\u4f55
-weblogEntryQuery.label.atom=Atom
 weblogEntryQuery.label.category=\u5206\u7c7b
-weblogEntryQuery.label.day=\u65e5
 weblogEntryQuery.label.draftOnly=\u4ec5\u5305\u542b\u8349\u7a3f
 weblogEntryQuery.label.endDate=\u622a\u6b62\u65e5\u671f
-weblogEntryQuery.label.exportTo=\u5bfc\u51fa\u4e3a
-weblogEntryQuery.label.maxEntries=\u6700\u5927\u65e5\u5fd7\u6570
-weblogEntryQuery.label.month=\u6708
 weblogEntryQuery.label.pendingOnly=\u53ea\u5305\u542b\u7b49\u5f85\u4e2d\u7684
 weblogEntryQuery.label.pubTime=\u53d1\u5e03\u65f6\u95f4
 weblogEntryQuery.label.publishedOnly=\u4ec5\u5305\u542b\u53d1\u5e03\u7684
-weblogEntryQuery.label.rss=RSS
-weblogEntryQuery.label.separateEntries=\u6309\u7167\u4f55\u79cd\u65b9\u5f0f\u5206\u9694\u65e5\u5fd7
 weblogEntryQuery.label.sortby=\u6392\u5e8f
 weblogEntryQuery.label.startDate=\u8d77\u59cb\u65e5\u671f
 weblogEntryQuery.label.status=\u72b6\u6001
 weblogEntryQuery.label.updateTime=\u66f4\u65b0\u65f6\u95f4
-weblogEntryQuery.label.year=\u5e74
-weblogEntryQuery.limitResultsReturned=\u8fd4\u56de\u6761\u4ef6\u68c0\u7d22\u7ed3\u679c
-weblogEntryQuery.link=\u94fe\u63a5
 weblogEntryQuery.next=\u4e0b\u9875
 weblogEntryQuery.noneFound=\u8be5\u8fc7\u6ee4\u5668\u6761\u4ef6\u4e0b\u6ca1\u6709\u5339\u914d\u65e5\u5fd7\u3002
 weblogEntryQuery.nowShowing=\u663e\u793a\u65e5\u5fd7 {0}
 weblogEntryQuery.pending=\u7b49\u5f85\u4e2d\u2026\u2026
-weblogEntryQuery.posttitle=\u6807\u9898
 weblogEntryQuery.prev=\u524d\u9875
 weblogEntryQuery.pubTime=\u5df2\u7ecf\u53d1\u5e03
-weblogEntryQuery.queryResults=\u65e5\u5fd7
-weblogEntryQuery.section.dateRange=\u65e5\u671f\u8303\u56f4
-weblogEntryQuery.section.filterYourView=\u8fc7\u6ee4\u60a8\u7684\u65e5\u5fd7\uff1a
-weblogEntryQuery.section.format=\u8981\u4f7f\u7528\u7684\u683c\u5f0f
-weblogEntryQuery.section.searchResults=\u641c\u7d22\u7ed3\u679c
-weblogEntryQuery.section.select.entryAttributes=\u8981\u5305\u542b\u7684\u65e5\u5fd7
 weblogEntryQuery.sidebarDescription=\u901a\u8fc7\u5206\u7c7b\u3001\u65e5\u671f\u548c\uff08\u6216\u8005\uff09\u72b6\u6001\u8fc7\u6ee4\u65e5\u5fd7\u3002
 weblogEntryQuery.sidebarTitle=\u65e5\u5fd7\u8fc7\u6ee4\u5668
-weblogEntryQuery.status=\u72b6\u6001
 weblogEntryQuery.subtitle=\u67e5\u627e\u3001\u7f16\u8f91\u7f51\u5fd7 <span>{0}</span> \u4e2d\u7684\u65e5\u5fd7
 weblogEntryQuery.tip=\u60a8\u53ef\u4ee5\u901a\u8fc7\u9009\u62e9\u4e0b\u9762\u5217\u8868\u4e2d\u7684\u65e5\u5fd7\u6765\u7f16\u8f91\u6216\u8005\u4f7f\u7528\u65e5\u5fd7\u8fc7\u6ee4\u9762\u677f\u6765\u67e5\u627e\u4e00\u4e2a\u7279\u5b9a\u7684\u5206\u7c7b\u3001\u65e5\u671f\u8303\u56f4\u6216\u8005\u72b6\u6001\u3002
 weblogEntryQuery.title=\u7f16\u8f91\u65e5\u5fd7
 weblogEntryQuery.updateTime=\u6700\u540e\u66f4\u65b0
 weblogEntryQuery.view=\u6d4f\u89c8
-weblogEntryQuery.weblogEntries=\u65e5\u5fd7
 weblogEntryRemove.areYouSure=\u60a8\u786e\u4fe1\u79fb\u9664\u6b64\u65e5\u5fd7\u5417\uff1f
 weblogEntryRemove.entryId=\u65e5\u5fd7ID
 weblogEntryRemove.entryTitle=\u65e5\u5fd7\u9898\u540d
-weblogEntryRemove.no=\u5426
 weblogEntryRemove.removeWeblogEntry=\u79fb\u9664\u65e5\u5fd7
-weblogEntryRemove.yes=\u662f
-weblogMain.archives=\u5f52\u6863
-weblogMain.language=\u8bed\u8a00
-weblogMain.links=\u94fe\u63a5
-weblogMain.navigation=\u5bfc\u822a
-weblogMain.poweredBy=\u7a0b\u5e8f\u652f\u6301
-weblogMain.search=\u641c\u7d22
 websiteRemove.subtitle=\u7f51\u5fd7\u4e00\u65e6\u5220\u9664\u662f<b>\u4e0d\u53ef\u6062\u590d\u7684</b>
 websiteRemove.title=\u786e\u8ba4\u7f51\u5fd7\u5220\u9664
 websiteRemove.websiteId=\u7f51\u5fd7ID
@@ -996,30 +565,22 @@ websiteSettings.acceptedBlacklist=\u63a5
 websiteSettings.active=\u6b64\u7f51\u5fd7\u662f\u6d3b\u8dc3\u7684\uff08\u5c06\u88ab\u63d0\u4ea4\u5230\u4ea4\u6d41\u5217\u8868\u4e2d\uff09
 websiteSettings.allowComments=\u5141\u8bb8\u5728\u4f60\u7684\u65e5\u5fd7\u4e2d\u5f00\u542f\u8bc4\u8bba\u529f\u80fd\uff1f
 websiteSettings.applyCommentDefaults=\u5e94\u7528\u8bc4\u8bba\u8bbe\u7f6e\u5230\u6240\u6709\u7684\u65e5\u5fd7\uff08\u53ea\u6709\u6b64\u6b21\uff09\uff1f
-websiteSettings.autoformat=\u5bf9\u65b0\u65e5\u5fd7\u81ea\u52a8\u683c\u5f0f\u5316\uff1f
 websiteSettings.bloggerApi=Blogger API
 websiteSettings.bloggerApiCategory=\u901a\u8fc7Blogger API\u53d1\u8868\u65e5\u5fd7\u7684\u9ed8\u8ba4\u5206\u7c7b
-websiteSettings.button.rebuildIndex=\u91cd\u5efa\u641c\u7d22\u7d22\u5f15
 websiteSettings.button.remove=\u5220\u9664\u7f51\u5fd7
 websiteSettings.button.update=\u66f4\u65b0\u7f51\u5fd7\u8bbe\u7f6e
-websiteSettings.categories=\u5206\u7c7b
 websiteSettings.commentSettings=\u8bc4\u8bba
 websiteSettings.commentsOffForInactiveWeblog=\u5173\u95ed\u5bf9\u6d3b\u8dc3\u7f51\u5fd7\u7684\u8bc4\u8bba
 websiteSettings.defaultAllowComments=\u9ed8\u8ba4\u60c5\u51b5\u4e0b\uff0c\u5141\u8bb8\u5bf9\u65b0\u65e5\u5fd7\u8bc4\u8bba
-websiteSettings.defaultCategory=\u65e5\u5fd7\u7684\u9ed8\u8ba4\u6839\u5206\u7c7b.
 websiteSettings.defaultCommentDays=\u5141\u8bb8\u5bf9\u65e5\u5fd7\u8fdb\u884c\u8bc4\u8bba\u7684\u9ed8\u8ba4\u65f6\u95f4
 websiteSettings.defaultCommentSettings=\u9ed8\u8ba4\u8bc4\u8bba\u8bbe\u7f6e
 websiteSettings.editor=\u5e0c\u671b\u4f7f\u7528\u7684\u65e5\u5fd7\u7f16\u8f91\u5668
-websiteSettings.editorSettings=\u7f16\u8f91\u5668
 websiteSettings.emailAddress=\u7f51\u5fd7\u6240\u6709\u4eba\u7535\u5b50\u90ae\u4ef6
 websiteSettings.emailComments=\u5bf9\u8bc4\u8bba\u53d1\u9001\u7535\u5b50\u90ae\u4ef6\u901a\u77e5?
-websiteSettings.emailFromAddress=\u663e\u793a\u5728\u8bc4\u8bba\u901a\u77e5\u7535\u5b50\u90ae\u4ef6\u4e2d\u7684\u9ed8\u8ba4\u201c\u53d1\u9001\u8005\u201d\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740
 websiteSettings.enableBloggerApi=\u4e3a\u60a8\u7684\u7f51\u5fd7\u542f\u7528Blogger API\uff1f\uff08\u53ef\u4ee5\u4f7f\u7528\u7f51\u5fd7\u7f16\u5199\u5de5\u5177\u6765\u64b0\u5199\u65e5\u5fd7\uff09
 websiteSettings.entryDisplayCount=\u7f51\u5fd7\u663e\u793a\u65e5\u5fd7\u6570\u91cf
 websiteSettings.error.processingBlacklist=\u9519\u8bef\u5904\u7406\u9ed1\u540d\u5355\uff1a [{0}]
-websiteSettings.error.sameTemplate=\u62d2\u7edd\u66f4\u6539\uff1a\u4e0d\u80fd\u8bbe\u7f6e\u9ed8\u8ba4\u9875\u9762\u6a21\u677f\u548c\u65e5\u671f\u6a21\u677f\u5230\u540c\u4e00\u4e2a\u6a21\u677f\u4e2d\u3002
 websiteSettings.formatting=\u683c\u5f0f\u5316
-websiteSettings.homePage=\u8bbe\u7f6e\u4f5c\u4e3a\u4e3b\u9875\u7684\u9875\u9762
 websiteSettings.ignoreUrls=\u5ffd\u7565\u5305\u542b\u6709\u4e0b\u5217\u4efb\u4f55\u8bcd\u8bed\u7684\u5f15\u7528\uff08\u7528\u9017\u53f7\u5206\u9694\uff09
 websiteSettings.moderateComments=\u9002\u5ea6\u8bc4\u8bba
 websiteSettings.removeWebsite=\u60a8\u662f\u8fd9\u4e2a\u7f51\u5fd7\u7684\u6700\u540e\u4e00\u4f4d\u7ba1\u7406\u8005\uff0c\u60a8\u771f\u7684\u8981\u5220\u9664\u5417\uff1f
@@ -1028,25 +589,19 @@ websiteSettings.removeWebsiteWarning=\u8
 websiteSettings.savedChanges=\u7f51\u5fd7\u8bbe\u7f6e\u5df2\u7ecf\u4fdd\u5b58
 websiteSettings.spamPrevention=\u963b\u6b62\u5783\u573e\u8bc4\u8bba
 websiteSettings.subtitle=\u7ba1\u7406\u7f51\u5fd7 [{0}] \u8bbe\u7f6e
-websiteSettings.templateSettings=\u6a21\u677f\u8bbe\u7f6e
 websiteSettings.tip=\u66f4\u6539\u7f51\u5fd7\u6807\u9898\u3001\u63cf\u8ff0\u3001\u8bc4\u8bba\u548c\u5783\u573e\u8bc4\u8bba\u8fc7\u6ee4\u7b49\u8bbe\u7f6e\u3002
 websiteSettings.title=\u7f51\u5fd7\u8bbe\u7f6e
 websiteSettings.websiteDescription=\u63cf\u8ff0
 websiteSettings.websiteTitle=\u6807\u9898
 welcome.accountCreated=\u606d\u559c\uff0c\u60a8\u7684\u7528\u6237\u5e10\u53f7\u5df2\u7ecf\u5efa\u7acb\u3002
-welcome.addressIs=\u60a8\u7684\u65b0\u7f51\u5fd7\u7684\u5730\u5740\u662f
 welcome.clickHere=\u70b9\u51fb\u8fd9\u91cc
-welcome.rssAddressIs=\u60a8\u7684\u4e3b\u65b0\u95fb\u79cd\u5b50\u5730\u5740\u662f\uff1a
 welcome.title=\u6b22\u8fce\u6765\u5230 Roller\u4e16\u754c
 welcome.toLoginAndPost=\u767b\u5f55\u5e76\u64b0\u5199\u60a8\u7684\u7b2c\u4e00\u6761\u65e5\u5fd7\u5427!
-yourProfile.button.save=\u4fdd\u5b58
 yourProfile.description=\u66f4\u6539\u60a8\u7684\u5bc6\u7801\u3001\u9ed8\u8ba4\u672c\u5730\u5316\u8bbe\u7f6e\u3001\u65f6\u533a\u548c\u5176\u4ed6\u8bbe\u7f6e\u3002
 yourProfile.saved=\u4e2a\u4eba\u8d44\u6599\u7684\u66f4\u6539\u5df2\u7ecf\u88ab\u4fdd\u5b58\u3002
 yourProfile.tip.userName=\u60a8\u4e0d\u80fd\u591f\u66f4\u6539\u60a8\u7684\u7528\u6237\u540d
 yourProfile.title=\u60a8\u7684\u4e2a\u4eba\u8d44\u6599
-yourProfile.unsaved=\u66f4\u6539\u5c1a\u672a\u4fdd\u5b58\uff0c\u8bf7\u70b9\u51fb\u4fdd\u5b58\u6309\u94ae\u6765\u4fdd\u5b58\u3002
 yourWebsites.accept=\u63a5\u53d7
-yourWebsites.accepted=\u60a8\u73b0\u5728\u5df2\u7ecf\u662f\u7f51\u5fd7 [{0}] \u7684\u6210\u5458\u4e86
 yourWebsites.actions=\u52a8\u4f5c
 yourWebsites.confirmResignation=\u60a8\u786e\u5b9a\u8981\u4ece\u8fd9\u4e2a\u7f51\u5fd7\u8f9e\u804c\u5417
 yourWebsites.createOne=\u5efa\u7acb\u4e00\u4e2a\u5417\uff1f
@@ -1054,34 +609,23 @@ yourWebsites.createWeblog=\u5efa\u7acb\u
 yourWebsites.createWeblog.desc=\u60a8\u662f\u4e0d\u662f\u8fd8\u6709\u66f4\u591a\u8981\u8868\u8fbe\u7684\uff1f\u4e5f\u8bb8\u60a8\u9700\u8981\u5efa\u7acb\u53e6\u4e00\u4e2a\u7f51\u5fd7\u3002
 yourWebsites.decline=\u62d2\u7edd
 yourWebsites.declined=\u60a8\u5df2\u7ecf\u62d2\u7edd\u4e86\u7f51\u5fd7 [{0}] \u7684\u9080\u8bf7
-yourWebsites.description=\u63cf\u8ff0
 yourWebsites.editEntries=\u65e5\u5fd7
 yourWebsites.editProfile=\u7f16\u8f91\u7528\u6237\u8d44\u6599
 yourWebsites.editProfile.desc=\u66f4\u6539\u5bc6\u7801\uff0c\u8054\u7cfb\u4fe1\u606f\uff0c\u9009\u62e9\u8bed\u8a00\u7b49\u7b49\u3002
-yourWebsites.existingWebsites=\u60a8\u7684\u7f51\u5fd7
 yourWebsites.globalAdmin=\u670d\u52a1\u5668\u7ba1\u7406\u5458
 yourWebsites.globalAdmin.desc=\u505a\u7f51\u7ad9\u8303\u56f4\u7684\u66f4\u6539\u3002
 yourWebsites.invitations=\u7f51\u5fd7\u9080\u8bf7
 yourWebsites.invitationsPrompt=\u60a8\u6709\u4e00\u4e2a\u6216\u8005\u66f4\u591a\u7684\u9080\u8bf7\u63a5\u53d7\u6216\u8005\u62d2\u7edd\uff1a
-yourWebsites.invited=\u60a8\u5df2\u7ecf\u88ab\u9080\u8bf7\u52a0\u5165\u7f51\u5fd7
 yourWebsites.manage=\u8bbe\u7f6e
 yourWebsites.manageComments=\u8bc4\u8bba
 yourWebsites.newEntry=\u65b0\u65e5\u5fd7
-yourWebsites.notAllowed=\u7981\u6b62
 yourWebsites.permission=\u8bb8\u53ef\u534f\u8bae
 yourWebsites.planetAdmin=\u884c\u661f\u7ba1\u7406\u5458
 yourWebsites.planetAdmin.desc=\u7ba1\u7406\u884c\u661f\u805a\u5408\u5668\u3002\u6dfb\u52a0\u79cd\u5b50\uff0c\u7ec4\u7ec7\u7fa4\u7ec4\uff0c\u4fee\u6539\u914d\u7f6e\u7b49\u7b49\u3002
 yourWebsites.prompt.hasBlog=\u9009\u62e9\u4e00\u4e2a\u7f51\u5fd7\u7f16\u8f91\u3001\u7ba1\u7406\u6216\u8005\u8bbe\u7f6e\u3002
 yourWebsites.prompt.noBlog=\u60a8\u5df2\u7ecf\u83b7\u5f97\u4e86\u4e00\u4e2a\u7528\u6237\u8d26\u6237\uff0c\u4f46\u662f\u6ca1\u6709\u7f51\u5fd7\uff0c\u60a8\u60f3\u4e0d\u60f3
-yourWebsites.prompt.noBlogNoCreate=\u60a8\u5df2\u7ecf\u83b7\u5f97\u4e86\u4e00\u4e2a\u7528\u6237\u8d26\u6237\uff0c\u4f46\u662f\u6ca1\u6709\u7f51\u5fd7\uff0c\u8bf7\u6c42\u7ba1\u7406\u5458\u4e3a\u60a8\u5efa\u7acb\u4e00\u4e2a\u3002
 yourWebsites.resign=\u8f9e\u804c
 yourWebsites.resigned=\u60a8\u5df2\u7ecf\u4ece\u7f51\u5fd7 [{0}] \u8f9e\u804c\u4e86\u3002
-yourWebsites.select=\u9009\u62e9
-yourWebsites.selected=\u60a8\u6b63\u5728\u7f51\u5fd7 [{0}] \u7b14\u8015\u4e0d\u8f8d
-yourWebsites.subtitle=\u6b22\u8fce\u6765\u5230Roller
-yourWebsites.tableDescription=\u63cf\u8ff0
-yourWebsites.tableTitle=\u6807\u9898
 yourWebsites.title=\u4e3b\u83dc\u5355
 yourWebsites.weblog=\u94fe\u63a5
-yourWebsites.weblogs.title=\u60a8\u7684\u7f51\u5fd7
 yourWebsites.youAreInvited=\u60a8\u88ab\u9080\u8bf7\u53c2\u52a0\u7f51\u5fd7 [{0}] \uff0d

Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties?rev=1608022&r1=1608021&r2=1608022&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties Sat Jul  5 14:37:13 2014
@@ -1,5 +1,5 @@
 # Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  The ASF licenses this file to You
+# contributor license agreements.  The ASF licenses this file to You
 # under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -13,13 +13,22 @@
 # limitations under the License.  For additional information regarding
 # copyright in this work, please see the NOTICE file in the top level
 # directory of this distribution.
-
+#
+# To find unused strings, see <roller-trunk>/docs/examples/i18n/compare-vs-default-file.py
+# (Usage instructions given at the top of that script)
 #
 # Created by Shawn Huang (shawnjohn at mail2000.com.tw)
 #
 
 generic.all=\u5168\u90e8
-generic.none=None
+generic.cancel=\u53d6\u6d88
+generic.yes=\u662f
+generic.no=\u5426
+generic.description=\u5167\u5bb9
+generic.save=\u5b58\u6a94
+generic.edit=\u7de8\u8f2f
+generic.delete=\u522a\u9664
+
 
 #------------------------------------------------------------ Struts Validator
 
@@ -698,5 +707,3 @@ email.comment.wrote=\u64b0\u5beb
 email.comment.anonymous=\u533f\u540d\u8005\u5beb\u4e86
 email.comment.respond=\u56de\u61c9\u6b64\u8ff4\u97ff\u65bc
 email.comment.title=\u8ff4\u97ff
-
-

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml?rev=1608022&r1=1608021&r2=1608022&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml Sat Jul  5 14:37:13 2014
@@ -1,6 +1,6 @@
 <!-- 
 Defines the Roller Global Admin UI menu and roles allowed to use each menu. 
-Each menu or menu item is governed by four attrbibutes:
+Each menu or menu item is governed by four attributes
 
 See comments in editor-menu.xml for info about attributes.
 -->

Modified: roller/trunk/app/src/main/webapp/roller-ui/errors/403.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/errors/403.jsp?rev=1608022&r1=1608021&r2=1608022&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/roller-ui/errors/403.jsp (original)
+++ roller/trunk/app/src/main/webapp/roller-ui/errors/403.jsp Sat Jul  5 14:37:13 2014
@@ -1,6 +1,6 @@
 <%--
   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  The ASF licenses this file to You
+  contributor license agreements.  The ASF licenses this file to You
   under the Apache License, Version 2.0 (the "License"); you may not
   use this file except in compliance with the License.
   You may obtain a copy of the License at

Modified: roller/trunk/app/src/main/webapp/roller-ui/logout-redirect.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/logout-redirect.jsp?rev=1608022&r1=1608021&r2=1608022&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/roller-ui/logout-redirect.jsp (original)
+++ roller/trunk/app/src/main/webapp/roller-ui/logout-redirect.jsp Sat Jul  5 14:37:13 2014
@@ -1,6 +1,6 @@
 <%--
   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  The ASF licenses this file to You
+  contributor license agreements.  The ASF licenses this file to You
   under the Apache License, Version 2.0 (the "License"); you may not
   use this file except in compliance with the License.
   You may obtain a copy of the License at
@@ -33,4 +33,3 @@ response.addCookie(terminate);
 
 response.sendRedirect(request.getContextPath()+"/"); 
 %>
-

Added: roller/trunk/docs/examples/i18n/check-default-resource-file.py
URL: http://svn.apache.org/viewvc/roller/trunk/docs/examples/i18n/check-default-resource-file.py?rev=1608022&view=auto
==============================================================================
--- roller/trunk/docs/examples/i18n/check-default-resource-file.py (added)
+++ roller/trunk/docs/examples/i18n/check-default-resource-file.py Sat Jul  5 14:37:13 2014
@@ -0,0 +1,52 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+#
+# This script checks the default (English) resource file for unused strings that can be removed.
+# 
+# To use: 
+# 1.) run from a command prompt: python check-default-resource-file.py | grep UNUSED > results.txt
+# 2.) results.txt will list unused strings that can be removed.
+#     Caveat: due to substring searching, if "xxx.yyy" has 0 usages but "xxx.yyy.zzz" 
+#     has one or more, "xxx.yyy" will not be marked as unused, so some unused strings may
+#     end up remaining in the resource file.
+#
+#!/usr/bin/python
+
+import re
+import os
+from contextlib import closing
+import sys
+
+def prop_names():
+    rfile = open("../../../app/src/main/resources/ApplicationResources.properties")
+    prop_pattern = re.compile('^([a-zA-Z]+(\.[a-zA-Z]+)*)=.*')
+    for line in rfile:
+        m = prop_pattern.match(line)
+        if (m):
+            propname = m.group(1)
+            yield propname
+
+
+for propname in prop_names():
+    cmd = 'find ../../../app -type f \! -name "ApplicationResources*" | xargs grep -n %s /dev/null | wc -l' % propname
+    with closing(os.popen(cmd,'r')) as pipe:
+        occurrences = int(pipe.readline())
+    if (occurrences == 0):
+        print "Property %s is UNUSED" % propname
+    else:
+        print "Property %s occurs %d times" % (propname, occurrences)
+    sys.stdout.flush()
+

Added: roller/trunk/docs/examples/i18n/compare-vs-default-file.py
URL: http://svn.apache.org/viewvc/roller/trunk/docs/examples/i18n/compare-vs-default-file.py?rev=1608022&view=auto
==============================================================================
--- roller/trunk/docs/examples/i18n/compare-vs-default-file.py (added)
+++ roller/trunk/docs/examples/i18n/compare-vs-default-file.py Sat Jul  5 14:37:13 2014
@@ -0,0 +1,63 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+#
+# This script compares a given resource file against the default (English) file,
+# signalling unused strings that can be removed from the given file.
+#
+# To use: 
+# 1.) first run docs/examples/i18n/check-default-resource-file.py to remove 
+#     unused strings from default (English) resource file -- see that .py file
+#     for instructions.
+# 2.) Edit the open() command below for the language resource file you wish to check. 
+#     then run from a command prompt: python compare-vs-default-file.py | grep UNUSED > results.txt
+# 3.) results.txt will list unused strings that can be removed.
+#     Caveat: due to substring searching, if "xxx.yyy" has 0 usages but "xxx.yyy.zzz" 
+#     has one or more, "xxx.yyy" will not be marked as unused, so some unused strings may
+#     end up remaining in the resource file.
+#
+#!/usr/bin/python
+
+import re
+import os
+from contextlib import closing
+import sys
+
+def prop_names():
+    rfile = open("../../../app/src/main/resources/ApplicationResources_zh_CN.properties")
+    prop_pattern = re.compile('^([a-zA-Z]+(\.[a-zA-Z]+)*)=.*')
+    for line in rfile:
+        m = prop_pattern.match(line)
+        if (m):
+            propname = m.group(1)
+            yield propname
+
+
+for propname in prop_names():
+    cmd = 'find ../../../app -type f -name "ApplicationResources.properties" | xargs grep -n %s /dev/null | wc -l' % propname
+    with closing(os.popen(cmd,'r')) as pipe:
+        occurrences = int(pipe.readline())
+    if (occurrences == 0):
+        print "Property %s is UNUSED" % propname
+    else:
+        print "Property %s occurs %d times" % (propname, occurrences)
+    sys.stdout.flush()
+
+
+
+
+
+        
+