svn commit: r327207 - in /incubator/roller/branches/roller_2.0/web/WEB-INF/classes: ApplicationResources.properties ApplicationResources_de.properties rollerRuntimeConfigDefs.xml

[sn...@apache.org]

Author: snoopdave
Date: Fri Oct 21 08:20:49 2005
New Revision: 327207

URL: http://svn.apache.org/viewcvs?rev=327207&view=rev
Log:
Merging from trunk to branches/roller_2.0 revs 280410:327195

Modified:
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources_de.properties
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties?rev=327207&r1=327206&r2=327207&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties Fri Oct 21 08:20:49 2005
@@ -1060,6 +1060,7 @@
 userAdmin.cookieLogin=You cannot passwords when logging in with the \
 <strong>Remember Me</strong> feature.  Please logout and log back in to \
 change passwords.
+
 userAdmin.editUser=Edit User
 userAdmin.userSettings=User Settings
 userAdmin.delete=Delete
@@ -1132,7 +1133,7 @@
 userSettings.locale=Locale
 userSettings.timeZone=Timezone
 userSettings.save=Save
-userSettings.cookieLogin=You cannot passwords when logging in with the \
+userSettings.cookieLogin=You cannot change passwords when logging in with the \
 <strong>Remember Me</strong> feature.  Please logout and log back in to \
 change passwords.
 userSettings.passwordResetError=Password was not reset. Password fields did not \
@@ -1310,7 +1311,7 @@
 
 weblogEntryQuery.section.format=Format to be used
 
-weblogEntryQuery.label.separateEntries=Seperate Entries by
+weblogEntryQuery.label.separateEntries=Separate Entries by
 weblogEntryQuery.label.day=Day
 weblogEntryQuery.label.month=Month
 weblogEntryQuery.label.year=Year

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources_de.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources_de.properties?rev=327207&r1=327206&r2=327207&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources_de.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources_de.properties Fri Oct 21 08:20:49 2005
@@ -832,7 +832,7 @@
 tabbedmenu.admin.planetGroups=Benutzerdefinierte Gruppan
 
 planet.title.unconfigured=Planet ist nicht konfiguriert
-planet.description.unconfigured=Use Planet tab to configure Planet, set cache directory and add external subsriptions.
+planet.description.unconfigured=Use Planet tab to configure Planet, set cache directory and add external subscriptions.
 
 planet.rankings=Technorati Rankings
 planet.hotBlogs=Hot Blogs On-site

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml?rev=327207&r1=327206&r2=327207&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml Fri Oct 21 08:20:49 2005
@@ -37,7 +37,7 @@
       </property-def>
       <property-def  name="site.description"  key="configForm.siteDescription">
          <type>string</type>
-         <default-value>Roller Site</default-value>
+	     <default-value>A default install of the Roller Weblogger open source blog server</default-value>
       </property-def>
       <property-def  name="site.adminemail"  key="configForm.siteAdminEmail">
          <type>string</type>