svn commit: r1433802 - /roller/branches/roller_5.0/weblogger-web/src/main/resources/ApplicationResources.properties

[gm...@apache.org]

Author: gmazza
Date: Wed Jan 16 02:27:41 2013
New Revision: 1433802

URL: http://svn.apache.org/viewvc?rev=1433802&view=rev
Log:
ROL-1421 typos in ApplicatoinResources (& other changes made to trunk branch) - Patch by Denis Balazuc

Modified:
    roller/branches/roller_5.0/weblogger-web/src/main/resources/ApplicationResources.properties

Modified: roller/branches/roller_5.0/weblogger-web/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/resources/ApplicationResources.properties?rev=1433802&r1=1433801&r2=1433802&view=diff
==============================================================================
--- roller/branches/roller_5.0/weblogger-web/src/main/resources/ApplicationResources.properties (original)
+++ roller/branches/roller_5.0/weblogger-web/src/main/resources/ApplicationResources.properties Wed Jan 16 02:27:41 2013
@@ -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
@@ -76,7 +76,7 @@ bookmark folders here, but you will have
 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 add the \
+folders, 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>
@@ -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
@@ -154,7 +154,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.jsp
@@ -184,9 +184,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
 
@@ -368,7 +368,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
@@ -568,7 +568,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?)
@@ -607,7 +607,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
@@ -657,7 +657,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
@@ -779,7 +779,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 <a href=\
-"http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists"> \
+"https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help"> \
 Roller user mailing list</a>.
 
 # create tables
@@ -919,7 +919,7 @@ class="google">try this same search</a> 
 macro.weblog.trackback=Trackback URL:
 macro.weblog.editentry=Edit
 macro.weblog.allcategories=All
-macro.weblog.nolanguages=This site does not support multiple langauges.
+macro.weblog.nolanguages=This site does not support multiple languages.
 macro.weblog.notifyMeOfComments=Notify me by email of new comments
 macro.weblog.noEntriesForDate=No entries found for specified date
 
@@ -1069,10 +1069,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
@@ -1165,7 +1165,7 @@ mediaFileEdit.originalPath=Original Path
 memberPermissions.title=Weblog Member Permissions
 memberPermissions.subtitle=Manage permissions of users in weblog <span>{0}</span>
 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.
 
@@ -1199,7 +1199,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
@@ -1274,7 +1274,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 <strong>{0}</strong> added successfully.
@@ -1356,7 +1356,7 @@ customPingTargets.customPingTargets=Cust
 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. \
+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.
 
@@ -1615,7 +1615,7 @@ stylesheetEdit.save=Save
 stylesheetEdit.revert=Restore 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.
 
@@ -1743,7 +1743,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 \
 &lt;img src="[IMAGE-URL]" /&gt; 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.
@@ -1799,7 +1799,7 @@ userAdmin.title.editUser=Edit user profi
 userAdmin.subtitle.editUser=Editing profile and permissions for user <span>{0}</span>
 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.
 
@@ -2075,10 +2075,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=<a href="{0}">Comments [{1}]</a>
 
@@ -2333,7 +2333,7 @@ entries,<br />bookmarks, comments and se
 NOT REVERSIBLE</b>.
 
 websiteRemove.title=Confirm Weblog Remove
-websiteRemove.subtitle=Weblog removal is <b>NOT REVERSABLE</b>
+websiteRemove.subtitle=Weblog removal is <b>NOT REVERSIBLE</b>
 websiteRemove.youSure=Are you sure you want to remove weblog [{0}]?
 websiteRemove.websiteId=Weblog ID
 websiteRemove.websiteName=Weblog Name