file merged

src/main/resources/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.properties

@@ -84,7 +84,7 @@ general.page.internal.error.message=Internal error in system.
 
 general.header.notlogged=No user logged
 general.header.logged=Logged user: 
-general.footer.title=EEGbase - database for data gained in encephalography research.
+general.footer.title=EEGbase - database for data gained in electrophysiology research.
 general.footer.link=http://www.zcu.cz/
 general.footer.link.title=The University of West Bohemia
 general.footer.year=2008-2014
@@ -386,12 +386,12 @@ heading.visualization=Visualization
 heading.newExperimentPackage=New Experiment Package
 heading.license.list=Licenses:
 heading.license.request=Request form for license: ${license.title}
-homePage.description1=<strong>EEG base</strong> is a system for  storage and management of EEG/ERP resources - data, metadata, tools and materials related to EEG/ERP experiments. <strong>EEG base</strong> advances electrophysiology research by enabling access to public data, tools and  results of research groups.
-homePage.description2=For continuing on this website you need to log in. If you don't have an account, you can create one.
-homePage.discoverHeading=Discover the EEGbase 2.0
+homePage.description1=<strong>EEGbase</strong> is a system for storage, management, sharing and retrieval of EEG/ERP data, metadata, tools and documents related to electrophysiology. <strong>EEGbase</strong> advances electrophysiology research by enabling access to public data, tools and results.
+homePage.description2=For continuing on this website you need to log in. If you do not have an account, sign up for free.
+homePage.discoverHeading=Discover EEGbase 2.0
 homePage.featuresHeading=Features:
 homePage.welcomeHeading=Welcome to EEGbase 2.0
-homePage.featuresList=<ul><li>Management of EEG/ERP data and metadata</li><li>Management of EEG/ERP experimental design (experimental scenarios)</li><li>Management of data related to tested subjects</li><li>Sharing of knowledge and working within groups</li><li>Signal processing tools</li><li>Content management system</li><li>Fulltext search</li></ul>
+homePage.featuresList=<ul><li>Storage and management of electrophysiology data and metadata</li><li>Data sharing</li><li>User roles and work in groups</li><li>Signal processing tools</li><li>Fulltext search</li><li>Free registration</li><li>Experiments in RDF, OWL and odML formats</li></ul>
 
 infoPage.generalInfoPage.title=Information
 infoPage.FacebookEmailExists=It seems that you are already user of EEGbase. Please login using your current credentials and connect your account with Facebook manually.
@@ -880,7 +880,7 @@ web.footer.copyright.linkAddress=http://www.zcu.cz/
 web.footer.copyright.linkTitle=The University of West Bohemia
 web.footer.copyright.part1=Copyright &copy;
 web.footer.copyright.part2=2008-
-web.footer.note=EEGbase - database for data gained in encephalography research.
+web.footer.note=EEGbase - database for data gained in electrophysiology research.
 web.searchedTitle=Searched string:
 web.title=EEGbase
 pageTitle.weatherDefinitionsList=List of weather definitions