diff --git a/dev-client/__tests__/snapshot/__snapshots__/CreateProjectScreen-test.tsx.snap b/dev-client/__tests__/snapshot/__snapshots__/CreateProjectScreen-test.tsx.snap index 22918c958..d9268cf83 100644 --- a/dev-client/__tests__/snapshot/__snapshots__/CreateProjectScreen-test.tsx.snap +++ b/dev-client/__tests__/snapshot/__snapshots__/CreateProjectScreen-test.tsx.snap @@ -1164,7 +1164,7 @@ exports[`renders correctly 1`] = ` } } > - All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII). + All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII). - All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII). + All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII). - All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII). + All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII). - Data Collection Requirements + Observation Requirements - All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII). + All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII). Public sites are visible to anyone on the LandPKS data portal." msgid "general##info##privacy_item2" -msgstr "All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII)." +msgstr "All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII)." msgid "general##info##privacy_item3" msgstr "A private site not affiliated with a project is only visible to the person who created it. That person can change the privacy at any time. " @@ -1094,7 +1085,7 @@ msgid "delete_account##confirm##p3" msgstr "The following won’t be deleted:" msgid "delete_account##confirm##p4##b0" -msgstr "data you contributed to a project for which you aren’t the only manager" +msgstr "observations you contributed to a project for which you aren’t the only manager" msgid "delete_account##confirm##p4##b1" msgstr "your Terraso account (including groups, landscapes, and story maps)" @@ -1223,11 +1214,14 @@ msgid "soil##project_settings##pit_required_label" msgstr "Soil pit required" msgid "soil##project_settings##required_data_title" -msgstr "Data Collection Requirements" +msgstr "Observation Requirements" msgid "soil##required_method" msgstr "{{method}} (required)" +msgid "soil##collection_method_summary##soilTexture" +msgstr "Texture Class" + msgid "soil##collection_method##slope" msgstr "Slope and Landscape" @@ -1280,10 +1274,22 @@ msgid "soil##collection_method_description##soilTexture" msgstr "Includes texture class and rock fragment volume" msgid "soil##vertical_cracking##description" +msgstr "Surface cracks develop in clay-rich soils after they dry out." + +msgid "soil##vertical_cracking##no_cracks" msgstr "" -"Vertical cracks may appear on the soil surface when some soils experience changes in moisture or temperature. The cracks may be permanent, or they may disappear after some time.\n" -"\n" -"Vertical cracks are at least $t(soil.vertical_cracking.description_width, {\"context\": \"{{units}}\"}) wide and $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) deep. You should be able to place a pencil inside the cracks." +"No Cracks\n" +"No cracks are visible on the soil surface." + +msgid "soil##vertical_cracking##surface_cracks" +msgstr "" +"Surface Cracks\n" +"Surface cracks are less than $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) deep." + +msgid "soil##vertical_cracking##deep_vertical_cracks" +msgstr "" +"Deep Vertical Cracks\n" +"Deep vertical cracks are at least $t(soil.vertical_cracking.description_width, {\"context\": \"{{units}}\"}) wide and $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) deep. You should be able to place a pencil inside the cracks." msgid "soil##vertical_cracking##description_width_METRIC" msgstr "5 mm" @@ -1370,7 +1376,7 @@ msgid "soil##depth##update_modal##title" msgstr "Change depth?" msgid "soil##depth##update_modal##body" -msgstr "Data that has been entered at this depth will be deleted. This action cannot be undone." +msgstr "Soil pit observations that has been entered at this depth will be deleted. This action cannot be undone." msgid "soil##depth##update_modal##action" msgstr "Change" @@ -1379,7 +1385,7 @@ msgid "soil##depth##delete_modal##title" msgstr "Delete depth?" msgid "soil##depth##delete_modal##body" -msgstr "Data that has been entered at this depth will be deleted. This action cannot be undone." +msgstr "Observations that have been entered at this depth will be deleted. This action cannot be undone." msgid "soil##depth##delete_modal##action" msgstr "Delete" @@ -1409,18 +1415,18 @@ msgid "soil##texture##label" msgstr "Texture Class" msgid "soil##texture##info##title" -msgstr "Soil Texture" +msgstr "Texture Class" msgid "soil##texture##info##description" msgstr "" -"Soil is made up of particles of different sizes. Once you remove all large particles (anything over $t(soil.texture.info.description_diameter,{\"context\":\"{{units}}\"}) in diameter), what is left is a mixture of sand, silt, and clay.\n" +"Soil is made up of particles of different sizes. Once you remove all rock fragments (anything over $t(soil.texture.info.description_diameter,{\"context\":\"{{units}}\"}) in diameter), what is left is a mixture of sand, silt, and clay.\n" "\n" -"Soil texture is determined by the percent of sand, silt, and clay in the soil. Changes in this ratio can have large impacts on the potential of the soil.\n" +"Texture class is determined by the percent of sand, silt, and clay in the soil. Changes in this ratio can have large impacts on the potential of the soil.\n" "\n" "Soil texture determines many important characteristics of your land, including:" msgid "soil##texture##info##description_end" -msgstr "Knowing the soil texture also helps you more accurately identify your soil." +msgstr "Knowing the soil texture helps you more accurately identify your soil." msgid "soil##texture##info##description_diameter_METRIC" msgstr "2mm" @@ -1459,7 +1465,7 @@ msgid "soil##texture##guide##result" msgstr "Soil Texture: {{result}}" msgid "soil##texture##guide##use_label" -msgstr "Use This Texture" +msgstr "Use This Texture Class" msgid "soil##texture##guide##ribbon_length##SM" msgstr "<2.5cm" @@ -1549,7 +1555,7 @@ msgid "soil##texture##guide##grittyness_details_3" msgstr "<0>Not gritty or smooth means that neither of those two textures dominates. You may still feel some sand grains or some soapiness, but the feel of the soil is not predominantly one or the other." msgid "soil##texture##guide_intro" -msgstr "Don’t know your soil texture? Use the step-by-step guide." +msgstr "Don’t know the texture class? Use the step-by-step guide." msgid "soil##texture##use_guide_label" msgstr "Use Guide" diff --git a/dev-client/locales/po/es.po b/dev-client/locales/po/es.po index 758a3fcfb..5d57bba85 100644 --- a/dev-client/locales/po/es.po +++ b/dev-client/locales/po/es.po @@ -5,8 +5,8 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"POT-Creation-Date: 2024-10-18T20:10:11.771Z\n" -"PO-Revision-Date: 2024-10-18T20:10:11.771Z\n" +"POT-Creation-Date: 2024-11-18T16:51:33.737Z\n" +"PO-Revision-Date: 2024-11-18T16:51:33.737Z\n" msgid "welcome##title" msgstr "Bienvenido a LandPKS Soil ID" @@ -155,15 +155,6 @@ msgstr "Configuraciones del sitio" msgid "site##dashboard##delete_button" msgstr "Eliminar este sitio" -msgid "site##dashboard##delete_site_modal##title" -msgstr "¿Eliminar sitio?" - -msgid "site##dashboard##delete_site_modal##body" -msgstr "Esto eliminará el sitio {{siteName}} y todos sus datos de manera permanente. Esto no se puede deshacer." - -msgid "site##dashboard##delete_site_modal##action_name" -msgstr "Eliminar" - msgid "site##dashboard##location_accuracy" msgstr "Precisión de ubicación" @@ -1228,7 +1219,7 @@ msgid "soil##texture##guide##grittyness_help" msgstr "¿Cómo se siente el suelo?" msgid "soil##texture##guide##use_label" -msgstr "Usar esta textura" +msgstr "Usar esta clase de textura" msgid "soil##texture##guide##ribbon_length##SM" msgstr "<2.5cm" @@ -1590,11 +1581,14 @@ msgstr "Requisitos para la recogida de datos" msgid "soil##required_method" msgstr "{{method}} (obligatorio)" +msgid "soil##collection_method_summary##soilTexture" +msgstr "Clase de textura" + msgid "soil##collection_method##slope" msgstr "Incluye la inclinación, forma, aspecto y posición del pendiente del suelo." msgid "soil##collection_method##soilTexture" -msgstr "Incluye clase de textura, porcentaje de arcilla y fragmentos de roca" +msgstr "Textura del suelo" msgid "soil##collection_method##rockFragmentVolume" msgstr "Fragmento de roca" @@ -1642,10 +1636,22 @@ msgid "soil##collection_method_description##soilTexture" msgstr "Incluye clase de textura y volumen de fragmentos de roca" msgid "soil##vertical_cracking##description" +msgstr "Surface cracks develop in clay-rich soils after they dry out." + +msgid "soil##vertical_cracking##no_cracks" msgstr "" -"Pueden aparecer grietas verticales en la superficie cuando algunos suelos experimentan cambios de humedad o temperatura. Las grietas pueden ser permanentes o desaparecer con el tiempo.\n" -"\n" -"Las grietas verticales tienen al menos $t(soil.vertical_cracking.description_width, {\"context\": \"{{units}}\"}) de ancho y $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) de profundidad. Deberías poder colocar un lápiz dentro de las grietas." +"No Cracks\n" +"No cracks are visible on the soil surface." + +msgid "soil##vertical_cracking##surface_cracks" +msgstr "" +"Surface Cracks\n" +"Surface cracks are less than $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) deep." + +msgid "soil##vertical_cracking##deep_vertical_cracks" +msgstr "" +"Deep Vertical Cracks\n" +"Deep vertical cracks are at least $t(soil.vertical_cracking.description_width, {\"context\": \"{{units}}\"}) wide and $t(soil.vertical_cracking.description_depth, {\"context\": \"{{units}}\"}) deep. You should be able to place a pencil inside the cracks." msgid "soil##vertical_cracking##description_width_METRIC" msgstr "5 mm" @@ -1840,7 +1846,7 @@ msgstr "" "\n" "La forma de la pendiente se determina en dos direcciones: pendiente descendente y pendiente transversal.\n" "\n" -"En primer lugar, determina la dirección principal de la pendiente en el lugar. No tomes en cuenta pequeños baches o zanjas; mira alrededor de $t(pendiente.forma.info.descripcion_distancia, {\"context\": \"{{units}}\"}\"}) en todas las direcciones.\n" +"En primer lugar, determina la dirección principal de la pendiente en el lugar. No tomes en cuenta pequeños baches o zanjas; mira alrededor de $t(slope.shape.info.description_distance, {\"context\": \"{{units}}\"}) en todas las direcciones.\n" "\n" "Si lloviera, ¿en qué dirección general fluiría el agua cuesta abajo? Esto se denomina la dirección pendiente abajo.\n" "\n" diff --git a/dev-client/src/screens/SiteSettingsScreen/SiteSettingsScreen.tsx b/dev-client/src/screens/SiteSettingsScreen/SiteSettingsScreen.tsx index 22a8e42ee..4818b4fb8 100644 --- a/dev-client/src/screens/SiteSettingsScreen/SiteSettingsScreen.tsx +++ b/dev-client/src/screens/SiteSettingsScreen/SiteSettingsScreen.tsx @@ -81,11 +81,11 @@ export const SiteSettingsScreen = ({siteId}: Props) => { onPress={onOpen} /> )} - title={t('site.dashboard.delete_site_modal.title')} - body={t('site.dashboard.delete_site_modal.body', { + title={t('project.sites.delete_site_modal.title')} + body={t('project.sites.delete_site_modal.body', { siteName: site.name, })} - actionName={t('site.dashboard.delete_site_modal.action_name')} + actionName={t('project.sites.delete_site_modal.action_name')} handleConfirm={onDelete} /> diff --git a/dev-client/src/translations/en.json b/dev-client/src/translations/en.json index d7a976420..53748c8d5 100644 --- a/dev-client/src/translations/en.json +++ b/dev-client/src/translations/en.json @@ -4,7 +4,7 @@ "version_includes": { "title": "This version includes:", "bullet_1": "Soil identification for US locations", - "bullet_2": "Slope and soil data collection", + "bullet_2": "Slope and soil observations", "bullet_3": "Site notes", "bullet_4": "Project management" }, @@ -89,11 +89,6 @@ "archive_button_help_text": "Mark this site read-only", "settings_title": "Site Settings", "delete_button": "Delete this site", - "delete_site_modal": { - "title": "Delete site?", - "body": "This will permanently delete the site {{siteName}} and all of its data. This cannot be undone.", - "action_name": "Delete" - }, "location_accuracy": "Location Accuracy", "default_title": "Temporary Pin", "speed_dial": { @@ -221,7 +216,7 @@ "header": "Projects", "none": { "header": "You don’t have any projects.", - "info": "Projects let you group sites, set data needs, and manage team members." + "info": "Projects let you group sites, set requirements, and manage team members." }, "learn_more": "Learn more about using projects", "create_button": "Create project", @@ -301,7 +296,7 @@ "delete": "Delete this project", "delete_button": "Delete", "delete_button_prompt": "Delete project?", - "delete_description": "This will permanently delete the project and its sites’ data. This can’t be undone.\n\nProject managers have the option to transfer sites from this project to keep site data." + "delete_description": "This will permanently delete the project and its sites’ observations. This cannot be undone.\n\nProject managers have the option to transfer sites from this project to keep site observations." }, "sites": { "empty_viewer": "This project has no sites yet.", @@ -315,17 +310,17 @@ "delete_site": "Delete Site", "delete_site_modal": { "title": "Delete site?", - "body": "This will permanently delete the site {{siteName}} and all of its data. This cannot be undone.\n\nProject managers can remove the site from this project to retain its data.", + "body": "This will permanently delete the site {{siteName}} and all of its observations. This cannot be undone.\n\nProject managers can remove the site from this project to retain its data.", "action_name": "Delete" }, "remove_site_modal": { "title": "Remove site from project?", - "body": "Only you will have access to this site and its data. Other project team members will no longer have access.", + "body": "Only you will have access to this site. Other project team members will no longer have access.", "action_name": "Remove Site" }, "transfer_site_modal": { "title": "Transfer sites?", - "body": "Transferred sites will use the data settings and team member roles from this project.\n\nIf sites have data entered at different depths than what is specified in this project, that data will be deleted. This can’t be undone.", + "body": "Transferred sites will use the inputs, settings and team member roles from this project.\n\nIf sites have observations entered at different depths than what is specified in this project, rhose observations will be deleted. This cannot be undone.", "action_name": "Transfer" }, "search": { @@ -350,17 +345,17 @@ "title": "Manage Team Member", "project_role": "Project Role", "manager_help": "Can view and edit all aspects of the project and its affiliated sites", - "contributor_help": "Can view, add, and edit site data", - "viewer_help": "Can view site data", + "contributor_help": "Can view site data, and add and edit observations", + "viewer_help": "Can view site data and observations", "remove": "Remove from project", - "remove_help": "Remove the team member’s access to this project, retaining any data contributed to sites", + "remove_help": "Remove the team member’s access to this project, retaining any observations contributed to sites", "confirm_removal_title": "Remove from Project?", - "confirm_removal_body": "This will remove the team member from the project, but will retain their contributed site data.", + "confirm_removal_body": "This will remove the team member from the project. Yheir contributed site observations will be retained.", "confirm_removal_action": "Remove" }, "transfer_sites": { "heading": "Transfer Sites to this Project", - "description": "Transfer LandPKS Soil ID sites you manage to this project. When you transfer sites, they will use the data settings and team member roles from this project.", + "description": "Transfer LandPKS Soil ID sites you manage to this project. When you transfer sites, they will use the inputs, settings and team member roles from this project.", "unaffiliated": "Unaffiliated" }, "form": { @@ -432,7 +427,7 @@ "info": { "privacy_title": "LandPKS Data Privacy", "privacy_item1": "Public sites are visible to anyone on the LandPKS data portal.", - "privacy_item2": "All data entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII).", + "privacy_item2": "All observations entered into the LandPKS Soil ID mobile app is included, except for personally identifiable information (PII).", "privacy_item3": "A private site not affiliated with a project is only visible to the person who created it. That person can change the privacy at any time. ", "privacy_item4": "A project’s privacy setting determines the privacy of its affiliated sites. Sites that belong to a private project are visible to project team members. A project manager can change the privacy at any time. ", "data_portal_link_url": "https://landpks.terraso.org/portal", @@ -488,7 +483,7 @@ }, "p3": "The following won’t be deleted:", "p4": { - "b0": "data you contributed to a project for which you aren’t the only manager", + "b0": "observations you contributed to a project for which you aren’t the only manager", "b1": "your Terraso account (including groups, landscapes, and story maps)" }, "p5": "Type your email address to confirm deletion:", @@ -560,7 +555,7 @@ "add_depth_label": "Add Depth", "project_settings": { "pit_required_label": "Soil pit required", - "required_data_title": "Data Collection Requirements" + "required_data_title": "Observation Requirements" }, "required_method": "{{method}} (required)", "collection_method_summary": { @@ -629,12 +624,12 @@ "depth_end": "depth end", "update_modal": { "title": "Change depth?", - "body": "Data that has been entered at this depth will be deleted. This action cannot be undone.", + "body": "Soil pit observations that has been entered at this depth will be deleted. This action cannot be undone.", "action": "Change" }, "delete_modal": { "title": "Delete depth?", - "body": "Data that has been entered at this depth will be deleted. This action cannot be undone.", + "body": "Observations that have been entered at this depth will be deleted. This action cannot be undone.", "action": "Delete" }, "error": { diff --git a/dev-client/src/translations/es.json b/dev-client/src/translations/es.json index 2b0538c60..8c75618e5 100644 --- a/dev-client/src/translations/es.json +++ b/dev-client/src/translations/es.json @@ -61,11 +61,6 @@ "archive_button_help_text": "Marcar este sitio como sólo lectura", "settings_title": "Configuraciones del sitio", "delete_button": "Eliminar este sitio", - "delete_site_modal": { - "title": "¿Eliminar sitio?", - "body": "Esto eliminará el sitio {{siteName}} y todos sus datos de manera permanente. Esto no se puede deshacer.", - "action_name": "Eliminar" - }, "location_accuracy": "Precisión de ubicación", "default_title": "Marcador temporario", "speed_dial": {