Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java (original) +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java Sun Apr 20 13:38:51 2014 @@ -19,11 +19,10 @@ package org.apache.roller.weblogger.webservices.atomprotocol; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.MediaFileManager; import org.apache.roller.weblogger.business.Weblogger; @@ -55,7 +54,7 @@ public class RollerAtomService extends A */ public RollerAtomService(User user, String atomURL) throws WebloggerException, AtomException { Weblogger roller = WebloggerFactory.getWeblogger(); - List perms = null; + List<WeblogPermission> perms; if (!WebloggerRuntimeConfig.getBooleanProperty("webservices.enableAtomPub")) { throw new AtomException("AtomPub not enabled for this Roller installation"); @@ -66,17 +65,16 @@ public class RollerAtomService extends A } catch (WebloggerException re) { throw new AtomException("Getting user's weblogs", re); } - List uploadAccepts = new ArrayList(); + List uploadAccepts; try { uploadAccepts = getAcceptedContentTypeRange(); } catch (WebloggerException re) { throw new AtomException("Getting site's accept range", re); } if (perms != null) { - for (Iterator iter = perms.iterator(); iter.hasNext();) { - WeblogPermission perm = (WeblogPermission) iter.next(); + for (WeblogPermission perm : perms) { Weblog weblog = perm.getWeblog(); - Workspace workspace = null; + Workspace workspace; try { // Create workspace to represent weblog @@ -93,11 +91,10 @@ public class RollerAtomService extends A Categories cats = new Categories(); cats.setFixed(true); cats.setScheme(getWeblogCategoryScheme(weblog)); - List rollerCats = roller.getWeblogEntryManager().getWeblogCategories(weblog, false); - for (Iterator it = rollerCats.iterator(); it.hasNext();) { - WeblogCategory rollerCat = (WeblogCategory) it.next(); + List<WeblogCategory> rollerCats = roller.getWeblogEntryManager().getWeblogCategories(weblog); + for (WeblogCategory rollerCat : rollerCats) { Category cat = new Category(); - cat.setTerm(rollerCat.getPath().substring(1)); + cat.setTerm(rollerCat.getName()); cat.setLabel(rollerCat.getName()); cats.addCategory(cat); }
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java (original) +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java Sun Apr 20 13:38:51 2014 @@ -23,7 +23,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.URLStrategy; import org.apache.roller.weblogger.business.WebloggerFactory; Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java (original) +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java Sun Apr 20 13:38:51 2014 @@ -54,7 +54,7 @@ import org.apache.roller.weblogger.util. */ public class TagDataServlet extends HttpServlet { - private final int MAX = WebloggerConfig.getIntProperty("services.tagdata.max", 30); + private static final int MAX = WebloggerConfig.getIntProperty("services.tagdata.max", 30); protected void doPost( @@ -69,9 +69,9 @@ public class TagDataServlet extends Http throws ServletException, IOException { String[] pathInfo = new String[0]; - boolean siteWide = true; - String handle = null; - String prefix = null; + boolean siteWide; + String handle; + String prefix; String format = "json"; int page = 0; @@ -100,8 +100,8 @@ public class TagDataServlet extends Http } catch (Exception ignored) {} Weblogger roller = WebloggerFactory.getWeblogger(); - List tags = null; - Weblog weblog = null; + List<TagStat> tags; + Weblog weblog; try { WeblogManager wmgr = roller.getWeblogManager(); WeblogEntryManager emgr = roller.getWeblogEntryManager(); @@ -149,16 +149,13 @@ public class TagDataServlet extends Http pw.println(" xmlns:atom=\"http://www.w3.org/2005/Atom\"";); pw.println(" xmlns:tagdata=\"http://roller.apache.org/ns/tagdata\";>"); int count = 0; - for (Iterator it = tags.iterator(); it.hasNext();) { - TagStat stat = (TagStat) it.next(); + for (TagStat stat : tags) { String term = stat.getName(); - String viewURI = urlstrat.getWeblogCollectionURL(weblog, - null, // locale - null, // category - null, // date string - Collections.singletonList(stat.getName()), - 0, // page - true); // absolute + // gWCURL fields: weblog, locale, category, dateString, tags, pageNum, absolute + String viewURI = urlstrat.getWeblogCollectionURL(weblog, + null, null, null, + Collections.singletonList(stat.getName()), + 0, true); int frequency = stat.getCount(); pw.print("<atom:category term=\"" + term + "\" tagdata:frequency=\"" + frequency + "\" "); pw.println("tagdata:href=\"" + viewURI + "\" />"); @@ -180,7 +177,6 @@ public class TagDataServlet extends Http response.flushBuffer(); } else { response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Malformed URL"); - return; } } } Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java (original) +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java Sun Apr 20 13:38:51 2014 @@ -19,27 +19,25 @@ package org.apache.roller.weblogger.webservices.xmlrpc; import java.sql.Timestamp; -import java.util.ArrayList; import java.util.Date; import java.util.Hashtable; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.StringTokenizer; import java.util.Vector; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.WebloggerException; -import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; import org.apache.roller.weblogger.business.Weblogger; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.business.WeblogEntryManager; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.WeblogEntry; +import org.apache.roller.weblogger.pojos.WeblogEntrySearchCriteria; import org.apache.roller.weblogger.pojos.WeblogTemplate; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.util.Utilities; @@ -73,7 +71,7 @@ public class BloggerAPIHandler extends B * @param password Password for said username * @param publish Ignored * @throws XmlRpcException - * @return + * @return true if post deleted, false if entry not found */ public boolean deletePost(String appkey, String postid, String userid, String password, boolean publish) throws Exception { @@ -121,7 +119,7 @@ public class BloggerAPIHandler extends B * @param blogid Unique identifier of the blog the post will be added to * @param userid Login for a Blogger user who has permission to post to the blog * @param password Password for said username - * @param template The text for the new template (usually mostly HTML). + * @param templateData The text for the new template (usually mostly HTML). * @param templateType Determines which of the blog's templates is to be set. * @return * @throws XmlRpcException @@ -273,17 +271,12 @@ public class BloggerAPIHandler extends B Vector result = new Vector(); if (validateUser(userid, password)) { try { - String contextUrl = WebloggerRuntimeConfig.getAbsoluteContextURL(); - UserManager umgr = WebloggerFactory.getWeblogger().getUserManager(); User user = umgr.getUserByUserName(userid); // get list of user's enabled websites - List websites = WebloggerFactory.getWeblogger().getWeblogManager().getUserWeblogs(user, true); - Iterator iter = websites.iterator(); - while (iter.hasNext()) { - Weblog website = (Weblog)iter.next(); - + List<Weblog> websites = WebloggerFactory.getWeblogger().getWeblogManager().getUserWeblogs(user, true); + for (Weblog website : websites) { // only include weblog's that have client API support enabled if (Boolean.TRUE.equals(website.getEnableBloggerApi())) { Hashtable blog = new Hashtable(3); @@ -459,28 +452,21 @@ public class BloggerAPIHandler extends B mLogger.debug(" UserId: " + userid); mLogger.debug(" Number: " + numposts); - Weblog website = validate(blogid, userid,password); + Weblog weblog = validate(blogid, userid,password); try { Vector results = new Vector(); Weblogger roller = WebloggerFactory.getWeblogger(); WeblogEntryManager weblogMgr = roller.getWeblogEntryManager(); - if (website != null) { - Map entries = weblogMgr.getWeblogEntryObjectMap( - website, // website - null, // startDate - new Date(), // endDate - null, // catName - null, // tags - null, null, 0, -1); - - Iterator iter = entries.values().iterator(); - while (iter.hasNext()) { - ArrayList list = (ArrayList) iter.next(); - Iterator i = list.iterator(); - while (i.hasNext()) { - WeblogEntry entry = (WeblogEntry) i.next(); + if (weblog != null) { + WeblogEntrySearchCriteria wesc = new WeblogEntrySearchCriteria(); + wesc.setWeblog(weblog); + wesc.setEndDate(new Date()); + Map<Date, List<WeblogEntry>> entries = weblogMgr.getWeblogEntryObjectMap(wesc); + + for (List<WeblogEntry> weList : entries.values()) { + for (WeblogEntry entry : weList) { Hashtable result = new Hashtable(); if (entry.getPubTime() != null) { result.put("dateCreated", entry.getPubTime()); Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original) +++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Sun Apr 20 13:38:51 2014 @@ -22,13 +22,13 @@ import java.io.ByteArrayInputStream; import java.sql.Timestamp; import java.util.Date; import java.util.Hashtable; -import java.util.Iterator; import java.util.List; import java.util.Vector; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.roller.util.RollerConstants; import org.apache.roller.weblogger.business.MediaFileManager; import org.apache.roller.weblogger.business.URLStrategy; import org.apache.roller.weblogger.business.WeblogEntryManager; @@ -41,6 +41,7 @@ import org.apache.roller.weblogger.pojos import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.pojos.WeblogCategory; import org.apache.roller.weblogger.pojos.WeblogEntry; +import org.apache.roller.weblogger.pojos.WeblogEntrySearchCriteria; import org.apache.roller.weblogger.util.RollerMessages; import org.apache.roller.weblogger.util.Utilities; import org.apache.xmlrpc.XmlRpcException; @@ -85,10 +86,9 @@ public class MetaWeblogAPIHandler extend try { Hashtable result = new Hashtable(); WeblogEntryManager weblogMgr = roller.getWeblogEntryManager(); - List cats = weblogMgr.getWeblogCategories(website, false); - for (Iterator wbcItr = cats.iterator(); wbcItr.hasNext();) { - WeblogCategory category = (WeblogCategory) wbcItr.next(); - result.put(category.getPath(), + List<WeblogCategory> cats = weblogMgr.getWeblogCategories(website); + for (WeblogCategory category : cats) { + result.put(category.getName(), createCategoryStruct(category, userid)); } return result; @@ -176,7 +176,7 @@ public class MetaWeblogAPIHandler extend if ( cat != null ) { // Use first category specified by request WeblogCategory cd = - weblogMgr.getWeblogCategoryByPath(entry.getWebsite(), cat); + weblogMgr.getWeblogCategoryByName(entry.getWebsite(), cat); entry.setCategory(cd); } @@ -189,7 +189,7 @@ public class MetaWeblogAPIHandler extend // TODO: Weblogger timestamps need better than 1 second accuracy // Until then, we can't allow more than one post per second - Thread.sleep(1000); + Thread.sleep(RollerConstants.SEC_IN_MS); return true; } catch (Exception e) { @@ -286,7 +286,7 @@ public class MetaWeblogAPIHandler extend mLogger.debug("cat to string - "+cats[0].toString()); for (int i=0; i<cats.length; i++) { Object cat = cats[i]; - rollerCat = weblogMgr.getWeblogCategoryByPath(website, (String)cat); + rollerCat = weblogMgr.getWeblogCategoryByName(website, (String)cat); if (rollerCat != null) { entry.setCategory(rollerCat); break; @@ -308,7 +308,7 @@ public class MetaWeblogAPIHandler extend // TODO: Weblogger timestamps need better than 1 second accuracy // Until then, we can't allow more than one post per second - Thread.sleep(1000); + Thread.sleep(RollerConstants.SEC_IN_MS); return entry.getId(); } catch (Exception e) { @@ -437,23 +437,13 @@ public class MetaWeblogAPIHandler extend Weblogger roller = WebloggerFactory.getWeblogger(); WeblogEntryManager weblogMgr = roller.getWeblogEntryManager(); if (website != null) { - List entries = weblogMgr.getWeblogEntries( - website, // website - null, - null, // startDate - null, // endDate - null, // catName - null, // tags - null, // status - null, // text - "updateTime", // sortby - null, - null, - 0, numposts); - - Iterator iter = entries.iterator(); - while (iter.hasNext()) { - WeblogEntry entry = (WeblogEntry)iter.next(); + WeblogEntrySearchCriteria wesc = new WeblogEntrySearchCriteria(); + wesc.setWeblog(website); + wesc.setSortBy(WeblogEntrySearchCriteria.SortBy.UPDATE_TIME); + wesc.setMaxResults(numposts); + List<WeblogEntry> entries = weblogMgr.getWeblogEntries(wesc); + + for (WeblogEntry entry : entries) { results.addElement(createPostStruct(entry, userid)); } } @@ -490,7 +480,7 @@ public class MetaWeblogAPIHandler extend struct.put("author", entry.getCreator().getEmailAddress()); Vector catArray = new Vector(); - catArray.addElement(entry.getCategory().getPath()); + catArray.addElement(entry.getCategory().getName()); struct.put("categories", catArray); return struct; @@ -500,18 +490,18 @@ public class MetaWeblogAPIHandler extend private Hashtable createCategoryStruct(WeblogCategory category, String userid) { Hashtable struct = new Hashtable(); - struct.put("title", category.getPath()); - struct.put("description", category.getPath()); + struct.put("title", category.getName()); + struct.put("description", category.getName()); Weblogger roller = WebloggerFactory.getWeblogger(); URLStrategy strategy = roller.getUrlStrategy(); - String catUrl = strategy.getWeblogCollectionURL(category.getWebsite(), - null, category.getPath(), null, null, 0, true); + String catUrl = strategy.getWeblogCollectionURL(category.getWeblog(), + null, category.getName(), null, null, 0, true); struct.put("htmlUrl", catUrl); - String rssUrl = strategy.getWeblogFeedURL(category.getWebsite(), - null, "entries", "rss", category.getPath(), null, null, false, true); + String rssUrl = strategy.getWeblogFeedURL(category.getWeblog(), + null, "entries", "rss", category.getName(), null, null, false, true); struct.put("rssUrl",rssUrl); return struct; Modified: roller/branches/rome2/app/src/main/resources/ApplicationResources.properties URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/ApplicationResources.properties?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/main/resources/ApplicationResources.properties (original) +++ roller/branches/rome2/app/src/main/resources/ApplicationResources.properties Sun Apr 20 13:38:51 2014 @@ -44,58 +44,64 @@ bookmarkForm.priority=Sort Priority bookmarkForm.rssUrl=Newsfeed URL bookmarkForm.save=Save bookmarkForm.url=Bookmark URL -bookmarkForm.weight=Display Weight -bookmarkForm.error.invalidURL=Invalid URL: {0} +bookmarkForm.created=Bookmark created +bookmarkForm.changesSaved=Changes saved # errors from validation Bookmark.error.nameNull=Name is a required field Bookmark.error.nameSize=Name cannot be more than 255 characters Bookmark.error.descriptionSize=Description cannot be more than 255 characters -Bookmark.error.urlNull=URL is a required field +Bookmark.error.urlNull=Bookmark URL is a required field Bookmark.error.urlBad=The URL you entered is not valid -Bookmark.error.weightNull=Weight is a required field -Bookmark.error.weightNotInt=Weight must be a valid integer Bookmark.error.priorityNull=Priority is a required field Bookmark.error.priorityNotInt=Priority must be a valid integer Bookmark.error.imageBad=The image URL you entered is not valid Bookmark.error.feedUrlBad=The feed URL you entered is not valid +bookmarkForm.error.duplicateName=Bookmark with that name already exists in folder # ----------------------------------------------------------- BookmarksForm.jsp bookmarksForm.root=root -bookmarksForm.rootTitle=Bookmarks +bookmarksForm.rootTitle=Blogroll bookmarksForm.folderTitle=Bookmark Folder [{0}] bookmarksForm.rootPrompt=\ -This is your top-level bookmarks folder. \ +This is your blog''s main bookmarks folder. \ The bookmarks you keep here will appear in the blogroll section of your blog \ (assuming that you are using one of the default themes). You can create \ -bookmark folders here, but you will have to add corresponding bookmark display \ +additional bookmark folders, but you will have to add corresponding bookmark display \ macros to your weblog''s templates if you wish to display their contents. bookmarksForm.folderPrompt=\ -This is a bookmark directory. You can add bookmarks here and even bookmark \ -folders, but they will not be displayed on your blog unless you add the \ +This is a bookmark directory. You can add bookmarks here \ +but they will not be displayed on your blog unless you add the \ appropriate bookmark display macros to your weblog''s templates. bookmarksForm.subtitle=Manage bookmarks in weblog <span>{0}</span> bookmarksForm.addBookmark=Add Bookmark -bookmarksForm.addFolder=Add Bookmark Folder +bookmarksForm.addFolder=New Bookmark Folder bookmarksForm.checkAll=Select All bookmarksForm.checkNone=Select None bookmarksForm.delete=Delete selected bookmarksForm.delete.confirm=Delete selected bookmarks? -bookmarksForm.description=Description +bookmarksForm.deleteFolder.confirm=Delete entire folder including all its bookmarks? +bookmarksForm.url=URL +bookmarksForm.feedurl=Newsfeed URL bookmarksForm.folder=Bookmark Folder +bookmarksForm.deleteFolder=Delete folder +bookmarksForm.viewFolder=Switch to Folder bookmarksForm.priority=Priority bookmarksForm.edit=Edit -bookmarksForm.edit.tip=Click to edit this folder or bookmark -bookmarksForm.move=Move +bookmarksForm.edit.tip=Click to modify this bookmark +bookmarksForm.folder.edit.tip=Click to edit folder +bookmarksForm.move=Move Selected To\: bookmarksForm.move.confirm=Move selected bookmarks? bookmarksForm.name=Name -bookmarksForm.path=Path +bookmarksForm.path=Folder +bookmarksForm.selectAllLabel=Select all bookmarks +bookmarksForm.selectOneLabel=Select bookmark named {0} bookmarksForm.visitLink=Visit bookmarksForm.visitLink.tip=Click to visit this site @@ -116,6 +122,7 @@ other bookmark folders if you wish. bookmarksImport.imported=Imported OPML bookmarks into folder [{0}] bookmarksImport.error=Error importing bookmarks: {0} bookmarksImport.import=Import +bookmarksImport.cancel=Cancel # ----------------------------------------------------------------- cacheInfo.jsp @@ -145,9 +152,11 @@ categoryForm.correct.subtitle=Correcting categoryForm.name=Name categoryForm.description=Description -categoryForm.image=image +categoryForm.image=Image URL categoryForm.save=Save categoryForm.cancel=Cancel +categoryForm.created=Category created +categoryForm.changesSaved=Changes saved categoryForm.error.duplicateName=The category name ''{0}'' is already in use, you will need to choose another @@ -171,12 +180,7 @@ categoriesForm.rootPrompt=\ These are your top-level weblog categories. Roller requires at least one \ category to be defined. \ Categories are used to organize your weblog entries and your readers can \ -choose to subscribe to separate newsfeeds for each of your categories. \ -You can also define sub-categories, but many of the Roller macros display \ -only top-level categories. -categoriesForm.categoryPrompt=\ -You can add sub-categories here, but many of the Roller macros display \ -only top-level categories. +choose to subscribe to separate newsfeeds for each of your categories. categoriesForm.addCategory=Add Category categoriesForm.checkAll=Check All categoriesForm.checkNone=Check None @@ -625,10 +629,10 @@ errorPage.noException=No stack trace. # --------------------------------------------------------------- FolderForm.jsp folderForm.add.title=Add Folder -folderForm.add.subtitle=Adding new bookmark folder in folder [{0}] +folderForm.add.subtitle=Adding new bookmark folder folderForm.edit.title=Edit Folder -folderForm.edit.subtitle=Editing bookmark folder in folder [{0}] +folderForm.edit.subtitle=Editing bookmark folder [{0}] folderForm.correct.title=Correct Folder folderForm.correct.subtitle=Correcting bookmark folder edits @@ -1158,6 +1162,7 @@ MediaFile.error.search.empty=Please ente MediaFile.error.search.noResults=No results found. mediaFile.error.search.dirPathEmpty=Directory path is empty. mediaFile.error.search.dirPathInvalid=Directory path is invalid. +MediaFile.error.view=Error viewing directory. mediaFile.error.view.dirNameEmpty=Directory name is empty. mediaFile.error.view.dirNameInvalid=Directory name is invalid. mediaFile.error.noneSelectedForMove=Please select one or more files to be moved. @@ -1270,7 +1275,7 @@ pagesForm.subtitle=Manage templates that pagesForm.tip=You can edit the templates that define the layout, colors and \ fonts of your weblog. You can also create new templates to define entirely \ new pages. This is for advanced users only, if you''re not comfortable \ -with HTML, you might want to leave your templates alone. +with HTML, you might want to leave your templates alone. Please <b>backup</b> your templates! pageForm.advancedSettings=Advanced Settings pagesForm.name=Name @@ -1374,19 +1379,6 @@ commonPingTargets.error.saving=Error sav commonPingTargets.error.enabling=Error enabling ping target commonPingTargets.error.disabling=Error disabling ping target -customPingTargets.customPingTargets=Custom Weblog Ping Targets -customPingTargets.subtitle=Manage custom ping targets for weblog <span>{0}</span> -customPingTargets.explanation=Use this page to setup sites that you wish to ping \ -that are not already available from the \ -common ping targets. Sites will normally advertise a ping URL that you should use. \ -Sites that you configure here are only available \ -for use within this website. - -customPingTargets.disAllowedExplanation=The use of custom ping targets is \ -not permitted on this site. To get an additional common ping target added, \ -Please contact an administrator. - - pings.title=Configure Automatic Weblog Pings pings.subtitle=Setup automatic pings for weblog <span>{0}</span> pings.explanation=Pings allow you to notify sites that your weblog has changed \ @@ -1400,13 +1392,6 @@ pings.commonPingTargets=Common Ping Targ pings.commonPingTargetsExplanation=These ping targets have been configured by the \ site administrator for use by all users. \ You can send pings to any of these well-known sites. -pings.customPingTargets=Custom Ping Targets -pings.customPingTargetsExplanationEmpty=You can also add sites yourself using the \ -menu item <strong>Custom Ping Targets</strong>. \ -Your custom ping targets are only available for your own use. Currently you \ -have no custom ping targets. -pings.customPingTargetsExplanationNonEmpty=These are sites you have set up for \ -yourself as custom ping targets. These are only available for your own use. ping.successful=The ping was successful. ping.transmittedButError=The ping was transmitted but the server \ @@ -1423,7 +1408,6 @@ pingResult.OK=OK pingTarget.pingTarget=Ping Target -customPingTarget.subtitle=Editing custom ping target in weblog <span>{0}</span> commonPingTarget.subtitle=Editing common ping target pingTarget.name=Name @@ -1635,7 +1619,7 @@ stylesheetEdit.title=Stylesheet stylesheetEdit.subtitle=Edit weblog custom stylesheet stylesheetEdit.tip=This form allows you to edit the stylesheet for your theme. stylesheetEdit.revertTip=If you run into any problems you don''t know how to \ -fix you can start over at any time by clicking the restore button. +fix you can start over at any time by clicking the restore button. Please <b>backup</b> your stylesheet! stylesheetEdit.revertTip1=<font color="red">If you have not customized your stylesheet here, \ please use the <em>Shared Theme</em> default by clicking the delete stylesheet button. \ This will ensure you are using the latest version and any changes will be picked up.</font> @@ -1649,11 +1633,12 @@ Unfortunately, the theme you''re using d stylesheet for you to edit. You can customize your theme or contact \ your system administrator to see about enabling this feature. +stylesheetEdit.create.success=Custom stylesheet created successfully. stylesheetEdit.save.success=Stylesheet updated successfully. stylesheetEdit.revert.success=Stylesheet reverted successfully. stylesheetEdit.default.success=Stylesheet deleted successfully. Your theme is now using the Shared Theme default. stylesheetEdit.default.noStylesheetOverride=Note: clicking the stylesheet tab will \ -recreate your custom override stylesheet again from the theme default! +recreate your custom override stylesheet again from the theme default. stylesheetEdit.error.customTheme=Cannot revert stylesheet on custom themes. stylesheetEdit.confirmDelete=Are you sure you want to delete your stylesheet? @@ -1671,7 +1656,7 @@ tabbedmenu.weblog.newEntry=New Entry tabbedmenu.weblog.archives=Entries tabbedmenu.weblog.categories=Categories tabbedmenu.weblog.commentManagement=Comments -tabbedmenu.bookmarks.allFolders=Bookmarks +tabbedmenu.bookmarks.allFolders=Blogroll tabbedmenu.bookmarks.import=Import tabbedmenu.weblog.referers=Referrers tabbedmenu.website.files=File Uploads @@ -1687,7 +1672,6 @@ tabbedmenu.website.members=Members tabbedmenu.website.inviteMember=Invite Member tabbedmenu.website.maintenance=Maintenance tabbedmenu.weblog.pingSetup=Pings -tabbedmenu.weblog.customPingTargets=Custom Ping Targets tabbedmenu.weblog.export=Export tabbedmenu.weblog.import=Import tabbedmenu.weblog.flushCache=Flush Cache @@ -1771,6 +1755,7 @@ Please select the theme you would like t themeEditor.save=Update Theme +themeEditor.settheme=Successfully set theme to - {0} # ---------------------------------------------------------------------- Uploads @@ -1914,7 +1899,7 @@ this site and your email address so we c userRegister.tip.userName=A short one-word username to uniquely identify \ yourself on the site. Please limit it to simple alphanumeric characters (a-z, \ A-Z and 0-9) and do not use HTML. You will <b>not</b> be able to change this \ -later, but that\'s OK because this string will not be publicly displayed. +later, but that''s OK because this string will not be publicly displayed. userRegister.tip.screenName=Your desired screen name (with no HTML). This is \ is what will be displayed in your weblog and on weblog entries that you write. @@ -2366,7 +2351,7 @@ websiteSettings.removeWebsite=You are th would you like to remove it? websiteSettings.removeWebsiteWarning=\ <b>WARNING</b>: removing a weblog will remove everything: all of the weblog \ -entries,<br />bookmarks, comments and settings. <b>Weblog removal is \ +entries,<br />comments, blogroll and settings. <b>Weblog removal is \ NOT REVERSIBLE</b>. websiteRemove.title=Confirm Weblog Remove
