Return-Path: X-Original-To: apmail-roller-commits-archive@www.apache.org Delivered-To: apmail-roller-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DC816DE64 for ; Sun, 23 Dec 2012 02:33:52 +0000 (UTC) Received: (qmail 96666 invoked by uid 500); 23 Dec 2012 02:33:51 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 96591 invoked by uid 500); 23 Dec 2012 02:33:49 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 96549 invoked by uid 99); 23 Dec 2012 02:33:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2012 02:33:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FILL_THIS_FORM_SHORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2012 02:33:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D515823889CB; Sun, 23 Dec 2012 02:33:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1425393 - /roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties Date: Sun, 23 Dec 2012 02:33:25 -0000 To: commits@roller.apache.org From: gmazza@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121223023325.D515823889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gmazza Date: Sun Dec 23 02:33:25 2012 New Revision: 1425393 URL: http://svn.apache.org/viewvc?rev=1425393&view=rev Log: Cleanup of English properties file. Modified: roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties Modified: roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties?rev=1425393&r1=1425392&r2=1425393&view=diff ============================================================================== --- roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties (original) +++ roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties Sun Dec 23 02:33:25 2012 @@ -52,14 +52,14 @@ bookmarkForm.error.invalidURL=Invalid UR 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.urlBad=The url you entered is not valid +Bookmark.error.urlNull=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 +Bookmark.error.imageBad=The image URL you entered is not valid +Bookmark.error.feedUrlBad=The feed URL you entered is not valid # ----------------------------------------------------------- BookmarksForm.jsp @@ -99,7 +99,7 @@ bookmarksForm.path=Path bookmarksForm.visitLink=Visit bookmarksForm.visitLink.tip=Click to visit this site -bookmarksForm.warn.notMoving=Can''t move parent folder [{0}] into one of it''s \ +bookmarksForm.warn.notMoving=Can''t move parent folder [{0}] into one of its \ children bookmarksForm.error.move=Error performing move, parent to child moves not allowed bookmarksForm.importBookmarks=Import bookmarks via OPML @@ -155,7 +155,7 @@ categoryForm.error.duplicateName=The cat Category.error.nameNull=Name is a required field Category.error.nameSize=Name cannot be more than 255 characters Category.error.descriptionSize=Description cannot be more than 255 characters -Category.error.imageBad=The image url you entered is not valid +Category.error.imageBad=The image URL you entered is not valid categoriesForm.noresults=There are currently no categories @@ -186,9 +186,9 @@ categoriesForm.path=Path categoriesForm.parent=Category categoriesForm.remove=Remove -categoriesForm.warn.notMoving=Can''t move parent category [{0}] into one of it''s \ +categoriesForm.warn.notMoving=Can''t move parent category [{0}] into one of its \ children -categoriesForm.error.move=Error perfor6ming move, parent to child moves not allowed +categoriesForm.error.move=Error performing move, parent to child moves not allowed # --------------------------------------------------------- CategoryDeleteOK.jsp @@ -374,7 +374,7 @@ configForm.userSettings=User Settings configForm.accountActivation=Require new users to activate accounts via email configForm.accountActivationFromAddress=Email address for account activation messages configForm.allowNewUsers=Allow New Users? -configForm.registrationUrl=External registration url +configForm.registrationUrl=External registration URL configForm.editorPages=Editor Pages configForm.webServicesSettings=Web Services Settings @@ -574,7 +574,7 @@ error.title.403=Access Denied error.text.403=You do not have the privilege necessary to access the page you \ requested. -error.title.404=Sorry! We couldn't find your document +error.title.404=Sorry! We couldn''t find your document error.text.404=The file that you requested could not be found on this server. error.permissions.deniedSave=Access Denied (you logged in as a different user?) @@ -613,7 +613,7 @@ errors.date={0} is not a date. errors.range={0} is not in the range {1} through {2}. errors.creditcard={0} is an invalid credit card number. errors.email={0} may only include letters, numbers, and spaces. -errors.noslashes={0} may not include '/' slash characters. +errors.noslashes={0} may not include ''/'' slash characters. error.noTrackbackUrlSpecified=You did not specify a Trackback URL # -------------------------------------------------------------------- error.jsp @@ -663,7 +663,7 @@ footer.mailingLists=Mailing Lists index.heading=Welcome to Roller! index.prompt=Follow these steps to finalize your Roller installation: -index.error=ERROR quering the Roller database, are you sure you ran the \ +index.error=ERROR querying the Roller database, are you sure you ran the \ database creation or database migration script? index.createUser=Create a user @@ -785,7 +785,7 @@ Roller tried to check database status or determine what happened so you will have to look at your servers log files \ and diagnose the problem yourself. Follow the instructons on the Roller wiki \ and seek help from the \ +"https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help"> \ Roller user mailing list. # create tables @@ -962,7 +962,7 @@ maintenance.prompt.index=Rebuild the sea maintenance.button.index=Rebuild Search Index maintenance.prompt.flush=Flush the page cache for your Roller weblog. maintenance.button.flush=Flush Cache -maintenance.message.indexed=Successully scheduled search index rebuild for your \ +maintenance.message.indexed=Successfully scheduled search index rebuild for your \ Roller weblog maintenance.message.flushed=Successfully flushed the page cache of your \ Roller weblog @@ -1075,10 +1075,10 @@ to organize your files, and you do not h URLs" when you move or rename files. mediaFileView.dirPageTip=\ This is a media-file directory. You can return to the main directory \ -by clicking the 'root' link above. +by clicking the ''root'' link above. mediaFileView.tabular=Tabular -mediaFileView.hierarchical=Hierarhical +mediaFileView.hierarchical=Hierarchical mediaFileView.sortby=Sort by: mediaFileView.deleteSelected=Delete selected @@ -1171,7 +1171,7 @@ mediaFileEdit.originalPath=Original Path memberPermissions.title=Weblog Member Permissions memberPermissions.subtitle=Manage permissions of users in weblog {0} memberPermissions.description=You can change permissions of weblog members, \ -or remove them from the weblog entire using the controls in the table below \ +or remove them from the weblog entirely using the controls in the table below \ and clicking Save to commit your changes. Note that you are not allowed to \ demote or remove yourself from the weblog. @@ -1205,7 +1205,7 @@ memberPermissions.permissionHelp=\ # --------------------------------------------------------- New user registation newUser.addNewUser=New User Registration -newuser.loginName=User Name s +newuser.loginName=User Name newuser.fullName=Full Name newuser.password=Password newuser.eMailAddress=Email Address @@ -1280,7 +1280,7 @@ pagesForm.description=Description pagesForm.edit=Edit pagesForm.remove=Remove pagesForm.required=(required) -pagesForm.hiddenNote=NOTE: Template with names that start with '_' are hidden. \ +pagesForm.hiddenNote=NOTE: Template with names that start with ''_'' are hidden. \ They will not be shown in the navigation bar. pagesForm.addNewPage=Add a new template pagesForm.addNewPage.success=New template {0} added successfully. @@ -1346,7 +1346,7 @@ pageRemove.subtitle=Confirm removal of p pageRemoves.subtitle=Confirm removal of pages pageRemove.youSure=Are you sure you want to remove this page? pageRemoves.youSure=Are you sure you want to remove these pages? -pageRemoves.youSureWarning=WARNING: this will may remove custom html/css design and is NOT REVERSIBLE. \ +pageRemoves.youSureWarning=WARNING: This may remove custom html/css design and is NOT REVERSIBLE. \ You might want to backup your stylesheet if you are not sure. pageRemove.pageId=Page ID pageRemove.pageName=Page Name @@ -1369,7 +1369,7 @@ customPingTargets.customPingTargets=Cust customPingTargets.subtitle=Manage custom ping targets for weblog {0} 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. \ +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. @@ -1623,7 +1623,7 @@ stylesheetEdit.subtitle=Edit weblog cust 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. -stylesheetEdit.revertTip1=If you have not customised your stylesheet here, \ +stylesheetEdit.revertTip1=If you have not customized your stylesheet here, \ please use the Shared Theme default by clicking the delete stylesheet button. \ This will ensure you are using the latest version and any changes will be picked up. @@ -1632,7 +1632,7 @@ stylesheetEdit.revert=Restore Stylesheet stylesheetEdit.delete=Delete Stylesheet stylesheetEdit.noStylesheetOverride=\ -Unfortunately, the theme you're using does not provide a custom \ +Unfortunately, the theme you''re using does not provide a custom \ stylesheet for you to edit. You can customize your theme or contact \ your system administrator to see about enabling this feature. @@ -1766,7 +1766,7 @@ uploadFiles.subtitle=Upload files for us uploadFiles.tip=You can upload files for use in this weblog. If you''ve \ uploaded an image you can include it in your weblog via an HTML \ <img src="[IMAGE-URL]" /> tag. If you''ve uploaded a podcast, you can \ -include it in an entry by providing it''s URL in the entry''s MediaCast field. +include it in an entry by providing its URL in the entry''s MediaCast field. uploadFiles.manageFiles=Manage Uploaded Files uploadFiles.uploadDisabled=Upload has been turned off. uploadFiles.exceededQuota=You have exceeded your file upload quota. @@ -1822,7 +1822,7 @@ userAdmin.title.editUser=Edit user profi userAdmin.subtitle.editUser=Editing profile and permissions for user {0} userAdmin.prompt.editUser=You can change a user''s profile, give them \ global admin privileges or disable them. \ -NOTE: You can also reset a users password here, but if they use Roller''s \ +NOTE: You can also reset a user''s password here, but if they use Roller''s \ remember me feature, they may have to clear browser cookies before they can \ login again. @@ -2099,10 +2099,10 @@ weblogEdit.trackbackUrl=Trackback URL weblogEdit.trackbackSuccess=Trackback succeeded. weblogEdit.trackbackFailure=Trackback failed, remote server said "{0}" -weblogEdit.trackbackErrorTransport=Trackback failed, could not reach trackback url. Are you sure you put in the right url? +weblogEdit.trackbackErrorTransport=Trackback failed, could not reach trackback URL. Are you sure you put in the right URL? weblogEdit.trackbackErrorResponse=Trackback failed, error in sending. Response was {0} - {1} -weblogEdit.trackbackErrorParsing=Trackback failed, url indicated success but response message was improperly formatted. Response was: {0} -weblogEdit.trackbackError404=Trackback failed, could not reach trackback url. Are you sure you put in the right url? +weblogEdit.trackbackErrorParsing=Trackback failed, URL indicated success but response message was improperly formatted. Response was: {0} +weblogEdit.trackbackError404=Trackback failed, could not reach trackback URL. Are you sure you put in the right URL? weblogEdit.hasComments=Comments [{1}] @@ -2357,7 +2357,7 @@ entries,
bookmarks, comments and se NOT REVERSIBLE. websiteRemove.title=Confirm Weblog Remove -websiteRemove.subtitle=Weblog removal is NOT REVERSABLE +websiteRemove.subtitle=Weblog removal is NOT REVERSIBLE websiteRemove.youSure=Are you sure you want to remove weblog [{0}]? websiteRemove.websiteId=Weblog ID websiteRemove.websiteName=Weblog Name