From 12005cd82b84a2e831eff8f64b7719c128819487 Mon Sep 17 00:00:00 2001 From: LJBabbage Date: Tue, 14 Jul 2020 12:36:26 +0100 Subject: [PATCH] CCS corrections mop-up 1 (#119) * CCS corrections mop-up 1 --- .../accommodation/accommodation_type.jsonnet | 2 +- .../blocks/accommodation/own_or_rent.jsonnet | 2 +- .../accommodation/who_rent_from.jsonnet | 2 +- .../other_living_accommodation.jsonnet | 10 +- .../separate_household.jsonnet | 13 +- .../blocks/individual/ethnic_group.jsonnet | 2 +- .../individual/ethnic_group_asian.jsonnet | 2 +- .../individual/ethnic_group_black.jsonnet | 2 +- .../individual/ethnic_group_mixed.jsonnet | 2 +- .../individual/ethnic_group_other.jsonnet | 2 +- .../individual/ethnic_group_white.jsonnet | 2 +- .../past_usual_household_address.jsonnet | 2 +- .../visitor/usual_household_address.jsonnet | 10 +- .../who-lives-here/any_visitors.jsonnet | 2 +- .../anyone_else_list_collector.jsonnet | 4 +- ...yone_else_temp_away_list_collector.jsonnet | 2 +- .../who-lives-here/outside_uk_note.jsonnet | 16 +- .../primary_person_list_collector.jsonnet | 2 +- .../usual_address_in_uk.jsonnet | 1 + .../who_lives_here_interstitial.jsonnet | 2 +- .../who_to_interview_note.jsonnet | 9 +- .../england-wales/ccs_household.jsonnet | 2 +- translations/ccs_household_gb_eng.pot | 167 +++++++++--------- 23 files changed, 115 insertions(+), 145 deletions(-) diff --git a/source/jsonnet/england-wales/ccs/blocks/accommodation/accommodation_type.jsonnet b/source/jsonnet/england-wales/ccs/blocks/accommodation/accommodation_type.jsonnet index befc2388..a57adcf2 100644 --- a/source/jsonnet/england-wales/ccs/blocks/accommodation/accommodation_type.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/accommodation/accommodation_type.jsonnet @@ -4,7 +4,7 @@ local rules = import 'rules.libsonnet'; local question(title) = { id: 'accommodation-type-question', title: title, - instruction: 'Tell respondent to turn to Showcard 3 or show them the options below', + instruction: 'Tell the respondent to turn to Showcard 3 or show them the options below', type: 'General', answers: [ { diff --git a/source/jsonnet/england-wales/ccs/blocks/accommodation/own_or_rent.jsonnet b/source/jsonnet/england-wales/ccs/blocks/accommodation/own_or_rent.jsonnet index 58fe8fe7..44ad442b 100644 --- a/source/jsonnet/england-wales/ccs/blocks/accommodation/own_or_rent.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/accommodation/own_or_rent.jsonnet @@ -3,7 +3,7 @@ local rules = import 'rules.libsonnet'; local question(title, options) = { id: 'own-or-rent-question', title: title, - instruction: 'Tell respondent to turn to Showcard 4 or show them the options below', + instruction: 'Tell the respondent to turn to Showcard 4 or show them the options below', type: 'General', answers: [{ id: 'own-or-rent-answer', diff --git a/source/jsonnet/england-wales/ccs/blocks/accommodation/who_rent_from.jsonnet b/source/jsonnet/england-wales/ccs/blocks/accommodation/who_rent_from.jsonnet index 63d94106..3df1589f 100644 --- a/source/jsonnet/england-wales/ccs/blocks/accommodation/who_rent_from.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/accommodation/who_rent_from.jsonnet @@ -3,7 +3,7 @@ local rules = import 'rules.libsonnet'; local question(title) = { id: 'who-rent-from-question', title: title, - instruction: 'Tell respondent to turn to Showcard 5 or show them the options below', + instruction: 'Tell the respondent to turn to Showcard 5 or show them the options below', type: 'General', answers: [{ id: 'who-rent-from-answer', diff --git a/source/jsonnet/england-wales/ccs/blocks/household-check/other_living_accommodation.jsonnet b/source/jsonnet/england-wales/ccs/blocks/household-check/other_living_accommodation.jsonnet index 973e00c8..fbbf45d7 100644 --- a/source/jsonnet/england-wales/ccs/blocks/household-check/other_living_accommodation.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/household-check/other_living_accommodation.jsonnet @@ -5,6 +5,7 @@ local placeholders = import '../../../lib/placeholders.libsonnet'; id: 'other-living-accommodation', question: { id: 'other-living-accommodation-question', + description: 'For example, separate bedsits, annexes, sheds', title: { text: 'Is there any other living accommodation at {household_address}?', placeholders: [ @@ -12,14 +13,7 @@ local placeholders = import '../../../lib/placeholders.libsonnet'; ], }, type: 'General', - guidance: { - contents: [ - { - description: 'For example, separate bedsits, annexes, sheds etc', - }, - ], - }, - instruction: 'If “Yes” ensure this accommodation is recorded on the Fieldwork Management Tool and interview household separately', + instruction: 'If yes, ensure this accommodation is recorded on the Fieldwork Management Tool and interview household', answers: [{ id: 'other-living-accommodation-answer', mandatory: false, diff --git a/source/jsonnet/england-wales/ccs/blocks/household-check/separate_household.jsonnet b/source/jsonnet/england-wales/ccs/blocks/household-check/separate_household.jsonnet index f9d1d4e3..40bb6b3b 100644 --- a/source/jsonnet/england-wales/ccs/blocks/household-check/separate_household.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/household-check/separate_household.jsonnet @@ -5,6 +5,8 @@ local placeholders = import '../../../lib/placeholders.libsonnet'; id: 'separate-household', question: { id: 'separate-household-question', + description: 'A household is one person living alone, or a group of people (not necessarily related), who share cooking facilities and share a living room, or sitting room, or dining area', + instruction: 'If yes, record these people on the Fieldwork Management Tool and interview them, if at this address', title: { text: 'Was there anyone living at your address on {census_date} that you have not included because they lived in a separate household?', placeholders: [ @@ -12,20 +14,13 @@ local placeholders = import '../../../lib/placeholders.libsonnet'; ], }, type: 'General', - guidance: { - contents: [ - { - description: 'A household is one person living alone, or a group of people (not necessarily related), who share cooking facilities and share a living room, or sitting room, or dining area', - }, - ], - }, answers: [{ id: 'separate-household-answer', mandatory: false, options: [ { - label: 'Yes, record these people on the Fieldwork Management Tool and interview them', - value: 'Yes, record these people on the Fieldwork Management Tool and interview them', + label: 'Yes', + value: 'Yes', }, { label: 'No', diff --git a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group.jsonnet b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group.jsonnet index 650be294..a4e4b064 100644 --- a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group.jsonnet @@ -42,7 +42,7 @@ local question(title, regionStrings, region_code) = ( { label: 'Mixed or Multiple ethnic groups', value: 'Mixed or Multiple ethnic groups', - description: 'Includes White and Black Caribbean, White and Black African, White and Asian or any other Mixed or Multiple', + description: 'Includes White and Black Caribbean, White and Black African, White and Asian or any other Mixed or Multiple background', }, { label: regionStrings.asianOption, diff --git a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_asian.jsonnet b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_asian.jsonnet index b8391e7e..e8a40d80 100644 --- a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_asian.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_asian.jsonnet @@ -57,7 +57,7 @@ local question(title, instruction) = { id: 'asian-ethnic-group-answer-other', type: 'TextField', mandatory: false, - label: 'Enter Asian background', + label: 'Enter Asian ethnic group or background', }, }, ], diff --git a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_black.jsonnet b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_black.jsonnet index e22519d9..65a0f066 100644 --- a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_black.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_black.jsonnet @@ -56,7 +56,7 @@ local question(title, instruction) = { id: 'black-ethnic-group-answer-other', type: 'TextField', mandatory: false, - label: 'Enter Black, Black British or Caribbean background', + label: 'Enter Black, Black British or Caribbean ethnic group or background', }, }, ], diff --git a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_mixed.jsonnet b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_mixed.jsonnet index 34d37c32..6643d93c 100644 --- a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_mixed.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_mixed.jsonnet @@ -34,7 +34,7 @@ local question(title, instruction) = { id: 'mixed-ethnic-group-answer-other', type: 'TextField', mandatory: false, - label: 'Enter Mixed or Multiple background', + label: 'Enter Mixed or Multiple ethnic group or background', }, }, ], diff --git a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_other.jsonnet b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_other.jsonnet index 066145fb..52bb59a1 100644 --- a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_other.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_other.jsonnet @@ -26,7 +26,7 @@ local question(title, instruction) = { id: 'other-ethnic-group-answer-other', type: 'TextField', mandatory: false, - label: 'Enter other ethnic group', + label: 'Enter other ethnic group or background', }, }, ], diff --git a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_white.jsonnet b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_white.jsonnet index 808b4789..38f199d7 100644 --- a/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_white.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/individual/ethnic_group_white.jsonnet @@ -51,7 +51,7 @@ local question(title, instruction, region_code) = ( id: 'white-ethnic-group-answer-other', type: 'TextField', mandatory: false, - label: 'Enter White background', + label: 'Enter White ethnic group or background', }, }, ], diff --git a/source/jsonnet/england-wales/ccs/blocks/individual/past_usual_household_address.jsonnet b/source/jsonnet/england-wales/ccs/blocks/individual/past_usual_household_address.jsonnet index fd397cc0..dcb468d0 100644 --- a/source/jsonnet/england-wales/ccs/blocks/individual/past_usual_household_address.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/individual/past_usual_household_address.jsonnet @@ -36,7 +36,7 @@ local nonProxyTitle = { ], }; local proxyTitle = { - text: 'Was {person_name_possessive} usual address one year ago, on {year_before_census_date}, the same as their usual address on {census_date}?', + text: 'Was {person_name_possessive} usual address one year ago, on {year_before_census_date}, the same as their usual address on {census_date}?', placeholders: [ placeholders.personNamePossessive, placeholders.yearBeforeCensusDate, diff --git a/source/jsonnet/england-wales/ccs/blocks/visitor/usual_household_address.jsonnet b/source/jsonnet/england-wales/ccs/blocks/visitor/usual_household_address.jsonnet index fe24d04f..254d30ec 100644 --- a/source/jsonnet/england-wales/ccs/blocks/visitor/usual_household_address.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/visitor/usual_household_address.jsonnet @@ -30,12 +30,12 @@ local question(additionalAnwerOptions=[]) = { mandatory: false, options: additionalAnwerOptions + [ { - label: 'An address in the UK', - value: 'An address in the UK', + label: 'Yes', + value: 'Yes', }, { - label: 'An address outside the UK', - value: 'An address outside the UK', + label: 'No', + value: 'No', description: 'Select to enter answer', detail_answer: { id: 'usual-address-household-answer-other', @@ -71,7 +71,7 @@ local question(additionalAnwerOptions=[]) = { { id: 'usual-address-household-answer', condition: 'equals', - value: 'An address in the UK', + value: 'Yes', }, ], }, diff --git a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/any_visitors.jsonnet b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/any_visitors.jsonnet index 05a2e411..9d05467c 100644 --- a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/any_visitors.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/any_visitors.jsonnet @@ -37,7 +37,7 @@ local question(livesAtHouseholdAddress) = { id: 'any-visitors-question', title: questionTitle(livesAtHouseholdAddress), description: 'A visitor is a person staying overnight who usually lives at another address', - instruction: 'Tell the respondent to turn to Showcard 13 or show them the Electronic Showcard below', + instruction: 'Tell the respondent to turn to Showcard 13 or show them the Electronic Showcard below', definitions: [ { title: 'Electronic Showcard', diff --git a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/anyone_else_list_collector.jsonnet b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/anyone_else_list_collector.jsonnet index 4a840d50..7c2273d0 100644 --- a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/anyone_else_list_collector.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/anyone_else_list_collector.jsonnet @@ -68,7 +68,7 @@ local editQuestion(questionTitle) = { id: 'anyone-usually-live-at-question', title: questionTitle, description: 'Remember to only include those people who share cooking facilities and share a living room, or sitting room, or dining area.

Anyone else is not part of your household and will be interviewed separately.

', - instruction: 'Tell the respondent to turn to Showcard 2 or show them the Electronic Showcard below', + instruction: 'Tell the respondent to turn to Showcard 2 or show them the Electronic Showcard below', definitions: [ { title: 'Electronic Showcard', @@ -128,7 +128,7 @@ local editQuestion(questionTitle) = { ], }, description: 'Remember to only include those people who share cooking facilities and share a living room, or sitting room, or dining area.

Anyone else is not part of your household and will be interviewed separately.

', - instruction: 'Tell the respondent to turn to Showcard 2 or show them the Electronic Showcard below', + instruction: 'Tell the respondent to turn to Showcard 2 or show them the Electronic Showcard below', definitions: [ { title: 'Electronic Showcard', diff --git a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/anyone_else_temp_away_list_collector.jsonnet b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/anyone_else_temp_away_list_collector.jsonnet index b296153b..a2495f26 100644 --- a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/anyone_else_temp_away_list_collector.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/anyone_else_temp_away_list_collector.jsonnet @@ -58,7 +58,7 @@ local editQuestion(questionTitle) = { id: 'anyone-else-temp-away-confirmation-question', type: 'General', title: 'Apart from the people already included, is there anyone else who was temporarily away or staying that you need to add?', - instruction: 'Tell the respondent to double-check Showcard 2 or show them the Electronic Showcard below', + instruction: 'Tell the respondent to double-check Showcard 2 or show them the Electronic Showcard below', definitions: [ { title: 'Electronic Showcard', diff --git a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/outside_uk_note.jsonnet b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/outside_uk_note.jsonnet index fc33b5b3..d98fc73f 100644 --- a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/outside_uk_note.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/outside_uk_note.jsonnet @@ -5,16 +5,12 @@ local placeholders = import '../../../lib/placeholders.libsonnet'; id: 'outside-uk-note', content: { title: 'Interviewer Note', - contents: [ - { - description: { - text: 'If the respondent was living outside the UK on Sunday {census_date}, please explain that they do not need to complete the questionnaire and end interview.', - placeholders: [ - placeholders.censusDate, - ], - }, - }, - ], + instruction: { + text: 'If the respondent was living outside the UK on Sunday {census_date}, please explain that they do not need to complete the questionnaire and end interview', + placeholders: [ + placeholders.censusDate, + ], + }, }, routing_rules: [ { diff --git a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/primary_person_list_collector.jsonnet b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/primary_person_list_collector.jsonnet index 603f3f7f..2e636255 100644 --- a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/primary_person_list_collector.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/primary_person_list_collector.jsonnet @@ -47,7 +47,7 @@ local placeholders = import '../../../lib/placeholders.libsonnet'; placeholders.censusDate, ], }, - instruction: 'Tell the respondent to turn to Showcard 1 or show them the Electronic Showcard below', + instruction: 'Tell the respondent to turn to Showcard 1 or show them the Electronic Showcard below', definitions: [ { title: 'Electronic Showcard', diff --git a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/usual_address_in_uk.jsonnet b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/usual_address_in_uk.jsonnet index e4fc76b3..43e3af47 100644 --- a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/usual_address_in_uk.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/usual_address_in_uk.jsonnet @@ -5,6 +5,7 @@ local placeholders = import '../../../lib/placeholders.libsonnet'; id: 'usual-address-in-uk', question: { id: 'usual-address-in-uk-question', + description: '“Usual address” means the address at which you generally spend most time, for most people this will be their permanent or family home', title: { text: 'On Sunday {census_date}, was your usual address in the UK?', placeholders: [ diff --git a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/who_lives_here_interstitial.jsonnet b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/who_lives_here_interstitial.jsonnet index 8ff5da7b..0c58941e 100644 --- a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/who_lives_here_interstitial.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/who_lives_here_interstitial.jsonnet @@ -4,7 +4,7 @@ local placeholders = import '../../../lib/placeholders.libsonnet'; type: 'Interstitial', id: 'who-lives-here-interstitial', content: { - title: 'Household definition', + title: 'Your household', contents: [ { description: { diff --git a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/who_to_interview_note.jsonnet b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/who_to_interview_note.jsonnet index 784a647e..f56ed285 100644 --- a/source/jsonnet/england-wales/ccs/blocks/who-lives-here/who_to_interview_note.jsonnet +++ b/source/jsonnet/england-wales/ccs/blocks/who-lives-here/who_to_interview_note.jsonnet @@ -3,14 +3,7 @@ id: 'who-to-interview-note', content: { title: 'Interviewer Note', - contents: [ - { - description: 'Only interview a person who was usually living at the property on census night.', - }, - { - description: 'If none of those household members are available, you must save and sign out of the survey and return to the address to interview one of them at a later date.', - }, - ], + instruction: 'If the respondent was not living at the property on census night, but other current household members were, you must speak to one of those household members instead.

If none of those household members are available, you must return to the address to interview one of them at a later date.

', }, routing_rules: [ { diff --git a/source/jsonnet/england-wales/ccs_household.jsonnet b/source/jsonnet/england-wales/ccs_household.jsonnet index 0fe9be47..361dd33c 100644 --- a/source/jsonnet/england-wales/ccs_household.jsonnet +++ b/source/jsonnet/england-wales/ccs_household.jsonnet @@ -110,7 +110,7 @@ function(region_code, census_month_year_date) { sections: [ { id: 'who-lives-here-section', - title: 'This section is now complete', + title: 'Household members and visitors', summary: { show_on_completion: true, items: [ diff --git a/translations/ccs_household_gb_eng.pot b/translations/ccs_household_gb_eng.pot index eaf55c8d..0920115d 100644 --- a/translations/ccs_household_gb_eng.pot +++ b/translations/ccs_household_gb_eng.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-07-09 09:37+0100\n" +"POT-Creation-Date: 2020-07-14 12:15+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,7 @@ msgid "Voluntary" msgstr "" #. Section title -msgid "This section is now complete" +msgid "Household members and visitors" msgstr "" #. Section title @@ -106,7 +106,7 @@ msgid "Visitors staying overnight on {census_date}" msgstr "" #. Content page main heading -msgid "Household definition" +msgid "Your household" msgstr "" #. Content page main heading @@ -122,14 +122,14 @@ msgid "Household and accommodation" msgstr "" #. Content page description -msgctxt "Household definition" +msgctxt "Your household" msgid "" "All the questions are about the people in your household on Sunday " "{census_date}." msgstr "" #. Content page description -msgctxt "Household definition" +msgctxt "Your household" msgid "" "A household is one person living alone, or a group of people " "(not necessarily related), who share cooking facilities, and share a\n" @@ -137,40 +137,17 @@ msgid "" msgstr "" #. Content page description -msgctxt "Household definition" +msgctxt "Your household" msgid "" "Some of the questions that I will ask have showcards to help you to " "answer." msgstr "" #. Content page description -msgctxt "Household definition" +msgctxt "Your household" msgid "I will show you these on paper/on the phone screen." msgstr "" -#. Content page description -msgctxt "Interviewer Note" -msgid "" -"If the respondent was living outside the UK on Sunday {census_date}, " -"please explain that they do not need to complete the questionnaire and " -"end interview." -msgstr "" - -#. Content page description -msgctxt "Interviewer Note" -msgid "" -"Only interview a person who was usually living at the property on census " -"night." -msgstr "" - -#. Content page description -msgctxt "Interviewer Note" -msgid "" -"If none of those household members are available, you must save and sign " -"out of the survey and return to the address to interview one of them at a" -" later date." -msgstr "" - #. Content page description msgctxt "Interviewer Note" msgid "" @@ -525,7 +502,7 @@ msgstr "" #. Question text msgid "" -"Was {person_name_possessive} usual address one year ago, on " +"Was {person_name_possessive} usual address one year ago, on " "{year_before_census_date}, the same as their usual address on " "{census_date}?" msgstr "" @@ -602,6 +579,13 @@ msgid "" "not included because they lived in a separate household?" msgstr "" +#. Question description +msgctxt "On Sunday {census_date}, was your usual address in the UK?" +msgid "" +"“Usual address” means the address at which you generally spend most time," +" for most people this will be their permanent or family home" +msgstr "" + #. Question description msgctxt "Did anyone else usually live in your household on Sunday {census_date}?" msgid "" @@ -657,11 +641,27 @@ msgctxt "" msgid "Include casual or temporary work, even if only for one hour" msgstr "" +#. Question description +msgctxt "Is there any other living accommodation at {household_address}?" +msgid "For example, separate bedsits, annexes, sheds" +msgstr "" + +#. Question description +msgctxt "" +"Was there anyone living at your address on {census_date} that you have " +"not included because they lived in a separate household?" +msgid "" +"A household is one person living alone, or a group of " +"people (not necessarily related), who share cooking facilities " +"and share a living room, or sitting " +"room, or dining area" +msgstr "" + #. Question instruction msgctxt "Were you usually living at {household_address} on Sunday {census_date}?" msgid "" "Tell the respondent to turn to Showcard 1 or show them " -"the Electronic Showcard below" +"the Electronic Showcard below" msgstr "" #. Question instruction @@ -675,7 +675,7 @@ msgstr "" msgctxt "Did anyone else usually live in your household on Sunday {census_date}?" msgid "" "Tell the respondent to turn to Showcard 2 or show them " -"the Electronic Showcard below" +"the Electronic Showcard below" msgstr "" #. Question instruction @@ -684,7 +684,7 @@ msgctxt "" "temporarily away or staying that you need to add?" msgid "" "Tell the respondent to double-check Showcard 2 or show " -"them the Electronic Showcard below" +"them the Electronic Showcard below" msgstr "" #. Question instruction @@ -693,7 +693,7 @@ msgctxt "" " {census_date}?" msgid "" "Tell the respondent to turn to Showcard 13 or show them " -"the Electronic Showcard below" +"the Electronic Showcard below" msgstr "" #. Question instruction @@ -702,7 +702,7 @@ msgctxt "" "{census_date}?" msgid "" "Tell the respondent to turn to Showcard 13 or show them " -"the Electronic Showcard below" +"the Electronic Showcard below" msgstr "" #. Question instruction @@ -722,15 +722,15 @@ msgstr "" #. Question instruction msgctxt "What type of accomodation is this?" msgid "" -"Tell respondent to turn to Showcard 3 or show them the " -"options below" +"Tell the respondent to turn to Showcard 3 or show them " +"the options below" msgstr "" #. Question instruction msgctxt "What type of accomodation was that?" msgid "" -"Tell respondent to turn to Showcard 3 or show them the " -"options below" +"Tell the respondent to turn to Showcard 3 or show them " +"the options below" msgstr "" #. Question instruction @@ -778,29 +778,29 @@ msgstr "" #. Question instruction msgctxt "Does your household own or rent this accommodation?" msgid "" -"Tell respondent to turn to Showcard 4 or show them the " -"options below" +"Tell the respondent to turn to Showcard 4 or show them " +"the options below" msgstr "" #. Question instruction msgctxt "Did your household own or rent that accommodation?" msgid "" -"Tell respondent to turn to Showcard 4 or show them the " -"options below" +"Tell the respondent to turn to Showcard 4 or show them " +"the options below" msgstr "" #. Question instruction msgctxt "Who is your landlord?" msgid "" -"Tell respondent to turn to Showcard 5 or show them the " -"options below" +"Tell the respondent to turn to Showcard 5 or show them " +"the options below" msgstr "" #. Question instruction msgctxt "Who was your landlord?" msgid "" -"Tell respondent to turn to Showcard 5 or show them the " -"options below" +"Tell the respondent to turn to Showcard 5 or show them " +"the options below" msgstr "" #. Question instruction @@ -1007,8 +1007,17 @@ msgstr "" #. Question instruction msgctxt "Is there any other living accommodation at {household_address}?" msgid "" -"If “Yes” ensure this accommodation is recorded on the Fieldwork " -"Management Tool and interview household separately" +"If yes, ensure this accommodation is recorded on the Fieldwork Management" +" Tool and interview household" +msgstr "" + +#. Question instruction +msgctxt "" +"Was there anyone living at your address on {census_date} that you have " +"not included because they lived in a separate household?" +msgid "" +"If yes, record these people on the Fieldwork Management Tool and " +"interview them, if at this address" msgstr "" #. Question definition link @@ -1291,22 +1300,6 @@ msgctxt "Are you sure you want to remove {person_name}?" msgid "All of the data entered about this person will be deleted" msgstr "" -#. Question guidance description -msgctxt "Is there any other living accommodation at {household_address}?" -msgid "For example, separate bedsits, annexes, sheds etc" -msgstr "" - -#. Question guidance description -msgctxt "" -"Was there anyone living at your address on {census_date} that you have " -"not included because they lived in a separate household?" -msgid "" -"A household is one person living alone, or a group of " -"people (not necessarily related), who share cooking facilities " -"and share a living room, or sitting " -"room, or dining area" -msgstr "" - #. Answer msgctxt "What is your full name?" msgid "First name" @@ -2562,7 +2555,7 @@ msgstr "" #. Answer option msgctxt "" -"Was {person_name_possessive} usual address one year ago, on " +"Was {person_name_possessive} usual address one year ago, on " "{year_before_census_date}, the same as their usual address on " "{census_date}?" msgid "Yes" @@ -2570,7 +2563,7 @@ msgstr "" #. Answer option msgctxt "" -"Was {person_name_possessive} usual address one year ago, on " +"Was {person_name_possessive} usual address one year ago, on " "{year_before_census_date}, the same as their usual address on " "{census_date}?" msgid "No, living elsewhere in the UK" @@ -2578,7 +2571,7 @@ msgstr "" #. Answer option msgctxt "" -"Was {person_name_possessive} usual address one year ago, on " +"Was {person_name_possessive} usual address one year ago, on " "{year_before_census_date}, the same as their usual address on " "{census_date}?" msgid "No, living outside the UK" @@ -2928,12 +2921,12 @@ msgstr "" #. Answer option msgctxt "Did {person_name} usually live in the UK?" -msgid "An address in the UK" +msgid "Yes" msgstr "" #. Answer option msgctxt "Did {person_name} usually live in the UK?" -msgid "An address outside the UK" +msgid "No" msgstr "" #. Answer option @@ -2955,9 +2948,7 @@ msgstr "" msgctxt "" "Was there anyone living at your address on {census_date} that you have " "not included because they lived in a separate household?" -msgid "" -"Yes, record these people on the Fieldwork Management Tool and interview " -"them" +msgid "Yes" msgstr "" #. Answer option @@ -3086,7 +3077,7 @@ msgstr "" msgctxt "What is your ethnic group?" msgid "" "Includes White and Black Caribbean, White and Black African, White and " -"Asian or any other Mixed or Multiple" +"Asian or any other Mixed or Multiple background" msgstr "" #. Answer option description @@ -3122,7 +3113,7 @@ msgstr "" msgctxt "What is {person_name_possessive} ethnic group?" msgid "" "Includes White and Black Caribbean, White and Black African, White and " -"Asian or any other Mixed or Multiple" +"Asian or any other Mixed or Multiple background" msgstr "" #. Answer option description @@ -3278,7 +3269,7 @@ msgid "Moved since {census_date}" msgstr "" #. Answer option description -#. For answer option: An address outside the UK +#. For answer option: No msgctxt "Did {person_name} usually live in the UK?" msgid "Select to enter answer" msgstr "" @@ -3292,7 +3283,7 @@ msgstr "" #. Detail answer label #. For answer option: Any other White background msgctxt "Which one best describes your White ethnic group or background?" -msgid "Enter White background" +msgid "Enter White ethnic group or background" msgstr "" #. Detail answer label @@ -3300,7 +3291,7 @@ msgstr "" msgctxt "" "Which one best describes {person_name_possessive} White ethnic " "group or background?" -msgid "Enter White background" +msgid "Enter White ethnic group or background" msgstr "" #. Detail answer label @@ -3308,7 +3299,7 @@ msgstr "" msgctxt "" "Which one best describes your Mixed or Multiple ethnic group or " "background?" -msgid "Enter Mixed or Multiple background" +msgid "Enter Mixed or Multiple ethnic group or background" msgstr "" #. Detail answer label @@ -3316,7 +3307,7 @@ msgstr "" msgctxt "" "Which one best describes {person_name_possessive} Mixed or " "Multiple ethnic group or background?" -msgid "Enter Mixed or Multiple background" +msgid "Enter Mixed or Multiple ethnic group or background" msgstr "" #. Detail answer label @@ -3324,7 +3315,7 @@ msgstr "" msgctxt "" "Which one best describes your Asian or Asian British ethnic group or " "background?" -msgid "Enter Asian background" +msgid "Enter Asian ethnic group or background" msgstr "" #. Detail answer label @@ -3332,7 +3323,7 @@ msgstr "" msgctxt "" "Which one best describes {person_name_possessive} Asian or Asian" " British ethnic group or background?" -msgid "Enter Asian background" +msgid "Enter Asian ethnic group or background" msgstr "" #. Detail answer label @@ -3348,7 +3339,7 @@ msgstr "" msgctxt "" "Which one best describes your Black, Black British, Caribbean or African " "ethnic group or background?" -msgid "Enter Black, Black British or Caribbean background" +msgid "Enter Black, Black British or Caribbean ethnic group or background" msgstr "" #. Detail answer label @@ -3364,13 +3355,13 @@ msgstr "" msgctxt "" "Which one best describes {person_name_possessive} Black, Black " "British, Caribbean or African ethnic group or background?" -msgid "Enter Black, Black British or Caribbean background" +msgid "Enter Black, Black British or Caribbean ethnic group or background" msgstr "" #. Detail answer label #. For answer option: Any other ethnic group msgctxt "Which one best describes your other ethnic group or background?" -msgid "Enter other ethnic group" +msgid "Enter other ethnic group or background" msgstr "" #. Detail answer label @@ -3378,11 +3369,11 @@ msgstr "" msgctxt "" "Which one best describes {person_name_possessive} other ethnic " "group or background?" -msgid "Enter other ethnic group" +msgid "Enter other ethnic group or background" msgstr "" #. Detail answer label -#. For answer option: An address outside the UK +#. For answer option: No msgctxt "Did {person_name} usually live in the UK?" msgid "Enter current name of country" msgstr ""