Merge pull request #283 from min2ha/master

Reviewed and accepted.

src/main/resources/i18n/messages.properties

@@ -31,7 +31,7 @@ button.close = Close
 
 main.menu.title = Main menu
 main.menu.home = Home
-main.menu.nominate = Save a UK website
+main.menu.nominate = Save a UK Website
 main.menu.about = About Us
 main.menu.contact = Contact Us
 main.menu.language = Language
@@ -40,7 +40,7 @@ main.menu.welsh = Cymraeg
 main.menu.scottish = Gàidhlig
 main.menu.collections = Topics and Themes
 main.menu.home.title = Home
-main.menu.nominate.title = Save a UK website
+main.menu.nominate.title = Save a UK Website
 main.menu.about.title = About Us
 main.menu.contact.title = Contact Us
 main.menu.close.title = Close
@@ -353,7 +353,7 @@ nominate.form.button.submit = Submit
 
 cookies.title = UKWA Cookie Policy
 cookies.main.heading = Cookie Policy
-cookies.text = <h2>What are cookies?</h2><p>Cookies are small text files that websites save to your computer. They often include a randomly generated number which is stored on your device. Cookies are commonly used to improve browsing experience, measure website performance and support the delivery of services. Unless you have adjusted your browser settings to refuse cookies, our systems will issue cookies as soon you visit our website.</p><h2>How do we use cookies?</h2><p>Our website uses cookies to make the website easier for you to use and improve your overall experience when accessing the UK Web Archive.</p><p>The UK Web Archive currently creates 4 cookies:</p><p>JSESSIONID - this is created at the start of every session, when you open your browser and navigate to our website. Session cookies enables the website to keep track of your movement from page to page so you don't get asked for the same information you've already given to the site. These cookies allow you to be recognized within the website so any page changes or item or data selection you do is remembered from page to page.  Your web browser will normally delete session cookies as it is closed down.</p><p>collections_display - this cookie allows our website to rememember how you want the Special collections to be displayed - as thumbnails or as a list. It is created the first time you navigate to Topics and Themes page.</p><p>cookies_accepted - this is used to identify if you viewed and accepted the cookie acknowledgement message. It is created once you confirmed you saw the message by clicking the "OK" button. The cookie acknowledgement message is displayed only once for each user.</p><p>survey_viewed - this indicates that you viewed a user survey that we have temporarily put onto the website. </p><p>Measuring website performance: our website must demonstrate value for money in the delivery of information. Monitoring the use of our website via cookies helps our team to work out which pages are most useful to our users, and to improve pages that they aren't finding useful. We also use cookies in order to monitor visitor numbers. No personal information other than your IP address is collected as part of this process.</p><p>To measure website performance we use Google Analytics. This service will create cookies the usage of which is explained here: <a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/cookie-usage">https://developers.google.com/analytics/devguides/collection/analyticsjs/cookie-usage</a></p><h2>Where can I find more about cookies and how to turn-off or delete them?</h2><p>Find out more about cookies at www.aboutcookies.org including information on how to control and delete them in all major web browsers.</p><p>You can block cookies by activating the setting on your browser that allows you to refuse all or some cookies. However, if you use your browser settings to block all cookies (including essential cookies) you may not be able to access parts of our sites, or you may experience reduced functionality when accessing certain Services. Unless you have adjusted your browser setting so that it will refuse cookies, our system will issue cookies as soon you visit our website.</p><p>For information about deleting cookies from the browser on your mobile phone, refer to your handset manual.</p>
+cookies.text = <h2>What are cookies ?</h2><p>Cookies are small text files that websites save to your computer. They often include a randomly generated number which is stored on your device. Cookies are commonly used to improve browsing experience, measure website performance and support the delivery of services. Unless you have adjusted your browser settings to refuse cookies, our systems will issue cookies as soon you visit our website.</p><h2>How do we use cookies ?</h2><p>Our website uses cookies to make the website easier for you to use and improve your overall experience when accessing the UK Web Archive.</p><p>The UK Web Archive currently creates 4 cookies:</p><p>JSESSIONID - this is created at the start of every session, when you open your browser and navigate to our website. Session cookies enables the website to keep track of your movement from page to page so you don't get asked for the same information you've already given to the site. These cookies allow you to be recognized within the website so any page changes or item or data selection you do is remembered from page to page.  Your web browser will normally delete session cookies as it is closed down.</p><p>collections_display - this cookie allows our website to rememember how you want the Special collections to be displayed - as thumbnails or as a list. It is created the first time you navigate to Topics and Themes page.</p><p>cookies_accepted - this is used to identify if you viewed and accepted the cookie acknowledgement message. It is created once you confirmed you saw the message by clicking the "OK" button. The cookie acknowledgement message is displayed only once for each user.</p><p>survey_viewed - this indicates that you viewed a user survey that we have temporarily put onto the website. </p><p>Measuring website performance: our website must demonstrate value for money in the delivery of information. Monitoring the use of our website via cookies helps our team to work out which pages are most useful to our users, and to improve pages that they aren't finding useful. We also use cookies in order to monitor visitor numbers. No personal information other than your IP address is collected as part of this process.</p><p>To measure website performance we use Google Analytics. This service will create cookies the usage of which is explained here: <a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/cookie-usage">https://developers.google.com/analytics/devguides/collection/analyticsjs/cookie-usage</a></p><h2>Where can I find more about cookies and how to turn-off or delete them ?</h2><p>Find out more about cookies at www.aboutcookies.org including information on how to control and delete them in all major web browsers.</p><p>You can block cookies by activating the setting on your browser that allows you to refuse all or some cookies. However, if you use your browser settings to block all cookies (including essential cookies) you may not be able to access parts of our sites, or you may experience reduced functionality when accessing certain Services. Unless you have adjusted your browser setting so that it will refuse cookies, our system will issue cookies as soon you visit our website.</p><p>For information about deleting cookies from the browser on your mobile phone, refer to your handset manual.</p>
 
 error.404.title = UKWA 404 error - Page not found
 error.404.back.button = Go back

src/main/resources/i18n/messages_cy.properties

@@ -351,7 +351,7 @@ nominate.form.button.submit = Anfon
 
 cookies.title = Polisi Cwcis
 cookies.main.heading = Polisi Cwcis
-cookies.text = <h2>What are cookies?</h2><p>Cookies are small text files that websites save to your computer. They often include a randomly generated number which is stored on your device. Cookies are commonly used to improve browsing experience, measure website performance and support the delivery of services. Unless you have adjusted your browser settings to refuse cookies, our systems will issue cookies as soon you visit our website.</p><h2>How do we use cookies?</h2><p>Our website uses cookies to make the website easier for you to use and improve your overall experience when accessing the UK Web Archive.</p><p>The UK Web Archive currently creates 4 cookies:</p><p>JSESSIONID - this is created at the start of every session, when you open your browser and navigate to our website. Session cookies enables the website to keep track of your movement from page to page so you don't get asked for the same information you've already given to the site. These cookies allow you to be recognized within the website so any page changes or item or data selection you do is remembered from page to page.  Your web browser will normally delete session cookies as it is closed down.</p><p>collections_display - this cookie allows our website to rememember how you want the Special collections to be displayed - as thumbnails or as a list. It is created the first time you navigate to Topics and Themes page.</p><p>cookies_accepted - this is used to identify if you viewed and accepted the cookie acknowledgement message. It is created once you confirmed you saw the message by clicking the "OK" button. The cookie acknowledgement message is displayed only once for each user.</p><p>survey_viewed - this indicates that you viewed a user survey that we have temporarily put onto the website. </p><p>Measuring website performance: our website must demonstrate value for money in the delivery of information. Monitoring the use of our website via cookies helps our team to work out which pages are most useful to our users, and to improve pages that they aren't finding useful. We also use cookies in order to monitor visitor numbers. No personal information other than your IP address is collected as part of this process.</p><p>To measure website performance we use Google Analytics. This service will create cookies the usage of which is explained here: <a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/cookie-usage">https://developers.google.com/analytics/devguides/collection/analyticsjs/cookie-usage</a></p><h2>Where can I find more about cookies and how to turn-off or delete them?</h2><p>Find out more about cookies at www.aboutcookies.org including information on how to control and delete them in all major web browsers.</p><p>You can block cookies by activating the setting on your browser that allows you to refuse all or some cookies. However, if you use your browser settings to block all cookies (including essential cookies) you may not be able to access parts of our sites, or you may experience reduced functionality when accessing certain Services. Unless you have adjusted your browser setting so that it will refuse cookies, our system will issue cookies as soon you visit our website.</p><p>For information about deleting cookies from the browser on your mobile phone, refer to your handset manual.</p>
+cookies.text = <h2>What are cookies ?</h2><p>Cookies are small text files that websites save to your computer. They often include a randomly generated number which is stored on your device. Cookies are commonly used to improve browsing experience, measure website performance and support the delivery of services. Unless you have adjusted your browser settings to refuse cookies, our systems will issue cookies as soon you visit our website.</p><h2>How do we use cookies ?</h2><p>Our website uses cookies to make the website easier for you to use and improve your overall experience when accessing the UK Web Archive.</p><p>The UK Web Archive currently creates 4 cookies:</p><p>JSESSIONID - this is created at the start of every session, when you open your browser and navigate to our website. Session cookies enables the website to keep track of your movement from page to page so you don't get asked for the same information you've already given to the site. These cookies allow you to be recognized within the website so any page changes or item or data selection you do is remembered from page to page.  Your web browser will normally delete session cookies as it is closed down.</p><p>collections_display - this cookie allows our website to rememember how you want the Special collections to be displayed - as thumbnails or as a list. It is created the first time you navigate to Topics and Themes page.</p><p>cookies_accepted - this is used to identify if you viewed and accepted the cookie acknowledgement message. It is created once you confirmed you saw the message by clicking the "OK" button. The cookie acknowledgement message is displayed only once for each user.</p><p>survey_viewed - this indicates that you viewed a user survey that we have temporarily put onto the website. </p><p>Measuring website performance: our website must demonstrate value for money in the delivery of information. Monitoring the use of our website via cookies helps our team to work out which pages are most useful to our users, and to improve pages that they aren't finding useful. We also use cookies in order to monitor visitor numbers. No personal information other than your IP address is collected as part of this process.</p><p>To measure website performance we use Google Analytics. This service will create cookies the usage of which is explained here: <a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/cookie-usage">https://developers.google.com/analytics/devguides/collection/analyticsjs/cookie-usage</a></p><h2>Where can I find more about cookies and how to turn-off or delete them ?</h2><p>Find out more about cookies at www.aboutcookies.org including information on how to control and delete them in all major web browsers.</p><p>You can block cookies by activating the setting on your browser that allows you to refuse all or some cookies. However, if you use your browser settings to block all cookies (including essential cookies) you may not be able to access parts of our sites, or you may experience reduced functionality when accessing certain Services. Unless you have adjusted your browser setting so that it will refuse cookies, our system will issue cookies as soon you visit our website.</p><p>For information about deleting cookies from the browser on your mobile phone, refer to your handset manual.</p>
 
 error.404.title = UKWA 404 error - Page not found
 error.404.back.button = Go back