Merge branch 'release/1.0.19'

CenterForOpenScience · Nov 10, 2017 · 25a03ce · 25a03ce
2 parents 1e7f421 + d3a2902
commit 25a03ce
Show file tree

Hide file tree

Showing 5 changed files with 1,116 additions and 10 deletions.
diff --git a/app/components/isp-consent-form/consentText.js b/app/components/isp-consent-form/consentText.js
diff --git a/app/components/language-picker/countries.js b/app/components/language-picker/countries.js
@@ -4,7 +4,7 @@
 export const languagesForProduction =  [
     "ar", "bg", "cs", "da", "de", "el", "en", "es", "es-co", "et", "fi", "fr",
     "he", "hi", "hr", "hu", "id", "is", "it", "ja", "ka", "ko", "lt", "lv",
-    "mk", "mr", "ms", "nl", "no", "pl", "pt", "ro", "ru",
+    "mk", "mr", "ms", "nl", "no", "pl", "pt", "pt-pt", "ro", "ru",
     "sk", "sl", "sr", "th", "tr", "uk", "vi", "zh", "zh-hk"
 ];
 

diff --git a/app/locales/nl/translations.js b/app/locales/nl/translations.js
@@ -582,7 +582,7 @@ export default {
                         "label": "Waarde hecht aan kunst en schoonheid."
                     },
                     "36": {
-                        "label": "Het moeilijk vindt om anderen te beïnvloeden"
+                        "label": "Moeite heeft om andere mensen te overtuigen"
                     },
                     "37": {
                         "label": "Soms onbeleefd tegen anderen is"
@@ -603,10 +603,10 @@ export default {
                         "label": "Vol energie is"
                     },
                     "42": {
-                        "label": "Niet goed van vertrouwen is"
+                        "label": "Niet zo snel uitgaat van de goede bedoelingen van anderen"
                     },
                     "43": {
-                        "label": "Betrouwbaar is, zich altijd aan regels en afspraken houdt"
+                        "label": "Betrouwbaar is, verwachtingen altijd waarmaakt"
                     },
                     "44": {
                         "label": "Zijn/haar emoties onder controle houdt"