From cae892b358f1bc6957eaa7d6ff8e5f865dd83fae Mon Sep 17 00:00:00 2001
From: Drew Proebstel <dproebstel@codeforamerica.org>
Date: Wed, 5 Feb 2025 12:57:18 -0800
Subject: [PATCH 1/5] content updated

---
 .../questions/eligible/_id_supported.html.erb |  3 +-
 .../id_grocery_credit_review/edit.html.erb    |  3 ++
 .../id_health_insurance_premium/edit.html.erb |  2 +-
 .../questions/id_sales_use_tax/edit.html.erb  |  7 +++-
 config/locales/en.yml                         | 33 +++++++++++--------
 config/locales/es.yml                         | 33 +++++++++++--------
 6 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/app/views/state_file/questions/eligible/_id_supported.html.erb b/app/views/state_file/questions/eligible/_id_supported.html.erb
index b9173a041e..0176768ad6 100644
--- a/app/views/state_file/questions/eligible/_id_supported.html.erb
+++ b/app/views/state_file/questions/eligible/_id_supported.html.erb
@@ -1,7 +1,8 @@
 <ul class="list--bulleted">
   <li><%= t(".child_care_deduction") %></li>
   <li><%= t(".interest_from_obligations") %></li>
-  <li><%= t(".social_security_retirement_deduction") %></li>
+  <li><%= t(".social_security_railroad_deduction") %></li>
+  <li><%= t(".retirement_benefits_deduction") %></li>
   <li><%= t(".health_insurance_premiums_subtraction") %></li>
   <li><%= t(".id_child_tax_credit") %></li>
   <li><a href=" https://tax.idaho.gov/taxes/income-tax/individual-income/popular-credits-and-deductions/idaho-grocery-credit" target="_blank" rel="noopener nofollow"><%= t(".id_grocery_credit") %></a></li>
diff --git a/app/views/state_file/questions/id_grocery_credit_review/edit.html.erb b/app/views/state_file/questions/id_grocery_credit_review/edit.html.erb
index bf0d30655f..b41f2e0384 100644
--- a/app/views/state_file/questions/id_grocery_credit_review/edit.html.erb
+++ b/app/views/state_file/questions/id_grocery_credit_review/edit.html.erb
@@ -5,6 +5,9 @@
 <% content_for :card do %>
   <h1 class="h2"><%= t('.title_html', grocery_credit_amount: grocery_credit_amount) %></h1>
 
+  <p><%= t('.body_p1') %></p>
+  <p><%= t('.body_p2') %></p>
+
   <%= form_with model: @form, url: { action: :update }, method: :put, local: true, builder: VitaMinFormBuilder, class: 'form-card' do |f| %>
     <div class="white-group">
       <p class="spacing-below-0"><%= t(".would_you_like_to_donate") %></p>
diff --git a/app/views/state_file/questions/id_health_insurance_premium/edit.html.erb b/app/views/state_file/questions/id_health_insurance_premium/edit.html.erb
index 84038ea4d8..eb9727793b 100644
--- a/app/views/state_file/questions/id_health_insurance_premium/edit.html.erb
+++ b/app/views/state_file/questions/id_health_insurance_premium/edit.html.erb
@@ -26,7 +26,7 @@
         </div>
 
         <div class="white-group">
-          <div class="spacing-below-15"><%= t(".qualifying_amount_help_text", year: MultiTenantService.statefile.current_tax_year) %></div>
+          <div class="spacing-below-15"><%= t(".qualifying_amount_help_text_html", year: MultiTenantService.statefile.current_tax_year) %></div>
           <p class="text--help text--small spacing-below-0"><b><%= t(".amount_paid_helper_text", year: MultiTenantService.statefile.current_tax_year) %></b></p>
           <%= f.vita_min_money_field(:health_insurance_paid_amount, "", classes: ["form-width--long"]) %>
         </div>
diff --git a/app/views/state_file/questions/id_sales_use_tax/edit.html.erb b/app/views/state_file/questions/id_sales_use_tax/edit.html.erb
index b7414dcdcf..9eb4b3069a 100644
--- a/app/views/state_file/questions/id_sales_use_tax/edit.html.erb
+++ b/app/views/state_file/questions/id_sales_use_tax/edit.html.erb
@@ -21,7 +21,7 @@
       </div>
       <div class="question-with-follow-up__follow-up" id="sut-field">
         <div class="white-group">
-          <div class="spacing-below-15"><%= t(".unpaid_sales_use_tax_label_html") %></div>
+          <div class="spacing-below-15"><%= t(".unpaid_sales_use_tax_label_html", year: MultiTenantService.statefile.current_tax_year) %></div>
           <p class="text--help text--small spacing-below-0"><b><%= t(".sales_use_tax_helper_text") %></b></p>
           <%= f.vita_min_money_field(:total_purchase_amount, "", classes: ["form-width--long"]) %>
         </div>
@@ -31,6 +31,11 @@
         <p><button href="#" class="reveal__button"><%= t('.sales_tax_title') %></button></p>
         <div class="reveal__content"><%= t('.sales_tax_content') %></div>
       </div>
+
+      <div class="reveal">
+        <p><button href="#" class="reveal__button"><%= t('.use_tax_title') %></button></p>
+        <div class="reveal__content"><%= t('.use_tax_content') %></div>
+      </div>
     </div>
 
     <% if params[:return_to_review].present? %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 74e46f3863..f1d2e8bf6f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2525,12 +2525,13 @@ en:
           long_term_care_insurance_subtraction: Long-term Care Insurance Subtraction
           maintaining_elderly_disabled_credit: Credit for Maintaining a Home for the Elderly or Disabled
         id_supported:
-          child_care_deduction: Child and Dependent Care Deduction
+          child_care_deduction: Idaho Child and Dependent Care Subtraction
           health_insurance_premiums_subtraction: Health Insurance Premiums subtraction
           id_child_tax_credit: Idaho Child Tax Credit
           id_grocery_credit: Idaho Grocery Credit
-          interest_from_obligations: Interest from U.S government obligations
-          social_security_retirement_deduction: Social Security and Retirement Benefits deductions
+          interest_from_obligations: Interest from U.S government obligations subtraction
+          social_security_railroad_deduction: Social Security and Railroad Retirement subtraction
+          retirement_benefits_deduction: Retirement Benefits deductions
         md_reveals:
           body1_html: |
             <ul>
@@ -2867,10 +2868,10 @@ en:
           emergency_rental_assistance_explanation: The Emergency Rental Assistance (ERA) program is a federal program that gives money to help households pay for rent and utility bills. It was created in response to the Covid-19 pandemic.
           subtitle_1: For this tax season, this service will only be able to serve people with specific tax situations. Please answer the following questions to find out if you can use it.
           title: First, let's see if you can use this service to file your %{filing_year} Idaho taxes
-          withdrew_msa_fthb: 'In %{filing_year}, did you (or your spouse if you’re filing together) withdraw money from any of the following:'
+          withdrew_msa_fthb: Did any of the following scenarios apply to you or your spouse in %{filing_year}
           withdrew_msa_fthb_list:
-            bullet_1_html: Withdrew money from our Idaho Medical Savings Account and used it for a <a href="%{link}" target="_blank" rel="noopener noreferrer">non-qualifying expense</a>.
-            bullet_2_html: Withdrew money from our First-Time Homebuyer Account and used it for <a href="%{link}" target="_blank" rel="noopener noreferrer">non-eligible home costs</a>.
+            bullet_1_html: Withdrew money from your Idaho Medical Savings Account and used it for a <a href="%{link}" target="_blank" rel="noopener noreferrer">non-qualifying expense</a>.
+            bullet_2_html: Withdrew money from your First-Time Homebuyer Account and used it for <a href="%{link}" target="_blank" rel="noopener noreferrer">non-eligible home costs</a>.
       id_grocery_credit:
         edit:
           answers_confidential_html: Your answers are private and used only to see if you qualify for the tax credit.
@@ -2881,7 +2882,7 @@ en:
             one: To see if you qualify, we need more information about you.
             other: To see if you qualify, we need more information about you and your household.
           select_household_members: 'Select the members of the household any of these situations applied to in %{tax_year}:'
-          situation_incarceration: experienced incarceration
+          situation_incarceration: Were incarcerated
           situation_snap: received food stamps / SNAP-EBT
           situation_undocumented: lived in the US undocumented
           situations_question:
@@ -2905,9 +2906,11 @@ en:
           donate_impact_heading: How will donating my credit impact my tax return?
           donate_warning_p1: Your donation will be deducted from your total state refund.
           donate_warning_p2: Your choice to donate is final and cannot be changed through an amended return.
-          title: You will receive $%{grocery_credit_amount} from the Idaho Grocery Credit!
-          title_html: You will receive <strong>$%{grocery_credit_amount}</strong> from the Idaho Grocery Credit!
+          title: Good news! You're eligible for $%{grocery_credit_amount} from the Idaho Grocery Credit!
+          title_html: Good news! You're eligible for <strong>$%{grocery_credit_amount}</strong> from the Idaho Grocery Credit!
           would_you_like_to_donate: Would you like to donate your entire credit to the Cooperative Welfare Fund?
+          body_p1: This credit amount will be part of your final tax calculations. If you are owed a state tax refund, the credit amount will increase your final refund amount. If you owe taxes, the credit will lower the amount you owe.
+          body_p2: You can review your total Idaho state refund amount at the end.
       id_health_insurance_premium:
         edit:
           amount_paid_helper_text: Total amount paid in %{year}
@@ -2929,7 +2932,7 @@ en:
             <br/><br/>
             If you have Medicare you can deduct Medicare A (if you are voluntarily enrolled and not covered under Social Security), as well as Medicare B and D if you are voluntarily enrolled. Medicare Advantage also qualifies.
           qualifications_title: Which health coverage premiums qualify?
-          qualifying_amount_help_text: Enter the total amount of qualifying health insurance premiums your household paid in %{year}.
+          qualifying_amount_help_text_html: Enter the <strong>total amount</strong> of qualifying health insurance premiums your household paid in %{year}.
           subtitle:
             one: To see if you qualify, we need more information about you.
             other: To see if you qualify, we need more information about you and your household.
@@ -2947,8 +2950,8 @@ en:
       id_permanent_building_fund:
         edit:
           receive_public_assistance_explanation: Public assistance payments do not include food stamps nor WIC payments.
-          receive_public_assistance_single: Did you receive Idaho public assistance payments at the end of the tax year?
-          receive_public_assistance_spouse: Did you or your spouse receive Idaho public assistance payments at the end of the tax year?
+          receive_public_assistance_single: Were you receiving Idaho public assistance payments at the end of the tax year?
+          receive_public_assistance_spouse: Were you or your spouse receiving Idaho public assistance payments at the end of the tax year?
           title: You might be eligible for an exception to the permanent building fund tax!
       id_primary_state_id:
         id_primary:
@@ -2971,12 +2974,14 @@ en:
         edit:
           sales_tax_content: This is a tax collected at the point of sale when you buy goods within your state. However, if you purchased items through an out-of-state seller, they may not have collected Idaho sales tax at the time.
           sales_tax_title: What are sales taxes?
+          use_tax_title: What are use taxes?
+          use_tax_content: If you buy something from another state (like online shopping or purchases from a store located in another state) and you don’t pay sales tax on it, you are generally required to pay use tax to your home state.
           sales_use_tax_helper_text: Enter total amount
-          subtitle_html: This includes online purchases where sales tax was <strong>not</strong> applied.
+          subtitle_html: This includes online purchases where sales tax was <strong>not</strong> applied. If you made any purchases without paying sales tax, you may owe use tax on those purchases. We’ll help you figure out the right amount
           title:
             one: Did you make any out-of-state purchases in %{year} without paying sales tax?
             other: Did you or your spouse make any out-of-state purchases in %{year} without paying sales tax?
-          unpaid_sales_use_tax_label_html: Please enter the <b>total amount of purchases</b> that didn’t have sales or use tax applied.
+          unpaid_sales_use_tax_label_html: Enter the <b>total amount of purchases</b> that didn’t have sales tax applied in %{year}.
       id_spouse_state_id:
         id_spouse:
           encourage_sharing_html: If you and your spouse have a driver’s license or state issued identification card please provide the requested information from it. The return will not be rejected if you do not provide a driver’s license or state-issued identification. <br><br> If you provide this information, it may help to identify you as the taxpayer.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index efb2dadeee..9926df8199 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2481,12 +2481,13 @@ es:
           long_term_care_insurance_subtraction: Resta del Seguro de Atención a Largo Plazo
           maintaining_elderly_disabled_credit: Crédito por Mantener un Hogar para Personas Mayores o Discapacitadas
         id_supported:
-          child_care_deduction: Resta de cuidado de niños y dependientes
+          child_care_deduction: Resta de Idaho por Gastos de Cuidado Niños y Dependientes
           health_insurance_premiums_subtraction: Resta de primas de seguro médico
           id_child_tax_credit: Crédito Tributario de Idaho por Hijos
           id_grocery_credit: Crédito de Idaho por Compras de Alimentos
-          interest_from_obligations: Resta de intereses de obligaciones del gobierno de EE. UU.
-          social_security_retirement_deduction: Deducciones de Seguridad Social y Beneficios de Jubilación
+          interest_from_obligations: Resta de intereses de obligaciones del gobierno de los Estados Unidos
+          social_security_railroad_deduction: Deducciones de Seguridad Social y Beneficios de Jubilación Ferroviaria
+          retirement_benefits_deduction: Deducciones por Beneficios de Jubilación
         md_reveals:
           body1_html: |
             <ul>
@@ -2822,10 +2823,10 @@ es:
           emergency_rental_assistance_explanation: El programa de Asistencia de Emergencia para el Pago de Alquiler (ERA, por sus siglas en inglés) es un programa federal que da dinero para ayudar a los hogares a pagar el alquiler y las facturas de servicios públicos. Se creó en respuesta a la pandemia de Covid-19.
           subtitle_1: Para esta temporada de impuestos, este servicio sólo estará disponible para personas con situaciones fiscales específicas. Para saber si puedes usarlo responde las siguientes preguntas.
           title: Primero, veamos si puedes usar este servicio para declarar tus impuestos del Idaho de %{filing_year}
-          withdrew_msa_fthb: En %{filing_year}, ¿retiró usted (o su cónyuge si presentan juntos) dinero de alguno de los siguientes?
+          withdrew_msa_fthb: "¿Alguno de los siguientes escenarios aplicó a ti o a tu cónyuge en %{filing_year}?"
           withdrew_msa_fthb_list:
-            bullet_1_html: Retiraste dinero de nuestra Cuenta de Ahorros Médicos de Idaho y lo usaste para <a href="%{link}" target="_blank" rel="noopener noreferrer">un gasto no calificado</a>.
-            bullet_2_html: Retiraste dinero de nuestra Cuenta de Comprador de Vivienda por Primera Vez y lo usaste para <a href="%{link}" target="_blank" rel="noopener noreferrer">costos de vivienda no elegibles</a>.
+            bullet_1_html: Retiraste dinero de tu Cuenta de Ahorros Médicos de Idaho y lo usaste para un <a href="%{link}" target="_blank" rel="noopener noreferrer">gasto no calificado</a>.
+            bullet_2_html: Retiraste dinero tu Cuenta de Comprador de Vivienda por Primera Vez y lo usaste para un <a href="%{link}" target="_blank" rel="noopener noreferrer">gasto no calificado</a>.
       id_grocery_credit:
         edit:
           answers_confidential_html: Tus respuestas son privadas y se utilizan sólo para determinar si calificas para el crédito fiscal.
@@ -2837,7 +2838,7 @@ es:
             one: Para ver si usted califica, necesitamos más información sobre usted.
             other: Para ver si calificas, necesitamos más información sobre ti y tu hogar.
           select_household_members: 'Selecciona a las personas de tu hogar para quienes aplican estas situaciones en %{tax_year}:'
-          situation_incarceration: Estar encarcelado
+          situation_incarceration: Estuvo encarcelado
           situation_snap: Recibir cupones de alimentos / SNAP-EBT
           situation_undocumented: Vivir en los Estados Unidos sin documentación
           situations_question:
@@ -2862,9 +2863,11 @@ es:
           donate_impact_heading: "¿Cómo afectará la donación de mi crédito a mi declaración de impuestos?"
           donate_warning_p1: Tu donación se deducirá del total de tu reembolso estatal.
           donate_warning_p2: Tu decisión de donar es definitiva y no se puede cambiar mediante una declaración enmendada.
-          title: "¡Recibirás $%{grocery_credit_amount} del crédito por compras de alimentos de Idaho!"
-          title_html: "¡Recibirás <strong>$%{grocery_credit_amount}</strong> del crédito por compras de alimentos de Idaho!"
+          title: Eres elegible para recibir $%{grocery_credit_amount} del crédito por compras de alimentos de Idaho!
+          title_html: Eres elegible para recibir <strong>$%{grocery_credit_amount}</strong> del crédito por compras de alimentos de Idaho!"
           would_you_like_to_donate: "¿Te gustaría donar tu crédito completo al Fondo de Bienestar Cooperativo?"
+          body_p1: Esta cantidad de crédito será parte de tus cálculos fiscales finales. Si se te debe un reembolso de impuestos estatales, la cantidad del crédito aumentará tu reembolso final. Si debes impuestos, el crédito reducirá la cantidad que debes.
+          body_p2: Puedes revisar la cantidad  total de tu reembolso estatal de Idaho al final.
       id_health_insurance_premium:
         edit:
           amount_paid_helper_text: Cantidad total pagada en %{year}
@@ -2886,7 +2889,7 @@ es:
             <br/><br/>
             Si tienes Medicare, puedes deducir Medicare A (si estás inscrito voluntariamente y no estás cubierto por el Seguro Social), así como Medicare B y D si estás inscrito voluntariamente. Medicare Advantage también califica.
           qualifications_title: "¿Qué primas de cobertura de salud califican?"
-          qualifying_amount_help_text: Ingresa la cantidad total de las primas de seguro de salud que califican que tu hogar pagó en %{year}
+          qualifying_amount_help_text_html: Ingresa la <strong>cantidad total</strong> de las primas de seguro de salud que califican que tu hogar pagó en %{year}
           subtitle:
             many: Para ver si califica, necesitamos más información sobre usted y su hogar.
             one: Para ver si califica, necesitamos más información sobre usted.
@@ -2905,8 +2908,8 @@ es:
       id_permanent_building_fund:
         edit:
           receive_public_assistance_explanation: Los pagos de asistencia pública no incluyen cupones de alimentos ni pagos de WIC.
-          receive_public_assistance_single: "¿Recibiste tú pagos de asistencia pública de Idaho al final del año fiscal?"
-          receive_public_assistance_spouse: "¿Recibiste tú o tu cónyuge recibieron pagos de asistencia pública de Idaho al final del año fiscal?"
+          receive_public_assistance_single: "¿Tú estaban recibiendo pagos de asistencia pública de Idaho al final del año fiscal?"
+          receive_public_assistance_spouse: "¿Tú o tu cónyuge estaban recibiendo pagos de asistencia pública de Idaho al final del año fiscal?"
           title: "¡Podrías ser elegible para una excepción al Impuesto del Fondo Permanente para Edificios!"
       id_primary_state_id:
         id_primary:
@@ -2929,13 +2932,15 @@ es:
         edit:
           sales_tax_content: 'Impuesto sobre ventas: Este es un impuesto recaudado en el punto de venta cuando compras bienes dentro de tu estado.'
           sales_tax_title: "¿Qué son los impuestos sobre ventas?"
+          use_tax_title: "¿Qué son los impuestos sobre uso?"
+          use_tax_content: Si compras algo de otro estado (como compras en línea o en una tienda ubicada en otro estado) y no pagas el impuesto sobre ventas, generalmente se requiere que pagues el impuesto sobre uso a tu estado de residencia.
           sales_use_tax_helper_text: Ingrese el monto total
-          subtitle_html: Esto incluye compras en línea donde <strong>no</strong> se aplicó el impuesto sobre ventas.
+          subtitle_html: Esto incluye compras en línea donde <strong>no</strong> se aplicó el impuesto sobre ventas. Si hiciste alguna compra sin pagar impuestos sobre la venta, puede que debas el impuesto sobre el uso de esas compras. Te ayudaremos a saber la cantidad exacta.
           title:
             many: "¿Tú o tu cónyuge hiciste alguna compra fuera del estado en %{year} sin pagar impuestos sobre ventas?"
             one: "¿Hiciste alguna compra fuera del estado en %{year} sin pagar impuestos sobre ventas?"
             other: "¿Tú o tu cónyuge hiciste alguna compra fuera del estado en %{year} sin pagar impuestos sobre ventas?"
-          unpaid_sales_use_tax_label_html: Ingrese el <b>cantidad total de compras</b> a las que no se les aplicaron impuestos sobre las ventas o el uso.
+          unpaid_sales_use_tax_label_html: Ingresa la <b>cantidad total de compras</b> a las que no se les aplicaron impuestos sobre las ventas o el uso %{year}.
       id_spouse_state_id:
         id_spouse:
           encourage_sharing_html: Si tú y tu cónyuge tienen una licencia de conducir o una tarjeta de identificación emitida por el estado, por favor comparte la información que solicitamos de la misma. La declaración no será rechazada si no compartes una licencia de conducir o una identificación emitida por el estado.<br><br>Si compartes esta información, puede ayudar a que te identifiquen como el contribuyente.

From c557b2115b0156a9ac456a80fe97380daa8a689d Mon Sep 17 00:00:00 2001
From: Drew Proebstel <dproebstel@codeforamerica.org>
Date: Wed, 5 Feb 2025 13:08:11 -0800
Subject: [PATCH 2/5] normalize

---
 config/locales/en.yml | 10 +++++-----
 config/locales/es.yml | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f1d2e8bf6f..e36bdbc3b2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2530,8 +2530,8 @@ en:
           id_child_tax_credit: Idaho Child Tax Credit
           id_grocery_credit: Idaho Grocery Credit
           interest_from_obligations: Interest from U.S government obligations subtraction
-          social_security_railroad_deduction: Social Security and Railroad Retirement subtraction
           retirement_benefits_deduction: Retirement Benefits deductions
+          social_security_railroad_deduction: Social Security and Railroad Retirement subtraction
         md_reveals:
           body1_html: |
             <ul>
@@ -2901,6 +2901,8 @@ en:
           you_example_months: For example, if you had 2 situations in April, that counts as 1 month.
       id_grocery_credit_review:
         edit:
+          body_p1: This credit amount will be part of your final tax calculations. If you are owed a state tax refund, the credit amount will increase your final refund amount. If you owe taxes, the credit will lower the amount you owe.
+          body_p2: You can review your total Idaho state refund amount at the end.
           donate_impact_content_p1: Your choice to donate is final once you submit your tax return and cannot be changed through an amended return.
           donate_impact_content_p2: The Cooperative Welfare Fund is a trust fund in the state treasury, and all money goes toward public assistance and welfare purposes.
           donate_impact_heading: How will donating my credit impact my tax return?
@@ -2909,8 +2911,6 @@ en:
           title: Good news! You're eligible for $%{grocery_credit_amount} from the Idaho Grocery Credit!
           title_html: Good news! You're eligible for <strong>$%{grocery_credit_amount}</strong> from the Idaho Grocery Credit!
           would_you_like_to_donate: Would you like to donate your entire credit to the Cooperative Welfare Fund?
-          body_p1: This credit amount will be part of your final tax calculations. If you are owed a state tax refund, the credit amount will increase your final refund amount. If you owe taxes, the credit will lower the amount you owe.
-          body_p2: You can review your total Idaho state refund amount at the end.
       id_health_insurance_premium:
         edit:
           amount_paid_helper_text: Total amount paid in %{year}
@@ -2974,14 +2974,14 @@ en:
         edit:
           sales_tax_content: This is a tax collected at the point of sale when you buy goods within your state. However, if you purchased items through an out-of-state seller, they may not have collected Idaho sales tax at the time.
           sales_tax_title: What are sales taxes?
-          use_tax_title: What are use taxes?
-          use_tax_content: If you buy something from another state (like online shopping or purchases from a store located in another state) and you don’t pay sales tax on it, you are generally required to pay use tax to your home state.
           sales_use_tax_helper_text: Enter total amount
           subtitle_html: This includes online purchases where sales tax was <strong>not</strong> applied. If you made any purchases without paying sales tax, you may owe use tax on those purchases. We’ll help you figure out the right amount
           title:
             one: Did you make any out-of-state purchases in %{year} without paying sales tax?
             other: Did you or your spouse make any out-of-state purchases in %{year} without paying sales tax?
           unpaid_sales_use_tax_label_html: Enter the <b>total amount of purchases</b> that didn’t have sales tax applied in %{year}.
+          use_tax_content: If you buy something from another state (like online shopping or purchases from a store located in another state) and you don’t pay sales tax on it, you are generally required to pay use tax to your home state.
+          use_tax_title: What are use taxes?
       id_spouse_state_id:
         id_spouse:
           encourage_sharing_html: If you and your spouse have a driver’s license or state issued identification card please provide the requested information from it. The return will not be rejected if you do not provide a driver’s license or state-issued identification. <br><br> If you provide this information, it may help to identify you as the taxpayer.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9926df8199..83181c20ef 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2486,8 +2486,8 @@ es:
           id_child_tax_credit: Crédito Tributario de Idaho por Hijos
           id_grocery_credit: Crédito de Idaho por Compras de Alimentos
           interest_from_obligations: Resta de intereses de obligaciones del gobierno de los Estados Unidos
-          social_security_railroad_deduction: Deducciones de Seguridad Social y Beneficios de Jubilación Ferroviaria
           retirement_benefits_deduction: Deducciones por Beneficios de Jubilación
+          social_security_railroad_deduction: Deducciones de Seguridad Social y Beneficios de Jubilación Ferroviaria
         md_reveals:
           body1_html: |
             <ul>
@@ -2858,6 +2858,8 @@ es:
           you_example_months: Por ejemplo, si tuviste 2 situaciones en abril, eso cuenta como 1 mes.
       id_grocery_credit_review:
         edit:
+          body_p1: Esta cantidad de crédito será parte de tus cálculos fiscales finales. Si se te debe un reembolso de impuestos estatales, la cantidad del crédito aumentará tu reembolso final. Si debes impuestos, el crédito reducirá la cantidad que debes.
+          body_p2: Puedes revisar la cantidad  total de tu reembolso estatal de Idaho al final.
           donate_impact_content_p1: Tu decisión de donar es final una vez que envíes tu declaración de impuestos y no puede ser cambiada a través de una declaración enmendada.
           donate_impact_content_p2: El Fondo de Bienestar Cooperativo es un fondo fiduciario en el tesoro estatal y todo el dinero se destina a la asistencia pública y a fines de bienestar.
           donate_impact_heading: "¿Cómo afectará la donación de mi crédito a mi declaración de impuestos?"
@@ -2866,8 +2868,6 @@ es:
           title: Eres elegible para recibir $%{grocery_credit_amount} del crédito por compras de alimentos de Idaho!
           title_html: Eres elegible para recibir <strong>$%{grocery_credit_amount}</strong> del crédito por compras de alimentos de Idaho!"
           would_you_like_to_donate: "¿Te gustaría donar tu crédito completo al Fondo de Bienestar Cooperativo?"
-          body_p1: Esta cantidad de crédito será parte de tus cálculos fiscales finales. Si se te debe un reembolso de impuestos estatales, la cantidad del crédito aumentará tu reembolso final. Si debes impuestos, el crédito reducirá la cantidad que debes.
-          body_p2: Puedes revisar la cantidad  total de tu reembolso estatal de Idaho al final.
       id_health_insurance_premium:
         edit:
           amount_paid_helper_text: Cantidad total pagada en %{year}
@@ -2932,8 +2932,6 @@ es:
         edit:
           sales_tax_content: 'Impuesto sobre ventas: Este es un impuesto recaudado en el punto de venta cuando compras bienes dentro de tu estado.'
           sales_tax_title: "¿Qué son los impuestos sobre ventas?"
-          use_tax_title: "¿Qué son los impuestos sobre uso?"
-          use_tax_content: Si compras algo de otro estado (como compras en línea o en una tienda ubicada en otro estado) y no pagas el impuesto sobre ventas, generalmente se requiere que pagues el impuesto sobre uso a tu estado de residencia.
           sales_use_tax_helper_text: Ingrese el monto total
           subtitle_html: Esto incluye compras en línea donde <strong>no</strong> se aplicó el impuesto sobre ventas. Si hiciste alguna compra sin pagar impuestos sobre la venta, puede que debas el impuesto sobre el uso de esas compras. Te ayudaremos a saber la cantidad exacta.
           title:
@@ -2941,6 +2939,8 @@ es:
             one: "¿Hiciste alguna compra fuera del estado en %{year} sin pagar impuestos sobre ventas?"
             other: "¿Tú o tu cónyuge hiciste alguna compra fuera del estado en %{year} sin pagar impuestos sobre ventas?"
           unpaid_sales_use_tax_label_html: Ingresa la <b>cantidad total de compras</b> a las que no se les aplicaron impuestos sobre las ventas o el uso %{year}.
+          use_tax_content: Si compras algo de otro estado (como compras en línea o en una tienda ubicada en otro estado) y no pagas el impuesto sobre ventas, generalmente se requiere que pagues el impuesto sobre uso a tu estado de residencia.
+          use_tax_title: "¿Qué son los impuestos sobre uso?"
       id_spouse_state_id:
         id_spouse:
           encourage_sharing_html: Si tú y tu cónyuge tienen una licencia de conducir o una tarjeta de identificación emitida por el estado, por favor comparte la información que solicitamos de la misma. La declaración no será rechazada si no compartes una licencia de conducir o una identificación emitida por el estado.<br><br>Si compartes esta información, puede ayudar a que te identifiquen como el contribuyente.

From 3bf048eb742840f44a0a152283869a87512d54f7 Mon Sep 17 00:00:00 2001
From: Drew Proebstel <dproebstel@codeforamerica.org>
Date: Wed, 5 Feb 2025 13:43:37 -0800
Subject: [PATCH 3/5] fix test

---
 app/views/state_file/questions/eligible/_id_supported.html.erb | 2 +-
 config/locales/en.yml                                          | 2 +-
 config/locales/es.yml                                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/state_file/questions/eligible/_id_supported.html.erb b/app/views/state_file/questions/eligible/_id_supported.html.erb
index 0176768ad6..fc08044cbb 100644
--- a/app/views/state_file/questions/eligible/_id_supported.html.erb
+++ b/app/views/state_file/questions/eligible/_id_supported.html.erb
@@ -1,7 +1,7 @@
 <ul class="list--bulleted">
   <li><%= t(".child_care_deduction") %></li>
   <li><%= t(".interest_from_obligations") %></li>
-  <li><%= t(".social_security_railroad_deduction") %></li>
+  <li><%= t(".social_security_retirement_deduction") %></li>
   <li><%= t(".retirement_benefits_deduction") %></li>
   <li><%= t(".health_insurance_premiums_subtraction") %></li>
   <li><%= t(".id_child_tax_credit") %></li>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e36bdbc3b2..a42e62d74f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2531,7 +2531,7 @@ en:
           id_grocery_credit: Idaho Grocery Credit
           interest_from_obligations: Interest from U.S government obligations subtraction
           retirement_benefits_deduction: Retirement Benefits deductions
-          social_security_railroad_deduction: Social Security and Railroad Retirement subtraction
+          social_security_retirement_deduction: Social Security and Railroad Retirement subtraction
         md_reveals:
           body1_html: |
             <ul>
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 83181c20ef..bc3a2562cc 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2487,7 +2487,7 @@ es:
           id_grocery_credit: Crédito de Idaho por Compras de Alimentos
           interest_from_obligations: Resta de intereses de obligaciones del gobierno de los Estados Unidos
           retirement_benefits_deduction: Deducciones por Beneficios de Jubilación
-          social_security_railroad_deduction: Deducciones de Seguridad Social y Beneficios de Jubilación Ferroviaria
+          social_security_retirement_deduction: Deducciones de Seguridad Social y Beneficios de Jubilación Ferroviaria
         md_reveals:
           body1_html: |
             <ul>

From 09ebefbe8481f35def4b01006e0736d133a344de Mon Sep 17 00:00:00 2001
From: Drew Proebstel <dproebstel@codeforamerica.org>
Date: Mon, 10 Feb 2025 10:34:11 -0800
Subject: [PATCH 4/5] update some translations

---
 config/locales/en.yml | 4 ++--
 config/locales/es.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c1052ce40a..d000e9130c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2887,7 +2887,7 @@ en:
             one: To see if you qualify, we need more information about you.
             other: To see if you qualify, we need more information about you and your household.
           select_household_members: 'Select the members of the household any of these situations applied to in %{tax_year}:'
-          situation_incarceration: Were incarcerated
+          situation_incarceration: were incarcerated
           situation_snap: received food stamps / SNAP-EBT
           situation_undocumented: lived in the US undocumented
           situations_question:
@@ -2984,7 +2984,7 @@ en:
           title:
             one: Did you make any out-of-state purchases in %{year} without paying sales tax?
             other: Did you or your spouse make any out-of-state purchases in %{year} without paying sales tax?
-          unpaid_sales_use_tax_label_html: Enter the <b>total amount of purchases</b> that didn’t have sales tax applied in %{year}.
+          unpaid_sales_use_tax_label_html: Enter the <strong>total amount of purchases</strong> that didn’t have sales tax applied in %{year}.
           use_tax_content: If you buy something from another state (like online shopping or purchases from a store located in another state) and you don’t pay sales tax on it, you are generally required to pay use tax to your home state.
           use_tax_title: What are use taxes?
       id_spouse_state_id:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 48a7c89361..cae1b7c520 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2919,7 +2919,7 @@ es:
             many: "¿Tú o tu cónyuge hiciste alguna compra fuera del estado en %{year} sin pagar impuestos sobre ventas?"
             one: "¿Hiciste alguna compra fuera del estado en %{year} sin pagar impuestos sobre ventas?"
             other: "¿Tú o tu cónyuge hiciste alguna compra fuera del estado en %{year} sin pagar impuestos sobre ventas?"
-          unpaid_sales_use_tax_label_html: Ingresa la <b>cantidad total de compras</b> a las que no se les aplicaron impuestos sobre las ventas o el uso %{year}.
+          unpaid_sales_use_tax_label_html: Ingresa la <strong>cantidad total de compras</strong> a las que no se les aplicaron impuestos sobre las ventas o el uso %{year}.
           use_tax_content: Si compras algo de otro estado (como compras en línea o en una tienda ubicada en otro estado) y no pagas el impuesto sobre ventas, generalmente se requiere que pagues el impuesto sobre uso a tu estado de residencia.
           use_tax_title: "¿Qué son los impuestos sobre uso?"
       id_spouse_state_id:

From 0a0276f631e0b2f68532de1ea51d738588ea2bb0 Mon Sep 17 00:00:00 2001
From: Drew Proebstel <dproebstel@codeforamerica.org>
Date: Mon, 10 Feb 2025 12:26:04 -0800
Subject: [PATCH 5/5] acceptance updates

---
 .../questions/eligible/_id_credits_unsupported.html.erb      | 1 +
 .../state_file/questions/eligible/_id_supported.html.erb     | 5 ++++-
 config/locales/en.yml                                        | 1 +
 config/locales/es.yml                                        | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/state_file/questions/eligible/_id_credits_unsupported.html.erb b/app/views/state_file/questions/eligible/_id_credits_unsupported.html.erb
index f4fce9c86d..827e3fe843 100644
--- a/app/views/state_file/questions/eligible/_id_credits_unsupported.html.erb
+++ b/app/views/state_file/questions/eligible/_id_credits_unsupported.html.erb
@@ -1,6 +1,7 @@
 <div class="reveal">
   <p><button class="reveal__button"><%= t("state_file.questions.eligible.edit.credits_not_supported")%></button></p>
   <div class="reveal__content spacing-below-25">
+    <p><%=t('.not_supported_this_year') %></p>
     <ul>
       <li><%=t('.id_college_savings_program') %></li>
       <li><%=t('.id_youth_rehab_contributions') %></li>
diff --git a/app/views/state_file/questions/eligible/_id_supported.html.erb b/app/views/state_file/questions/eligible/_id_supported.html.erb
index fc08044cbb..2a68035d35 100644
--- a/app/views/state_file/questions/eligible/_id_supported.html.erb
+++ b/app/views/state_file/questions/eligible/_id_supported.html.erb
@@ -2,7 +2,10 @@
   <li><%= t(".child_care_deduction") %></li>
   <li><%= t(".interest_from_obligations") %></li>
   <li><%= t(".social_security_retirement_deduction") %></li>
-  <li><%= t(".retirement_benefits_deduction") %></li>
+
+  <% if Flipper.enabled?(:show_retirement_ui) %>
+    <li><%= t(".retirement_benefits_deduction") %></li>
+  <% end %>
   <li><%= t(".health_insurance_premiums_subtraction") %></li>
   <li><%= t(".id_child_tax_credit") %></li>
   <li><a href=" https://tax.idaho.gov/taxes/income-tax/individual-income/popular-credits-and-deductions/idaho-grocery-credit" target="_blank" rel="noopener nofollow"><%= t(".id_grocery_credit") %></a></li>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d000e9130c..03d1b52da6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2528,6 +2528,7 @@ en:
           itemized_deductions: Itemized deductions
           long_term_care_insurance_subtraction: Long-term Care Insurance Subtraction
           maintaining_elderly_disabled_credit: Credit for Maintaining a Home for the Elderly or Disabled
+          not_supported_this_year: 'Credits and deductions not supported this year:'
         id_supported:
           child_care_deduction: Idaho Child and Dependent Care Subtraction
           health_insurance_premiums_subtraction: Health Insurance Premiums subtraction
diff --git a/config/locales/es.yml b/config/locales/es.yml
index cae1b7c520..608210d37c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2478,6 +2478,7 @@ es:
           itemized_deductions: Deducciones detalladas
           long_term_care_insurance_subtraction: Resta del Seguro de Atención a Largo Plazo
           maintaining_elderly_disabled_credit: Crédito por Mantener un Hogar para Personas Mayores o Discapacitadas
+          not_supported_this_year: 'Créditos y deducciones no admitidos este año:'
         id_supported:
           child_care_deduction: Resta de Idaho por Gastos de Cuidado Niños y Dependientes
           health_insurance_premiums_subtraction: Resta de primas de seguro médico