From efb05382ecc4101372adf7108f7b63308701ee45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Fri, 19 Jan 2024 17:49:41 +0200 Subject: [PATCH 1/6] Partial translations --- .../public_html/js-ecl-v2/i18n/fi.json | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/fi.json b/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/fi.json index 60032988..83bcf4d9 100644 --- a/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/fi.json +++ b/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/fi.json @@ -3,55 +3,55 @@ "locale": "fi" }, "c-eu": "Euroopan unioni", - "c-euinstitutions":"EU institutions", + "c-euinstitutions":"EU instituutit", "c-ec": "Euroopan Komissio", - "c-ec-websites": "European Commission websites", - "c-cpriorities": "Commission and its priorities", - "c-piliciesinfoserivces": "Policies, information and services", + "c-ec-websites": "Euroopan komission verkkosivu", + "c-cpriorities": "Komissio ja sen prioriteetit", + "c-piliciesinfoserivces": "Käytännöt (policies), informaatio ja palvelut", "c-search":"Hae", - "c-close":"Close", - "c-ec-follow": "Follow the European Commission", - "c-othersocial": "Other social media", - "c-select-language": "Select your language", - "c-home": "Home", + "c-close":"Sulje", + "c-ec-follow": "Seuraa Euroopan komissiota", + "c-othersocial": "Muu sosiaalinen media", + "c-select-language": "Valitse kieli", + "c-home": "Alkuun", "c-ecabout": "About the Commission's new web presence", - "c-languagepolicy": "Language policy", - "c-resourcespartners": "Resources for partners", - "c-cookies": "Cookies", - "c-privacyppolicy": "Privacy policy", + "c-languagepolicy": "Kielipolitiikka", + "c-resourcespartners": "Resursseja kumppaneille", + "c-cookies": "Evästeet", + "c-privacyppolicy": "Yksityisyyden suoja", "c-legalnotice": "Oikeudellinen huomautus", "c-contact": "Yhteydenotto", "s-inspire": "INSPIRE", "s-site-title": "INSPIRE-rekisteripalvelu", - "s-follow-us": "Follow us:", - "s-inspire-community-forum":"INSPIRE community forum", + "s-follow-us": "Seuraa meitä:", + "s-inspire-community-forum":"INSPIRE yhteisöfoorumi", "s-uri": "URI", - "s-thisversion":"This version", - "s-versionhistory":"Version history", + "s-thisversion":"Tämä versio", + "s-versionhistory":"Versiohistoria", "s-collection-title":"Available items", "s-narrower-title":"Yksityiskohtaisempi koodiarvo", - "s-contact-us":"Contact us", - "s-privacy-policy":"Privacy policy", - "s-cookies":"Cookies", - "s-inspire-resources":"INSPIRE Resources", - "s-search-options":"Search options", + "s-contact-us":"Ota yhteyttä", + "s-privacy-policy":"Yksityisyyden suoja", + "s-cookies":"Evästeet", + "s-inspire-resources":"INSPIRE resurssit", + "s-search-options":"Hakuvaihtoehdot", "s-search-register-label":"Rekisteri", - "s-search-no-result-found":"No results found for \"{1}\"", + "s-search-no-result-found":"Ei tuloksia kohteelle \"{1}\"", "s-pagination-previous":"Edellinen", "s-pagination-next":"Seuraava", - "s-pagination-page":"Page", - "s-pagination-gotopreviouspage":"Go to previous page", - "s-pagination-gotopage":"Go to page", - "s-pagination-gotonextpage":"Go to next page", - "s-facet-all":"All", - "s-search-results":"Search results ({0})", - "s-search-results-current-page":"Showing results {0} to {1}", + "s-pagination-page":"Sivu", + "s-pagination-gotopreviouspage":"Mene edelliselle sivulle", + "s-pagination-gotopage":"Mene sivulle", + "s-pagination-gotonextpage":"Mene seuraavalle sivulle", + "s-facet-all":"Kaikki", + "s-search-results":"Hakutulokset ({0})", + "s-search-results-current-page":"Näytetään tulokset {0} - {1}", "s-facet-title-register_itemclass_localid":"Rekisteri", "s-facet-title-status_uri":"Tila", - "s-error-fetch":"An error occurred while trying to access the data service. If the error persist, please visit the {1} to try and give more information about your problem.", - "s-error-404":"The element requested has not been found in the system. If you think this could be an error, please visit the {1} to try and give more information about your problem.", - "s-error-406":"The format or language specified in the request is not available. Please specify a supported format/language. For additional info or if you think this could be an error, please visit the {1} to try and give more information about your problem.", - "s-error-500":"The data service is not able to retrieve the information because of an internal error. If the error persist, please visit the {1} to try and give more information about your problem.", + "s-error-fetch":"Virhe yritettäessä käyttää datapalvelua. Jos virhe toistuu, mene sivulle {1} ja anna lisätietoja ongelmastasi.", + "s-error-404":"Pyydetty elementti ei löytynyt järjestelmästä. Jos tämä on mielestäsi mahdollinen virhe, mene sivulle {1} ja anna lisätietoja ongelmastasi.", + "s-error-406":"Pyynnössä valittu muoto tai kieli ei ole tarjolla. Ole hyvä ja valitse tuettu muoto tai kieli. Saadaksesi lisätietoja tai jos tämä on mielestäsi mahdollinen virhe, mene sivulle {1} ja anna lisätietoja ongelmastasi.", + "s-error-500":"Datapalvelu ei pysty hakemaan tietoa johtuen sisäisestä virheestä. Jos virhe toistuu, mene sivulle {1} ja anna lisätietoa ongelmastasi.", "l-ec-web-presence":"https://ec.europa.eu/info/about-commissions-new-web-presence_{0}", "l-ec-language-policy":"https://ec.europa.eu/info/language-policy_{0}", "l-ec-resources-partners":"https://ec.europa.eu/info/resources-partners_{0}", @@ -64,9 +64,9 @@ "l-ec-other-social":"https://europa.eu/european-union/contact/social-networks_{0}#n:+i:4+e:1+t:+s:", "l-ec-website":"https://ec.europa.eu/info/index_{0}", "s-other-formats":"Saatavilla olevat muodot:", - "s-insert-date":"Insert date", - "s-edit-date":"Edit date", - "c-refine-results":"Refine results", - "c-clear-all":"Clear all", - "translatenotavailable":"Not available in Finnish" + "s-insert-date":"Lisää päivämäärä", + "s-edit-date":"Muokkaa päivämäärää", + "c-refine-results":"Tarkenna tuloksia", + "c-clear-all":"Tyhjennä kaikki", + "translatenotavailable":"Käännöstä ei ole tarjolla suomeksi" } \ No newline at end of file From cdbd7fc5992b7260c7f23bdb3c986b35271b1eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Fri, 19 Jan 2024 17:53:18 +0200 Subject: [PATCH 2/6] Partial translations --- .../public_html/js-ecl-v2/i18n/fi.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/fi.json b/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/fi.json index 83bcf4d9..00d7ee5a 100644 --- a/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/fi.json +++ b/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/fi.json @@ -64,8 +64,8 @@ "l-ec-other-social":"https://europa.eu/european-union/contact/social-networks_{0}#n:+i:4+e:1+t:+s:", "l-ec-website":"https://ec.europa.eu/info/index_{0}", "s-other-formats":"Saatavilla olevat muodot:", - "s-insert-date":"Lisää päivämäärä", - "s-edit-date":"Muokkaa päivämäärää", + "s-insert-date":"Lisäys päivämäärä", + "s-edit-date":"Muokkaus päivämäärä", "c-refine-results":"Tarkenna tuloksia", "c-clear-all":"Tyhjennä kaikki", "translatenotavailable":"Käännöstä ei ole tarjolla suomeksi" From 6e8b5827f31f929793a90f8e5342d819999b192f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Fri, 19 Jan 2024 18:03:41 +0200 Subject: [PATCH 3/6] Swedish translations --- .../public_html/js-ecl-v2/i18n/sv.json | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/sv.json b/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/sv.json index 066d8052..05ea76d5 100644 --- a/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/sv.json +++ b/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/sv.json @@ -3,55 +3,55 @@ "locale": "sv" }, "c-eu": "Europeiska Unionen", - "c-euinstitutions":"EU institutions", - "c-ec": "European Commission", - "c-ec-websites": "European Commission websites", - "c-cpriorities": "Commission and its priorities", - "c-piliciesinfoserivces": "Policies, information and services", + "c-euinstitutions":"EU institutioner", + "c-ec": "Europeiska kommissionen", + "c-ec-websites": "Europeiska kommissionen webbplats", + "c-cpriorities": "Kommissionen och dess prioriteter", + "c-piliciesinfoserivces": "Politik, information och tjänster", "c-search":"Sök", - "c-close":"Close", - "c-ec-follow": "Follow the Europeiska Kommissionen", - "c-othersocial": "Other social media", - "c-select-language": "Select your language", - "c-home": "Home", - "c-ecabout": "About the Commission's new web presence", - "c-languagepolicy": "Language policy", - "c-resourcespartners": "Resources for partners", - "c-cookies": "Cookies", - "c-privacyppolicy": "Privacy policy", + "c-close":"Stäng", + "c-ec-follow": "Följ den Europeiska kommissionen", + "c-othersocial": "Övriga sociala medier", + "c-select-language": "Välj språk", + "c-home": "Hem", + "c-ecabout": "Om kommissionens närvaro på webben", + "c-languagepolicy": "Språkpolitik", + "c-resourcespartners": "Rersurser för samarbetspartner", + "c-cookies": "Webbkakor", + "c-privacyppolicy": "Integritetspolicy", "c-legalnotice": "Laglig notis", "c-contact": "Kontakt", "s-inspire": "INSPIRE", "s-site-title": "Inspire-register", - "s-follow-us": "Follow us:", - "s-inspire-community-forum":"INSPIRE community forum", + "s-follow-us": "Följ oss:", + "s-inspire-community-forum":"INSPIRE tjänster", "s-uri": "URI", - "s-thisversion":"This version", - "s-versionhistory":"Version history", - "s-collection-title":"Available items", - "s-narrower-title":"Specialisering", - "s-contact-us":"Contact us", - "s-privacy-policy":"Privacy policy", - "s-cookies":"Cookies", - "s-inspire-resources":"INSPIRE Resources", - "s-search-options":"Search options", + "s-thisversion":"Denna version", + "s-versionhistory":"Versionhistoria", + "s-collection-title":"Tillgängliga kodvärden", + "s-narrower-title":"Detaljerat kodvärde", + "s-contact-us":"Kontakta oss", + "s-privacy-policy":"Integritetspolicy", + "s-cookies":"Webbkakor", + "s-inspire-resources":"INSPIRE resurser", + "s-search-options":"Sökalternativ", "s-search-register-label":"Register", - "s-search-no-result-found":"No results found for \"{1}\"", + "s-search-no-result-found":"Inga resultat funna fö \"{1}\"", "s-pagination-previous":"Föregående", "s-pagination-next":"Nästa", - "s-pagination-page":"Page", - "s-pagination-gotopreviouspage":"Go to previous page", - "s-pagination-gotopage":"Go to page", - "s-pagination-gotonextpage":"Go to next page", - "s-facet-all":"All", - "s-search-results":"Search results ({0})", - "s-search-results-current-page":"Showing results {0} to {1}", + "s-pagination-page":"Sida", + "s-pagination-gotopreviouspage":"Gå till föregående sida", + "s-pagination-gotopage":"Gå till sida", + "s-pagination-gotonextpage":"Gå till följande sida", + "s-facet-all":"Alla", + "s-search-results":"Sökresultat ({0})", + "s-search-results-current-page":"Visar resultaten {0} till {1}", "s-facet-title-register_itemclass_localid":"Register", "s-facet-title-status_uri":"Status", - "s-error-fetch":"An error occurred while trying to access the data service. If the error persist, please visit the {1} to try and give more information about your problem.", - "s-error-404":"The element requested has not been found in the system. If you think this could be an error, please visit the {1} to try and give more information about your problem.", - "s-error-406":"The format or language specified in the request is not available. Please specify a supported format/language. For additional info or if you think this could be an error, please visit the {1} to try and give more information about your problem.", - "s-error-500":"The data service is not able to retrieve the information because of an internal error. If the error persist, please visit the {1} to try and give more information about your problem.", + "s-error-fetch":"Ett fel inträffade vida användandet av tjänsten. Om felet består, vänligen ge mer information om det på sidan {1}.", + "s-error-404":"Det eftersökta elementen kunde inte hittas i systemet. Om detta beror på ett möjligt fel, gå till sidan {1} och ge mer information om ditt problem.", + "s-error-406":"Formatet eller språket är inte tillgängligt. Använd ett format/språk som är tillgängligt. För tilläggsinformation eller om du tror att det kan vara fråga om ett fel, vänligen kontakta {1} och ge mer information om ditt problem.", + "s-error-500":"Datatjänsten kan inte erhålla den sökta informationen på grund av ett internt fel. Om felet består, vänligeen gå till sidan {1} och beskriv ditt problem.", "l-ec-web-presence":"https://ec.europa.eu/info/about-commissions-new-web-presence_{0}", "l-ec-language-policy":"https://ec.europa.eu/info/language-policy_{0}", "l-ec-resources-partners":"https://ec.europa.eu/info/resources-partners_{0}", @@ -64,9 +64,9 @@ "l-ec-other-social":"https://europa.eu/european-union/contact/social-networks_{0}#n:+i:4+e:1+t:+s:", "l-ec-website":"https://ec.europa.eu/info/index_{0}", "s-other-formats":"Tillgängliga format:", - "s-insert-date":"Insert date", - "s-edit-date":"Edit date", - "c-refine-results":"Refine results", - "c-clear-all":"Clear all", - "translatenotavailable":"Not available in Swedish" + "s-insert-date":"Tillägg datum", + "s-edit-date":"Editera datum", + "c-refine-results":"Specificera resultaten", + "c-clear-all":"Töm på alla resultat", + "translatenotavailable":"Inte tillgänglig på svenska" } \ No newline at end of file From e2d1f04c91485ee9000d3fe8a7463663355d6822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Tue, 30 Jan 2024 12:59:52 +0200 Subject: [PATCH 4/6] Consistency with other languages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sami Mäkinen --- .../public_html/js-ecl-v2/i18n/sv.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/sv.json b/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/sv.json index 05ea76d5..82aca2a1 100644 --- a/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/sv.json +++ b/sources/Re3gistry2ServiceWebapp/public_html/js-ecl-v2/i18n/sv.json @@ -24,7 +24,7 @@ "s-inspire": "INSPIRE", "s-site-title": "Inspire-register", "s-follow-us": "Följ oss:", - "s-inspire-community-forum":"INSPIRE tjänster", + "s-inspire-community-forum":"INSPIRE samarbetsforum", "s-uri": "URI", "s-thisversion":"Denna version", "s-versionhistory":"Versionhistoria", @@ -69,4 +69,4 @@ "c-refine-results":"Specificera resultaten", "c-clear-all":"Töm på alla resultat", "translatenotavailable":"Inte tillgänglig på svenska" -} \ No newline at end of file +} From 0702f7d37465f4dd8f26224118c6764940762eb0 Mon Sep 17 00:00:00 2001 From: unaibrrgn <75972112+unaibrrgn@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:22:41 +0100 Subject: [PATCH 5/6] Footer version and conf prop updated --- .../resources/configurations_files/configuration.properties | 2 +- sources/Re3gistry2/src/main/webapp/jsp/includes/footer.inc.jsp | 2 +- sources/Re3gistry2ServiceWebapp/public_html/api.html | 2 +- sources/Re3gistry2ServiceWebapp/public_html/index.html | 2 +- sources/Re3gistry2ServiceWebapp/public_html/search.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources/Re3gistry2/src/main/resources/configurations_files/configuration.properties b/sources/Re3gistry2/src/main/resources/configurations_files/configuration.properties index 2ced33af..038bb372 100644 --- a/sources/Re3gistry2/src/main/resources/configurations_files/configuration.properties +++ b/sources/Re3gistry2/src/main/resources/configurations_files/configuration.properties @@ -33,7 +33,7 @@ application.persistenceunitname=Re3gistry2 # Application version -application.version=Version: 2.5.2 +application.version=Version: 2.5.3 # Localization application.language.available=en-it-es-cs-bg-el-da-de-et-fi-fr-hr-hu-lt-mt-nl-pl-pt-ro-sk-sl-sv diff --git a/sources/Re3gistry2/src/main/webapp/jsp/includes/footer.inc.jsp b/sources/Re3gistry2/src/main/webapp/jsp/includes/footer.inc.jsp index eea9378a..cabf2657 100644 --- a/sources/Re3gistry2/src/main/webapp/jsp/includes/footer.inc.jsp +++ b/sources/Re3gistry2/src/main/webapp/jsp/includes/footer.inc.jsp @@ -30,7 +30,7 @@
Re3gistry version 2.5.2 + class="ecl-footer-core__title ecl-link ecl-link--standalone">Re3gistry version 2.5.3
diff --git a/sources/Re3gistry2ServiceWebapp/public_html/api.html b/sources/Re3gistry2ServiceWebapp/public_html/api.html index fd1bd186..25b6f0e9 100644 --- a/sources/Re3gistry2ServiceWebapp/public_html/api.html +++ b/sources/Re3gistry2ServiceWebapp/public_html/api.html @@ -377,7 +377,7 @@