translation: en proofreading

backend/nix/swlkup-backend.nix

@@ -16,7 +16,7 @@ let
     '';
   };
 
-  version = "0.2.0";
+  version = "0.2.1";
   pname = "swlkup-backend";
   name = "${pname}-${version}";
 

backend/project.clj

@@ -1,4 +1,4 @@
-(defproject swlkup-backend "0.2.0"
+(defproject swlkup-backend "0.2.1"
   :description "supervisor lookup backend"
   :min-lein-version "2.0.0"
   :dependencies [;; core

frontend/cypress/integration/user/02-filter.spec.js

@@ -2,55 +2,55 @@ describe('Test filters on a LookupResult for a token', () => {
   it('Language filters', () => {
     cy.visit('/token/T0p53cret?lng=en')
     cy.log('Default: No filter')
-    cy.get('main').contains('2 Supervisors are matching this filters')
+    cy.get('main').contains('2 Supervisors are matching these filters')
 
     cy.log('Filter: en only')
     cy.get('#en').check({force: true})
-    cy.get('main').contains('1 Supervisor matches this filters')
+    cy.get('main').contains('1 Supervisor matches these filters')
     cy.get('main').contains('Max Müller')
 
     cy.log('Filter: en or it')
     cy.get('#it').check({force: true})
-    cy.get('main').contains('2 Supervisors are matching this filters')
+    cy.get('main').contains('2 Supervisors are matching these filters')
 
     cy.log('Filter: it only')
     cy.get('#en').uncheck({force: true})
-    cy.get('main').contains('1 Supervisor matches this filters')
+    cy.get('main').contains('1 Supervisor matches these filters')
     cy.get('main').contains('Maria Musterfrau')
 
     cy.log('No filter')
     cy.get('#it').uncheck({force: true})
-    cy.get('main').contains('2 Supervisors are matching this filters')
+    cy.get('main').contains('2 Supervisors are matching these filters')
   })
 
   it('Offer filters', () => {
     cy.visit('/token/T0p53cret')
     cy.log('Default: No filter on offers and show filters for offers for individuals only')
-    cy.get('main').contains('2 Supervisors are matching this filters')
+    cy.get('main').contains('2 Supervisors are matching these filters')
     cy.get('input[name=offer]').should('have.length', 2)
 
     cy.log('The same as the default')
     cy.get('#individual').check({force: true})
-    cy.get('main').contains('2 Supervisors are matching this filters')
+    cy.get('main').contains('2 Supervisors are matching these filters')
     cy.get('input[name=offer]').should('have.length', 2)
 
     cy.log('No filter on offers and show filters for offers for individuals and groups')
     cy.get('#group').check({force: true})
-    cy.get('main').contains('2 Supervisors are matching this filters')
+    cy.get('main').contains('2 Supervisors are matching these filters')
     cy.get('input[name=offer]').should('have.length', 7)
 
     cy.log('No filter on offers and show filters for offers for groups only')
     cy.get('#individual').uncheck({force: true})
-    cy.get('main').contains('2 Supervisors are matching this filters')
+    cy.get('main').contains('2 Supervisors are matching these filters')
     cy.get('input[name=offer]').should('have.length', 5)
 
     cy.log('Filter: moderation only')
     cy.get('#moderation').check({force: true})
-    cy.get('main').contains('1 Supervisor matches this filters')
+    cy.get('main').contains('1 Supervisor matches these filters')
 
     cy.log('Changing the target will reset the filter')
     cy.get('#group').uncheck({force: true})
-    cy.get('main').contains('2 Supervisors are matching this filters')
+    cy.get('main').contains('2 Supervisors are matching these filters')
   })
 
   it('Contact filters', () => {

frontend/i18n/const.json

@@ -1,4 +1,4 @@
-{"contact": "TODO",
+{"contact": "supervision@sea-watch.org",
 
  "url_impressum": "https://sea-watch.org/impressum/",
  "url_privacy_policy": "https://sea-watch.org/impressum/datenschutz/",

frontend/i18n/en.json

@@ -11,35 +11,35 @@
 "Sorry, something went wrong.": "Sorry, something went wrong.",
 "Please try again.": "Please try again.",
 
-"introduction_user": "<p>Hello,<br/>we are glad, you want to use our database.<br/>In the following, please specify what you are looking for, so we can suggest suitable supervisors.</p><p>There is a wide range of offers. To keep it simple, we classified them into offers for individuals and offers for groups.</p><p>You can use this database anonymous within the group of people using the same access token. The selected filters will be evaluated directly in your browser, non of the inputs is transfered to any server.</p><p>If you have questions about the database or need help using it, please feel free to contact {{contact}}.<br/>We wish you good success!</p>",
+"introduction_user": "<p>Hello,<br/>we are glad that you want to use our database.<br/>In the following, please specify what you are looking for, so that we can suggest suitable supervisors.</p><p>There are a wide range of offers. To keep it simple, we have classified them into offers for individuals and offers for groups.</p><p>You can use this database anonymously within a group of people using the same access token. The selected filters will be evaluated directly in your browser, and none of the inputs are transferred to any server.</p><p>If you have questions about the database or need help using it, please feel free to contact {{contact}}.<br/>We wish you success!</p>",
 "Filter": "Filter",
-"Only show supervisors speaking one of this languages": "Only show supervisors speaking one of this languages",
+"Only show supervisors speaking one of this languages": "Only show supervisors speaking one of these languages",
 "What kind of offers are you looking for?": "What kind of offers are you looking for?",
 "individual": "Individual",
 "group": "Group",
 "counseling": "Counselling/Coaching for individuals",
-"counseling_desc": "Coaching is an interactive person-centred counselling and support process, limited in time and defined thematically (goal-oriented). Individual counselling relates to technical and/or psychological questions or problems (in the context of professional activities).",
+"counseling_desc": "Coaching is an interactive person-centred counselling and support process, which is limited in time and defined thematically (goal-oriented). Individual counselling relates to technical and/or psychological questions or problems (in the context of professional activities).",
 "crisis_intervention": "Crisis intervention",
-"crisis_intervention_desc": "Crisis intervention offers immediate, short-term, intensive support for acute psychosocial crises in the form of counselling and therapeutic talks.",
+"crisis_intervention_desc": "Crisis intervention offers immediate, short-term and intensive support for acute psychosocial crises in the form of counselling and therapeutic talks.",
 "briefing": "Psychological briefing & debriefing of crews",
 "briefing_desc": "",
 "moderation": "Moderation",
 "moderation_desc": "",
 "mediation": "Mediation",
 "mediation_desc": "Mediation is a structured process for the constructive clarification and resolution of conflicts between at least two parties. Mediation aims at the voluntary, autonomous and consensual resolution of a conflict.",
 "supervision": "Supervision",
-"supervision_desc": "Supervision is a professional field-related counselling for individuals, groups or teams. Supervision offers the possibility of reflection on one's own actions, team reflection, team development and the handling of crisis and conflict situations.",
+"supervision_desc": "Supervision is a professional, field-related counselling for individuals, groups or teams. Supervision offers the possibility of reflection on one's own actions, team reflection, team development and the handling of crisis and conflict situations.",
 "workshops": "Workshops",
 "workshops_desc": "",
 "How would you like to get support?": "How would you like to get support?",
 "inperson": "In Person",
 "remote": "via Phone or Online",
-"Since you seem to be interested in a personal meeting with an supervisor, you can enter your location here, than the list of supervisors will be sorted by distance.": "Since you seem to be interested in a personal meeting with an supervisor, you can enter your location here, than the list of supervisors will be sorted by distance.",
+"Since you seem to be interested in a personal meeting with an supervisor, you can enter your location here, than the list of supervisors will be sorted by distance.": "Since you seem to be interested in a personal meeting with a supervisor, you can enter your location here — the list of supervisors will then be sorted by distance.",
 "Country": "Country",
 "Zip code": "Zip code",
 "Results": "Results",
-"supervisor_matches_one": "1 Supervisor matches this filters",
-"supervisor_matches_other": "{{count}} Supervisors are matching this filters",
+"supervisor_matches_one": "1 Supervisor matches these filters",
+"supervisor_matches_other": "{{count}} Supervisors are matching these filters",
 
 "You have been invited by the SAR Support Network.": "You have been invited by {{email}} to the SAR Support Network.",
 "We would be glad, if you participate by setting up your profile at {{url}}": "We would be glad, if you participate by setting up your profile at {{url}}",
@@ -49,17 +49,17 @@
 "Logout": "Logout",
 "wrong_login": "The login attempt failed, please try again.<br/>When required, you can request a new password.",
 "Reset Password": "Reset Password",
-"reset_password_mail_sent": "If there is an account for this email address, we sent you an email with a link where you can set a new password.<br/>When you are not sure, which email address you used, please ask the NGO that invited you.",
+"reset_password_mail_sent": "If there is an account for this email address, we have sent you an email with a link at which you can set a new password.<br/>When you are not sure, which email address you used, please ask the NGO that invited you.",
 "We received a request to change your password.": "We received a request to change your password.",
 "New Password": "New Password",
 "OK": "OK",
 
 "Delete Profile": "Delete Profile",
-"I'm sure I want delete my account. All data stored about me will be deleted. I will not be able to login any longer.": "I'm sure I want delete my account. All data stored about me will be deleted. I will not be able to login any longer.",
-"Your Account has been deleted.": "Your Account has been deleted.",
+"I'm sure I want delete my account. All data stored about me will be deleted. I will not be able to login any longer.": "I'm sure I want delete my account. All data stored about me will be deleted. I will no longer be able to login.",
+"Your Account has been deleted.": "Your account has been deleted.",
 
-"introduction_supervisor": "<p>Hallo Supervisor,<br/> we are happy, that you want support activists and refugees.</p><p>In the following, we query for the necessary information, required to be found and getting contacted.<br/>You decide yourself, whether you want support all the NGOs of our network or subset. Your data will only be displayed to users, that received an access token by one of the authorized NGOs.</p><p>To allow users to choose a suitable supervisor, we ask for language skills and a list of offers you might be willing to provide.<br/>When you provide support in person, we additionally ask for your country and zip code. This allows users to sort results by distance.<br/>Next to the data evaluated during the search, there are text inputs to describe your specialization and motivation. Optionally you can upload a profile picture.<p>Of course you can change or delete all this data every time.<br/>The application was developed with the approach of privacy by design. Of supervisors we only store the data queried explicitly at this page. About the activists and refugees using the database, non information at all is recorded. Further information can be found at our <1>privacy policy statement</1>.</p><p>If you have questions, please feel free to contact {{contact}}.<br/>Thanks a lot, we are happy you are part of our network!",
-"For which ngos are you offering your services?": "For which ngos are you offering your services?",
+"introduction_supervisor": "<p>Hello Supervisor,<br/> we are happy that you want to support activists and refugees.</p><p>In the following, we ask you for the necessary information required for you to be found and contacted.<br/>You decide yourself whether you want to support all the NGOs in our network or a subset. Your data will only be displayed to users who received an access token from one of the authorized NGOs.</p><p>For allowing users to choose a suitable supervisor, we ask for language skills and a list of offers you might be willing to provide.<br/>When you provide support in person, we additionally ask for your country and zip code. This allows users to sort results by distance.<br/>Next to the data evaluated during the search, there are text inputs for describing your specialization and motivation. Optionally you can also upload a profile picture.<p>Of course you can change or delete all this data at any point.<br/>The application was developed with the approach of privacy by design. For supervisors we only store the data queried explicitly at this page. About the activists and refugees using the database, no information at all is recorded. Further information can be found at our <1>privacy policy statement</1>.</p><p>If you have questions, please feel free to contact {{contact}}.<br/>Thanks a lot, and we are happy that you are part of our network!",
+"For which ngos are you offering your services?": "For which NGOs are you offering your services?",
 "Any": "Any",
 "Only this explicitly selected": "Only this explicitly selected",
 "Languages you speak": "Languages you speak",
@@ -81,20 +81,20 @@
 "Please provide a phone number or an email address.": "Please provide a phone number or an email address.",
 "Please select at least one language.": "Please select at least one language.",
 "Please select at least one offer.": "Please select at least one offer.",
-"Please select the ngos you want support or choose the option `Àny`": "Please select the ngos you want support or choose the option `Àny`",
+"Please select the ngos you want support or choose the option `Àny`": "Please select the NGOs you want support or choose the option `Any`",
 
 "Token": "Token",
-"Create a new Token": "Create a new Token",
-"Description of the group for whom you are creating the token": "Description of the group for whom you are creating the token",
-"token_recommendation": "The Size of the Group, for whom you are creating a separate token is an important decision. We recommend about 10 to 50 People.<br/>The Group should not be to small, since the users are anonymous within this group. Not even administrators of the database can figure out, who of the group is using the token.<br/>If the group is getting too big, it will be difficult to ensure, that the token is not given to unauthorized people or even leaked to the public. In this case it would be required to disable the token immediately. The bigger the group, the more difficult it would be in such a case to distribute a new token to everyone authorized.",
+"Create a new Token": "Create a new token",
+"Description of the group for whom you are creating the token": "Description of the group for which you are creating the token",
+"token_recommendation": "The size of the group, for whom you are creating a separate token is an important decision. We recommend around 10 to 50 People.<br/>The group should not be too small, since users are anonymous within this group. Not even administrators of the database can figure out who from the group is using the token.<br/>If the group gets too big, it will be difficult to ensure, that the token is not given to unauthorized people or even leaked to the public. In this case it would be required to disable the token immediately. The bigger the group, the more difficult it would be in such a case to distribute a new token to everyone authorized.",
 "Create": "Create",
 "Created Tokens": "Created Tokens",
 "Disable": "Disable",
 "I'm sure I want to disable this token.": "I'm sure I want to disable this token.",
-"token_disable_recommendation": "We recommend keeping tokens enabled for a few years after they have been distributed to their users.<br/>In case a token was accidentally published, please disabled it immediately, to protect the supervisor's data. You might want sent a new token to everyone, who loses eligible access by disabling this token.",
+"token_disable_recommendation": "We recommend keeping tokens enabled for a few years after they have been distributed to their users.<br/>In case a token was accidentally published, please disable it immediately in order to protect the supervisor's data. You might want to send a new token to everyone who loses their eligible access through the disabling of the token.",
 "Supervisor": "Supervisor",
-"Invite a new Supervisor": "Invite a new Supervisor",
-"Mail address of Supervisor you want invite": "Mail address of Supervisor you want invite",
+"Invite a new Supervisor": "Invite a new supervisor",
+"Mail address of Supervisor you want invite": "Mail address of the supervisor you want to invite",
 "Invite": "Invite",
 "Active registered supervisors": "Active registered supervisors",
 "New registered supervisors": "New registered supervisors"

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swlkup-frontend",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "private": true,
   "scripts": {
     "generate": "cd codegen && graphql-codegen generate",