From 7503ee032d0bf85fcdefd8adc97920a96676da4b Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 11:57:16 -0800
Subject: [PATCH 01/12] Update landing page copy

---
 .../state_file/landing_page_controller.rb        |  1 +
 app/views/state_file/landing_page/edit.html.erb  | 16 ++++++++++++----
 config/locales/en.yml                            | 16 ++++------------
 config/locales/es.yml                            | 12 ++----------
 4 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/app/controllers/state_file/landing_page_controller.rb b/app/controllers/state_file/landing_page_controller.rb
index 38e91f8ed2..294640d6bd 100644
--- a/app/controllers/state_file/landing_page_controller.rb
+++ b/app/controllers/state_file/landing_page_controller.rb
@@ -16,6 +16,7 @@ def edit
       end
       @state_code = params[:us_state]
       @state_name = StateFile::StateInformationService.state_name(@state_code)
+      @built_with_name = @state_code == "nj" ? "New Jersey Office of Innovation" : @state_name
     end
 
     def update
diff --git a/app/views/state_file/landing_page/edit.html.erb b/app/views/state_file/landing_page/edit.html.erb
index 888a3f492b..41067d8948 100644
--- a/app/views/state_file/landing_page/edit.html.erb
+++ b/app/views/state_file/landing_page/edit.html.erb
@@ -38,7 +38,7 @@
           <% else %>
             <% unless @user_name.present? %>
               <h2 class="h2">
-                <%= t(".#{@state_code}.built_with_html") %>
+                <%= t(".built_with_html", state_name: @built_with_name) %>
               </h2>
             <% end %>
 
@@ -64,9 +64,17 @@
                 </h2>
               <% end %>
             <% else %>
-              <div class="white-group spacing-below-60">
-                <% # i18n-tasks-use t('state_file.landing_page.edit.help_text_html') # hint for the i18n linter that, yes, we are using this key (sometimes) %>
-                <%= t(".#{@state_code}.help_text_html", default: :'.help_text_html', filing_year: current_tax_year) %>
+              <div class="reveal">
+                <p>
+                  <button class="reveal__button">
+                    <% # i18n-tasks-use t('state_file.landing_page.edit.help_text_title') # hint for the i18n linter that, yes, we are using this key (sometimes) %>
+                    <strong><%= t(".#{@state_code}.help_text_title", default: :'.help_text_title') %></strong>
+                  </button>
+                </p>
+                <div class="reveal__content">
+                  <% # i18n-tasks-use t('state_file.landing_page.edit.help_text_html') # hint for the i18n linter that, yes, we are using this key (sometimes) %>
+                  <%= t(".#{@state_code}.help_text_html", default: :'.help_text_html', filing_year: current_tax_year) %>
+                </div>
               </div>
               <%= form_with model: @form, url: { action: :update }, local: true, method: :put, builder: VitaMinFormBuilder do |f| %>
                 <%= f.submit t("general.get_started"), class: "button button--primary button--wide", id: "firstCta" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 82ddb68ce9..11bc4bb046 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2126,62 +2126,54 @@ en:
         already_filed_html: Already filed your state taxes with us? <strong>You can download a copy of your state return until December 31, 2024.</strong>
         already_started_html: Already started filing your state return? <a href="%{sign_in_url}">Sign in</a>.
         az:
-          built_with_html: "<strong>FileYourStateTaxes</strong> is built in partnership with the state of Arizona to integrate with the IRS Direct File tool and takes about 10 to 15 minutes to complete <strong>once your federal return is accepted</strong>. Get started by setting up your account."
           closed_html: |
             <strong>FileYourStateTaxes</strong> is built in partnership with the state of Arizona to integrate with the IRS Direct File tool.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of Arizona
           title: File your Arizona state taxes for free
+        built_with_html: "<strong>FileYourStateTaxes</strong> takes about 10 to 15 minutes to complete. Get started by setting up your account. \n<br/><br/>\nThis service is built in partnership with the state of %{state_name} to integrate with IRS Direct File.\n"
         continue: To continue filing your %{state_name} State return, please sign in below
         download_your_record: Download Your Record
         help_text_html: |
-          <strong>What you’ll need:</strong>
-          <br />
           <ul class="list--bulleted">
             <li>An <strong>accepted</strong> %{filing_year} federal return using <a href="https://directfile.irs.gov/">IRS Direct File</a>. (You don’t need a copy of this return; you’ll transfer your return here.)
             <li>Email address or phone number</li>
-            <li>Driver’s license or state-issued ID</li>
+            <li>Driver’s license or state-issued ID, if you have one</li>
             <li>Form 1099-G (If you received unemployment benefits in %{filing_year}.)</li>
             <li>Bank routing and account numbers (if you want to receive your refund or make a tax payment electronically)</li>
           </ul>
+        help_text_title: What will I need to complete my state tax return?
         id:
-          built_with_html: "<strong>FileYourStateTaxes</strong> is built in partnership with the state of Idaho to integrate with the IRS Direct File tool and takes about 10 to 15 minutes to complete <strong>once your federal return is accepted</strong>. Get started by setting up your account."
           closed_html: |
             <strong>FileYourStateTaxes</strong> is built in partnership with the state of Idaho to integrate with the IRS Direct File tool.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of Idaho
           title: File your Idaho state taxes for free
         md:
-          built_with_html: "<strong>FileYourStateTaxes</strong> is built in partnership with Maryland to integrate with the IRS Direct File tool and takes about 10 to 15 minutes to complete <strong>once your federal return is accepted</strong>. Get started by setting up your account."
           closed_html: |
             <strong>FileYourStateTaxes</strong> is built in partnership with Maryland to integrate with the IRS Direct File tool.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of Maryland
           title: File your state taxes for free
         nc:
-          built_with_html: "<strong>FileYourStateTaxes</strong> is built in partnership with the state of North Carolina to integrate with the IRS Direct File tool and takes about 10 to 15 minutes to complete <strong>once your federal return is accepted</strong>. Get started by setting up your account."
           closed_html: |
             <strong>FileYourStateTaxes</strong> is built in partnership with the state of North Carolina to integrate with the IRS Direct File tool.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of North Carolina
           title: File your North Carolina state taxes for free
         nj:
-          built_with_html: "<strong>FileYourStateTaxes</strong> is built in partnership with the <strong>New Jersey Office of Innovation</strong> to integrate with the IRS Direct File tool. It takes about 10 to 15 minutes to complete <strong>once your federal return is accepted</strong>. Get started by setting up your account."
           closed_html: "<strong>FileYourStateTaxes</strong> is built in partnership with the New Jersey Office of Innovation to integrate with the IRS Direct File tool.<br /><br />\nWe're closed for the tax season. Unfortunately you can no longer file your state return with us this year.              \n"
           help_text_html: |
-            <strong>What you’ll need:</strong>
-            <br />
             <ul class="list--bulleted">
               <li>An <strong>accepted</strong> %{filing_year} federal return using <a href="https://directfile.irs.gov/">IRS Direct File</a>. (You don’t need a copy of this return; you’ll transfer your return here.)
               <li>Email address or phone number</li>
-              <li>Driver’s license or state-issued ID</li>
+              <li>Driver’s license or state-issued ID, if you have one</li>
               <li>Bank routing and account numbers (if you want to receive your refund or make a tax payment electronically)</li>
             </ul>
           supported_by: Supported by the New Jersey Office of Innovation
           title: File your New Jersey taxes for free
         not_you: Not %{user_name}?
         ny:
-          built_with_html: "<strong>FileYourStateTaxes</strong> is built in partnership with <strong>New York State</strong> to integrate with the IRS Direct File tool and takes about 10 to 15 minutes to complete <strong>once your federal return is accepted</strong>. Get started by setting up your account."
           closed_html: |
             <strong>FileYourStateTaxes</strong> is built in partnership with New York State to integrate with the IRS Direct File tool.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1a508ada33..3a91104280 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2090,17 +2090,15 @@ es:
         already_filed_html: "¿Ya presentó tus impuestos estatales con nosotros? <strong>Puede descargar una copia de su declaración estatal hasta el 31 de diciembre de 2024.</strong>"
         already_started_html: ¿Ya comenzaste a presentar tu declaración estatal? <a href="%{sign_in_url}">Inicia sesión</a>.
         az:
-          built_with_html: "<strong>FileYourStateTaxes</strong> ha sido creado en colaboración con el estado de Arizona para integrarse con la herramienta Direct File del IRS y solo toma de 10 a 15 minutos completarlo <strong>una vez que tu declaración federal sea aceptada</strong>. Comienza configurando tu cuenta."
           closed_html: |
             <strong>FileYourStateTaxes</strong> se creó en asociación con el estado de Arizona para integrarse con la herramienta Direct File del IRS.<br /><br />
             Estamos cerrados por la temporada de impuestos. Desafortunadamente no puede presentar su declaración estatal con nosotros este año.
           supported_by: Respaldada por el estado de Arizona
           title: Presenta tus impuestos estatales de Arizona sin costo
+        built_with_html: "<strong>FileYourStateTaxes</strong> ha sido creado en colaboración con el estado de %{state_name} para integrarse con la herramienta Direct File del IRS y solo toma de 10 a 15 minutos completarlo <strong>una vez que tu declaración federal sea aceptada</strong>. Comienza configurando tu cuenta.\n"
         continue: Para continuar presentando su declaración estatal de %{state_name}, inicie sesión a continuación
         download_your_record: Descargue tu registro
         help_text_html: |
-          <strong>Lo que necesitarás para comenzar</strong>
-          <br />
           <ul class="list--bulleted">
             <li>Una declaración federal de %{filing_year} <strong>aceptada</strong> mediante <a href="https://directfile.irs.gov/">IRS Direct File</a>. (No necesitas una copia de esta declaración; transferirás tu declaración aquí).</li>
             <li>Dirección de correo electrónico o número de teléfono.</li>
@@ -2108,35 +2106,30 @@ es:
             <li>Formulario 1099-G (si recibiste beneficios de desempleo en %{filing_year}).</li>
             <li>Números de ruta bancaria y de cuenta (si deseas recibir tu reembolso o hacer un pago de impuestos electrónicamente).</li>
           </ul>
+        help_text_title: "¿Qué necesitaré para completar mi declaración de impuestos estatales?"
         id:
-          built_with_html: "<strong>FileYourStateTaxes</strong> ha sido creado en colaboración con el estado de Idaho para integrarse con la herramienta Direct File del IRS y solo toma de 10 a 15 minutos completarlo <strong>una vez que tu declaración federal sea aceptada</strong>. Comienza configurando tu cuenta."
           closed_html: |
             <strong>FileYourStateTaxes</strong> se creó en asociación con el estado de Idaho para integrarse con la herramienta Direct File del IRS.<br /><br />
             Estamos cerrados por la temporada de impuestos. Desafortunadamente no puede presentar su declaración estatal con nosotros este año.
           supported_by: Respaldada por el estado de Idaho
           title: Presenta tus impuestos estatales de Idaho sin costo
         md:
-          built_with_html: "<strong>FileYourStateTaxes</strong> ha sido creado en colaboración con Maryland para integrarse con la herramienta Direct File del IRS y solo toma de 10 a 15 minutos completarlo <strong>una vez que tu declaración federal sea aceptada</strong>. Comienza configurando tu cuenta."
           closed_html: |
             <strong>FileYourStateTaxes</strong> se creó en asociación con Maryland para integrarse con la herramienta Direct File del IRS.<br /><br />
             Estamos cerrados por la temporada de impuestos. Desafortunadamente no puede presentar su declaración estatal con nosotros este año.
           supported_by: Respaldada por Maryland
           title: Presenta tus impuestos Maryland sin costo
         nc:
-          built_with_html: "<strong>FileYourStateTaxes</strong> ha sido creado en colaboración con el estado de North Carolina para integrarse con la herramienta Direct File del IRS y solo toma de 10 a 15 minutos completarlo <strong>una vez que tu declaración federal sea aceptada</strong>. Comienza configurando tu cuenta."
           closed_html: |
             <strong>FileYourStateTaxes</strong> se creó en asociación con el estado de North Carolina para integrarse con la herramienta Direct File del IRS.<br /><br />
             Estamos cerrados por la temporada de impuestos. Desafortunadamente no puede presentar su declaración estatal con nosotros este año.
           supported_by: Respaldada por el estado de North Carolina
           title: Presenta tus impuestos estatales de North Carolina sin costo
         nj:
-          built_with_html: "<strong>FileYourStateTaxes</strong> ha sido creado en colaboración con el <strong>New Jersey Office of Innovation</strong> para integrarse con la herramienta Direct File del IRS y solo toma de 10 a 15 minutos completarlo <strong>una vez que tu declaración federal sea aceptada</strong>. Comienza configurando tu cuenta."
           closed_html: |
             <strong>FileYourStateTaxes</strong> se creó en asociación con el New Jersey Office of Innovation para integrarse con la herramienta Direct File del IRS.<br /><br />
             Estamos cerrados por la temporada de impuestos. Desafortunadamente no puede presentar su declaración estatal con nosotros este año.
           help_text_html: |
-            <strong>Lo que necesitarás para comenzar</strong>
-            <br />
             <ul class="list--bulleted">
               <li>Una declaración federal de %{filing_year} <strong>aceptada</strong> mediante <a href="https://directfile.irs.gov/">IRS Direct File</a>. (No necesitas una copia de esta declaración; transferirás tu declaración aquí).</li>
               <li>Dirección de correo electrónico o número de teléfono.</li>
@@ -2147,7 +2140,6 @@ es:
           title: Presenta tus impuestos estatales de New Jersey sin costo
         not_you: "¿No es %{user_name}?"
         ny:
-          built_with_html: "<strong>FileYourStateTaxes</strong> ha sido creado en colaboración con el <strong>estado de Nueva York</strong> para integrarse con la herramienta Direct File del IRS y tarda aproximadamente de 10 a 15 minutos completarlo <strong>una vez que tu declaración federal sea aceptada</strong>. Comienza configurando tu cuenta."
           closed_html: |
             <strong>FileYourStateTaxes</strong> se creó en asociación con el estado de Nueva York para integrarse con la herramienta Direct File del IRS.<br /><br />
             Estamos cerrados por la temporada de impuestos. Lamentablemente no puede presentar su declaración estatal con nosotros este año.

From 4b4f8e293d7269c610054e2d2d4ed87de46b5253 Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 12:17:37 -0800
Subject: [PATCH 02/12] update /eligible page, some AZ specific some global

---
 .../questions/eligible/_az_supported.html.erb |  2 ++
 .../eligible/_az_unsupported.html.erb         |  2 --
 .../questions/eligible/edit.html.erb          | 24 +++++++++++--------
 config/locales/en.yml                         | 13 ++++++----
 config/locales/es.yml                         |  8 +++----
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/app/views/state_file/questions/eligible/_az_supported.html.erb b/app/views/state_file/questions/eligible/_az_supported.html.erb
index a7aa7b3b89..327e1c506c 100644
--- a/app/views/state_file/questions/eligible/_az_supported.html.erb
+++ b/app/views/state_file/questions/eligible/_az_supported.html.erb
@@ -3,4 +3,6 @@
   <li><a href="https://azdor.gov/individuals/income-tax-filing-assistance/deductions-and-exemptions" target="_blank" rel="noopener nofollow"><%= t(".dependent_credit") %></a></li>
   <li><a href="https://azdor.gov/individuals/income-tax-filing-assistance/tax-credits" target="_blank" rel="noopener nofollow"><%= t(".family_income_credit") %></a></li>
   <li><a href="https://azdor.gov/forms/tax-credits-forms/credit-increased-excise-taxes" target="_blank" rel="noopener nofollow"><%= t(".increased_excise_credit") %></a></li>
+  <li><%= t(".public_school_credit") %></li>
+  <li><%= t(".charitable_contributions_credit") %></li>
 </ul>
\ No newline at end of file
diff --git a/app/views/state_file/questions/eligible/_az_unsupported.html.erb b/app/views/state_file/questions/eligible/_az_unsupported.html.erb
index 2222c27c93..bfd947b52f 100644
--- a/app/views/state_file/questions/eligible/_az_unsupported.html.erb
+++ b/app/views/state_file/questions/eligible/_az_unsupported.html.erb
@@ -19,8 +19,6 @@
   <%=t('.other_credits_heading') %>
   <ul>
     <li><%=t('.other_credits_529_html') %></li>
-    <li><%=t('.other_credits_qcos_html') %></li>
-    <li><%=t('.other_credits_qfcos_html') %></li>
     <li><%=t('.other_credits_301_html') %></li>
     <li><%=t('.other_credits_itemized_deductions') %></li>
     <li><%=t('.other_credits_add_dependents') %></li>
diff --git a/app/views/state_file/questions/eligible/edit.html.erb b/app/views/state_file/questions/eligible/edit.html.erb
index 207c5f014d..5084a07b0a 100644
--- a/app/views/state_file/questions/eligible/edit.html.erb
+++ b/app/views/state_file/questions/eligible/edit.html.erb
@@ -3,26 +3,30 @@
 <% content_for :page_title, title1 %>
 <% content_for :card do %>
   <h1 class="h2"><%= title1 %></h1>
-  <h2 class="h2"><%= t(".title2_html") %></h2>
+  <p><%= t(".body_html") %></p>
 
   <div class="white-group">
     <%= render partial: "state_file/questions/eligible/#{current_state_code}_supported" %>
   </div>
 
   <div class="reveal">
-    <p><button class="reveal__button"><%= t('.not_supported') %></button></p>
+    <p>
+      <button class="reveal__button"><%= t('.not_supported') %></button>
+    </p>
     <div class="reveal__content">
       <% unless current_intake.disqualifying_eligibility_rules.empty? %>
         <%= render partial: "state_file/questions/eligible/#{current_state_code}_unsupported" %>
       <% end %>
-      <div class="with-top-separator">
-        <p class="text--bold"><%=t('.want_to_claim_heading') %></p>
-        <p><%=t('.want_to_claim_vita', state_name: current_state_name) %></p>
-        <p>
-          <a href="<%= @vita_link %>" target="_blank" rel="noopener nofollow"><%= t('state_file.questions.eligibility_offboarding.other_options.vita_link') %></a>
-        </p>
-        <p><%=t('.want_to_claim_learn_more_html', link: @faq_other_options_link) %></p>
-      </div>
+    </div>
+  </div>
+  <div class="reveal">
+    <button class="reveal__button"><%= t('.not_supported_reveal_heading') %></button>
+    <div class="reveal__content">
+      <p><%= t('.want_to_claim_vita', state_name: current_state_name) %></p>
+      <p>
+        <a href="<%= @vita_link %>" target="_blank" rel="noopener nofollow"><%= t('state_file.questions.eligibility_offboarding.other_options.vita_link') %></a>
+      </p>
+      <p><%= t('.want_to_claim_learn_more_html', link: @faq_other_options_link) %></p>
     </div>
   </div>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 11bc4bb046..d3cf19b043 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2410,19 +2410,19 @@ en:
           vita_link: Get started with VITA now
       eligible:
         az_supported:
+          charitable_contributions_credit: Credit for Contributions to Qualifying Charitable Organizations
           dependent_credit: Dependent Credit
           family_income_credit: Family Income Credit
           increased_deduction: An increased deduction for charitable contributions
           increased_excise_credit: Increased Excise Credit
+          public_school_credit: Public School Tax Credit
         az_unsupported:
           other_credits_301_html: Nonrefundable credits listed on <a href="https://azdor.gov/sites/default/files/2023-03/FORMS_CREDIT_2022_301-SBI_f.pdf" target="_blank" rel="noopener nofollow">AZ Form 301</a>
           other_credits_529_html: <a href="https://az529.gov/what-is-a-529-plan/az-tax-incentives/" target="_blank" rel="noopener nofollow">Arizona 529 plan contributions deduction</a>
           other_credits_add_dependents: Adding dependents not claimed on the federal return
           other_credits_change_filing_status: Change in filing status from federal to state return
-          other_credits_heading: Other credits and deductions not supported this year:"
+          other_credits_heading: 'Other credits and deductions not supported this year:'
           other_credits_itemized_deductions: Itemized deductions
-          other_credits_qcos_html: <a href="https://azdor.gov/tax-credits/credits-contributions-qcos-and-qfcos" target="_blank" rel="noopener nofollow">Credit for Contributions to Qualifying Charitable Organizations</a>
-          other_credits_qfcos_html: <a href="https://azdor.gov/tax-credits/credits-contributions-qcos-and-qfcos" target="_blank" rel="noopener nofollow">Credit for Contributions to Qualifying Foster Care Charitable Organization</a>
           property_tax_credit_age: Be 65 or older; or receive Supplemental Security Income
           property_tax_credit_heading_html: '<a href="https://azdor.gov/individuals/income-tax-filing-assistance/tax-credits" target="_blank" rel="noopener nofollow">Property Tax Credit</a>. To qualify for this credit you must:'
           property_tax_credit_income: have total household income less than $3,751 if you live alone; or total household income less than $5,501 if you live with others; and
@@ -2431,10 +2431,13 @@ en:
           public_school_tax_credit_paid_fees: Have paid school-related fees or donated money to a public school
           public_school_tax_credit_provide_info_html: Provide school information, including the <a href="https://azdor.gov/sites/default/files/2023-03/PUBLICATION_ADESchoolListing.pdf" target="_blank" rel="noopener nofollow">CTDS code</a>
         edit:
+          body_html: |
+            Let’s make sure this is the right service for you.
+            <br/><br/>
+            Here are the credits and deductions you <strong>may be able to</strong> claim with this service to maximize your refund.
           not_supported: What credits and deductions does this tool not support this year?
+          not_supported_reveal_heading: What if I have a situation not yet supported by FileYourStateTaxes?
           title1: You can use this tool to file your %{year} %{state} state taxes
-          title2_html: Here are the credits and deductions you <strong>may be able to</strong> claim with this tool to maximize your refund.
-          want_to_claim_heading: Want to claim these credits or deductions?
           want_to_claim_learn_more_html: Learn more about this process and other filing options <a href="%{link}" target="_blank">here</a>.
           want_to_claim_vita: You may be able to file your state return for free with help from IRS-certified VITA volunteers in %{state_name}. Note that this option may take 2-3 weeks to complete.
         id_supported:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3a91104280..379794e1dd 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2384,10 +2384,12 @@ es:
           vita_link: Solicitar asistencia de un voluntario VITA
       eligible:
         az_supported:
+          charitable_contributions_credit: Credit for Contributions to Qualifying Charitable Organizations
           dependent_credit: Crédito por Dependientes
           family_income_credit: Crédito por ingresos familiares
           increased_deduction: Una deducción aumentada por donaciones caritativas
           increased_excise_credit: Aumento en el crédito por impuesto de consumo
+          public_school_credit: Public School Tax Credit
         az_unsupported:
           other_credits_301_html: Créditos no reembolsables enumerados en el <a href="https://azdor.gov/sites/default/files/2023-03/FORMS_CREDIT_2022_301-SBI_f.pdf" target="_blank" rel="noopener nofollow">Formulario AZ 301</a>
           other_credits_529_html: <a href="https://az529.gov/what-is-a-529-plan/az-tax-incentives/" target="_blank" rel="noopener nofollow">Deducción por contribuciones al plan 529 de Arizona</a>
@@ -2395,8 +2397,6 @@ es:
           other_credits_change_filing_status: Cambio en el estado civil de presentación de la declaración federal a estatal
           other_credits_heading: 'Otros créditos y deducciones no admitidos este año:'
           other_credits_itemized_deductions: Deducciones detalladas
-          other_credits_qcos_html: <a href="https://azdor.gov/tax-credits/credits-contributions-qcos-and-qfcos" target="_blank" rel="noopener nofollow">Crédito por donaciones caritativas a organizaciones calificadas</a>
-          other_credits_qfcos_html: <a href="https://azdor.gov/tax-credits/credits-contributions-qcos-and-qfcos" target="_blank" rel="noopener nofollow">Crédito por donaciones caritativas a organizaciones de cuidado y crianza calificadas</a>
           property_tax_credit_age: Tener 65 años o más, o recibir pagos de Seguridad de Ingreso Suplementario
           property_tax_credit_heading_html: '<a href="https://azdor.gov/individuals/income-tax-filing-assistance/tax-credits" target="_blank" rel="noopener nofollow">Crédito tributario por impuestos a la propiedad</a>. Para calificar para este crédito, debes:'
           property_tax_credit_income: Tener un ingreso total del hogar menor a $3,751 si vives solo; o un ingreso total del hogar menor a $5,501 si vives con otros
@@ -2405,10 +2405,10 @@ es:
           public_school_tax_credit_paid_fees: Haber pagado tarifas relacionadas con la escuela o donado dinero a una escuela pública
           public_school_tax_credit_provide_info_html: Compartir información de la escuela, incluyendo el <a href="https://azdor.gov/sites/default/files/2023-03/PUBLICATION_ADESchoolListing.pdf" target="_blank" rel="noopener nofollow">código CTDS</a>
         edit:
+          body_html: Aquí están los créditos y deducciones que <strong>podrías</strong> reclamar con esta herramienta para maximizar tu reembolso.
           not_supported: "¿Cuáles créditos y deducciones no admite esta herramienta este año?"
+          not_supported_reveal_heading: "¿Quieres reclamar estos créditos o deducciones? "
           title1: "¡Buenas noticias! Puedes usar esta herramienta este año %{year} para presentar tus impuestos estatales %{state}."
-          title2_html: Aquí están los créditos y deducciones que <strong>podrías</strong> reclamar con esta herramienta para maximizar tu reembolso.
-          want_to_claim_heading: "¿Quieres reclamar estos créditos o deducciones? "
           want_to_claim_learn_more_html: Obtén más información sobre este proceso y otras opciones de presentación <a href="%{link}" target="_blank">aquí</a>.
           want_to_claim_vita: Es posible que puedas presentar tu declaración de impuestos estatales de forma gratuita con la ayuda de voluntarios VITA certificados por el IRS en %{state_name}. Ten en cuenta que esta opción puede demorar de 2 a 3 semanas en completarse.
         id_supported:

From bb4a96feb0a5a5970dc989f78392e878724063de Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 12:24:25 -0800
Subject: [PATCH 03/12] replace 'tool' with 'service' in all state file copy

---
 config/locales/en.yml | 66 +++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d3cf19b043..689c52dfa9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2127,7 +2127,7 @@ en:
         already_started_html: Already started filing your state return? <a href="%{sign_in_url}">Sign in</a>.
         az:
           closed_html: |
-            <strong>FileYourStateTaxes</strong> is built in partnership with the state of Arizona to integrate with the IRS Direct File tool.<br /><br />
+            <strong>FileYourStateTaxes</strong> is built in partnership with the state of Arizona to integrate with the IRS Direct File service.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of Arizona
           title: File your Arizona state taxes for free
@@ -2145,24 +2145,24 @@ en:
         help_text_title: What will I need to complete my state tax return?
         id:
           closed_html: |
-            <strong>FileYourStateTaxes</strong> is built in partnership with the state of Idaho to integrate with the IRS Direct File tool.<br /><br />
+            <strong>FileYourStateTaxes</strong> is built in partnership with the state of Idaho to integrate with the IRS Direct File service.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of Idaho
           title: File your Idaho state taxes for free
         md:
           closed_html: |
-            <strong>FileYourStateTaxes</strong> is built in partnership with Maryland to integrate with the IRS Direct File tool.<br /><br />
+            <strong>FileYourStateTaxes</strong> is built in partnership with Maryland to integrate with the IRS Direct File service.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of Maryland
           title: File your state taxes for free
         nc:
           closed_html: |
-            <strong>FileYourStateTaxes</strong> is built in partnership with the state of North Carolina to integrate with the IRS Direct File tool.<br /><br />
+            <strong>FileYourStateTaxes</strong> is built in partnership with the state of North Carolina to integrate with the IRS Direct File service.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of North Carolina
           title: File your North Carolina state taxes for free
         nj:
-          closed_html: "<strong>FileYourStateTaxes</strong> is built in partnership with the New Jersey Office of Innovation to integrate with the IRS Direct File tool.<br /><br />\nWe're closed for the tax season. Unfortunately you can no longer file your state return with us this year.              \n"
+          closed_html: "<strong>FileYourStateTaxes</strong> is built in partnership with the New Jersey Office of Innovation to integrate with the IRS Direct File service.<br /><br />\nWe're closed for the tax season. Unfortunately you can no longer file your state return with us this year.              \n"
           help_text_html: |
             <ul class="list--bulleted">
               <li>An <strong>accepted</strong> %{filing_year} federal return using <a href="https://directfile.irs.gov/">IRS Direct File</a>. (You don’t need a copy of this return; you’ll transfer your return here.)
@@ -2175,7 +2175,7 @@ en:
         not_you: Not %{user_name}?
         ny:
           closed_html: |
-            <strong>FileYourStateTaxes</strong> is built in partnership with New York State to integrate with the IRS Direct File tool.<br /><br />
+            <strong>FileYourStateTaxes</strong> is built in partnership with New York State to integrate with the IRS Direct File service.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by New York State
           title: File your New York State taxes for free
@@ -2183,7 +2183,7 @@ en:
         title_closed: Our free %{state_name} tax filing service is closed for the season
         welcome_back: Welcome back %{user_name}!
     navigation:
-      section_1: 'Section 1: Can you use this tool'
+      section_1: 'Section 1: Can you use this service'
       section_2: 'Section 2: Create account'
       section_3: 'Section 3: Terms and conditions'
       section_4: 'Section 4: Transfer your data'
@@ -2358,8 +2358,8 @@ en:
             has_out_of_state_w2: you earned income in another state in 2024.
             has_yonkers_income: lived, earned income, or maintained a home in Yonkers in 2024.
             married_filing_separately: you are filing “married filing separately”.
-          offboarding_reason: You cannot use this tool this year because %{reason}
-          title: Unfortunately, after transferring your data, we found that you can’t use this tool this year. Don’t worry, here are other filing options.
+          offboarding_reason: You cannot use this service this year because %{reason}
+          title: Unfortunately, after transferring your data, we found that you can’t use this service this year. Don’t worry, here are other filing options.
       declined_terms_and_conditions:
         edit:
           action_html: "<strong>Is this a mistake?</strong>"
@@ -2372,7 +2372,7 @@ en:
           title: You’ve declined the terms and conditions.
       eligibility_offboarding:
         edit:
-          body_html: You cannot use this tool this year because you %{ineligible_reason}. <strong>Is this a mistake?</strong> <a href=%{prev_link}>Go back to correct.</a>
+          body_html: You cannot use this service this year because you %{ineligible_reason}. <strong>Is this a mistake?</strong> <a href=%{prev_link}>Go back to correct.</a>
           ineligible_reason:
             eligibility_529_for_non_qual_expense: withdrew money from a 529 college savings account and used it for a non-qualifying expense in %{filing_year}
             eligibility_emergency_rental_assistance: received emergency rental assistance in %{filing_year}
@@ -2390,7 +2390,7 @@ en:
             nyc_maintained_home: you lived in or maintained a home in New York City for some of the year.
             nyc_residency: you lived in or maintained a home in New York City for some of the year.
             permanent_address_outside_ny: you did not live in New York for all of %{filing_year}
-          title: Unfortunately, you can't use this tool this year. Don't worry, there are other filing options.
+          title: Unfortunately, you can't use this service this year. Don't worry, there are other filing options.
         other_options:
           faq_link: Visit our FAQ
           learn_more_here_html: Learn more <a href="%{link}" rel="noopener nofollow" target="_blank">here.</a>
@@ -2435,9 +2435,9 @@ en:
             Let’s make sure this is the right service for you.
             <br/><br/>
             Here are the credits and deductions you <strong>may be able to</strong> claim with this service to maximize your refund.
-          not_supported: What credits and deductions does this tool not support this year?
+          not_supported: What credits and deductions does this service not support this year?
           not_supported_reveal_heading: What if I have a situation not yet supported by FileYourStateTaxes?
-          title1: You can use this tool to file your %{year} %{state} state taxes
+          title1: You can use this service to file your %{year} %{state} state taxes
           want_to_claim_learn_more_html: Learn more about this process and other filing options <a href="%{link}" target="_blank">here</a>.
           want_to_claim_vita: You may be able to file your state return for free with help from IRS-certified VITA volunteers in %{state_name}. Note that this option may take 2-3 weeks to complete.
         id_supported:
@@ -2535,9 +2535,9 @@ en:
         edit:
           emergency_rental_assistance: In %{filing_year}, did you (or your spouse if filing together) receive emergency rental assistance?
           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 the %{filing_year} tax season, this tool will only be able to serve people with specific tax situations.
+          subtitle_1: For the %{filing_year} tax season, this service will only be able to serve people with specific tax situations.
           subtitle_2: Please answer the following questions to find out if you can use it.
-          title: First, let's see if you can use this tool to file your %{filing_year} Idaho taxes
+          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_list:
             bullet_1_html: "<strong>Medical Savings Account</strong> and use it for non-qualifying expenses"
@@ -2697,8 +2697,8 @@ en:
           permanent_home_copy: You cannot use this service if you and your spouse live in different counties, cities, towns, or taxing areas, and it is not a temporary situation.
           permanent_home_copy2: If you leave your permanent home to work or care for someone but plan to return, your permanent home hasn’t changed. You and your spouse are considered to live in different counties, cities, towns or taxing areas only if you are staying in these separate homes and it is not temporary.
           permanent_home_heading: What is a permanent home?
-          subtitle: For the %{year} season, this tool 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 tool to file your %{year} Maryland taxes
+          subtitle: For the %{year} 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 %{year} Maryland taxes
       md_had_health_insurance:
         edit:
           authorize_follow_up: If yes, the Comptroller’s Office will share your information and the email address on file with Maryland Health Connection.
@@ -2802,13 +2802,13 @@ en:
             p2: Most other uses of funds are non-qualifying expenses, including college application and testing fees, transportation costs, health insurance, and extracurricular costs.
             subtitle: 'Select ''no'' if:'
             title: What are qualifying and non- qualifying expenses?
-          title: First, let's see if you can use this tool to file your taxes
+          title: First, let's see if you can use this service to file your taxes
           withdraw_529_html: Did you (or your spouse, if you’re filing together) withdraw money from a <a href="https://www.cfnc.org/save-for-college/" target="_blank" rel="noopener nofollow">529 college savings account</a> and use it for non-qualifying expenses in %{filing_year}?
       nc_eligibility_residence:
         edit:
           lived_in_state_html: Did you (and your spouse, if you’re filing together) live in  %{state} for <strong>all</strong> of %{filing_year}?
-          subtitle: For the %{filing_year} tax season, this tool 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 tool to file your taxes
+          subtitle: For the %{filing_year} 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 taxes
       nc_primary_state_id:
         nc_primary:
           encourage_sharing: You’re encouraged to share this information, but it’s not required to file your North Carolina taxes.
@@ -3068,19 +3068,19 @@ en:
           non_qualifying_expenses:
             reveal_info_html: "<p>Qualifying expenses include tuition and fees, books, equipment (including computers and other tech), room and board, apprenticeship programs, and K-12 tuition up to $10,000.</p> \n\n<p>Most other uses of funds are non-qualifying expenses, including college application and testing fees, transportation costs, health insurance, and extracurricular costs.</p>\n\n<p><strong>Select 'no' if:</strong></p>\n<ul>\n  <li>You withdrew money from a 529 account and used it for qualifying expenses, or</li>\n  <li>You didn't withdraw money from a 529 account at all.</li>\n</ul>\n"
             title: What are qualifying and non-qualifying expenses?
-          title: First, let's see if you can use this tool to file your taxes
+          title: First, let's see if you can use this service to file your taxes
           withdraw_529: In %{filing_year}, did you contribute to a <u>529 college savings account</u>, or did you withdraw funds from a 529 account and use them for non-qualified expenses?
       ny_eligibility_out_of_state_income:
         edit:
           out_of_state_income_html: Did you (or your spouse, if you’re filing together) earn any income in another state in 2023? (This includes unemployment income <strong>received</strong> from another state.)
           part_year_nyc_resident_html: Were you (or your spouse, if you’re filing together) a part-year New York City resident in 2023? (Moved in or out of NYC during 2023) <br><br> New York City includes the Bronx, Brooklyn, Manhattan, Queens, and Staten Island.
-          title: First, let's see if you can use this tool to file your taxes
+          title: First, let's see if you can use this service to file your taxes
       ny_eligibility_residence:
         edit:
           lived_in_state_html: Did you (and your spouse, if you’re filing together) live in  %{state} for <strong>all</strong> of 2023?
           lived_or_income_in_yonkers_html: Did you (and your spouse, if you’re filing together) <strong>live, earn income, or maintain a home</strong> in Yonkers at any time in 2023?
-          subtitle: For the 2024 tax season, this tool 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 tool to file your taxes
+          subtitle: For the 2024 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 taxes
       ny_permanent_address:
         edit:
           address_header: Address
@@ -3209,7 +3209,7 @@ en:
           direct_debit_html: If you have a remaining tax balance, remember to <strong>pay your taxes online at <a target="_blank" rel="noopener nofollow" href="https://%{tax_payment_url}">%{tax_payment_url}</a></strong> or by mail before the April 15 filing deadline.
           download_title: Download a copy of your %{filing_year} %{state_name} state tax return until December 31, %{filing_year + 1}
           download_voucher: Download payment voucher form
-          feedback: We value your feedback—let us know what you think of this tool.
+          feedback: We value your feedback—let us know what you think of this service.
           include_payment: You'll need to include the payment voucher form.
           mail_voucher_and_payment: 'Mail the voucher form and payment to:'
           pay_by_mail_or_moneyorder: 'If you are paying by mail via check or money order:'
@@ -3235,12 +3235,12 @@ en:
               body: You can edit and resubmit your state return by clicking the button below.
               title: What's next?
             no_edit:
-              body_html: Unfortunately, there has been an issue with filing your state return that cannot be resolved on our tool. <u>Chat with us</u> or email us at help@fileyourstatetaxes.org for guidance on next steps.
+              body_html: Unfortunately, there has been an issue with filing your state return that cannot be resolved on our service. <u>Chat with us</u> or email us at help@fileyourstatetaxes.org for guidance on next steps.
               title: What can I do next?
           reject_code: 'Reject Code:'
           reject_desc: 'Reject Description:'
           title: Unfortunately, your %{filing_year} %{state_name} state tax return was rejected
-        thank_you_html: Thank you for filing your return with <strong>FileYourStateTaxes</strong>, built in partnership with the state of %{state_name} to integrate with the IRS Direct File tool.
+        thank_you_html: Thank you for filing your return with <strong>FileYourStateTaxes</strong>, built in partnership with the state of %{state_name} to integrate with the IRS Direct File service.
       review:
         county: County
       shared:
@@ -3305,7 +3305,7 @@ en:
             <strong>When you use the FileYourStateTaxes service, here's what you're agreeing to:</strong><br>
             <ul class="list--numbered">
           decline: Decline
-          list_items_html: <strong>Easy Tax Filing:</strong> FileYourStateTaxes is a free and easy to use tool built by Code for America to help you file your state tax return conveniently after you've completed your federal return.</li> <strong>Data Transfer:</strong> You're letting us use your federal return data as the starting point for your state tax return.</li> <strong>Questions for Accuracy:</strong> Sometimes we might ask you a few more questions to make sure your state tax return is complete and accurate.</li> <strong>Modernized eFile:</strong> We'll submit your state tax return using the Modernized eFile (MeF) system, which links it to your federal return.</li> <strong>Your Responsibility:</strong> You're responsible for making sure the information you provide is accurate and that you follow all federal and state tax laws.</li> <strong>No Guarantees:</strong> We do our best, but we can't guarantee the accuracy or success of your state tax return when you use FileYourStateTaxes.</li> <strong>Privacy and Security:</strong> We're serious about protecting your privacy and data. Check out our <a href="%{privacy_policy_link}" target="_blank" rel="noopener nofollow">Privacy Policy</a> for all the details.</li> <strong>Stay Updated:</strong> We'll send you updates about your state tax return through your preferred communication method - either text message (SMS) or email. This includes status updates, reminders, and important information.</li> <strong>Your Choice:</strong> You can change your preferred communication method or opt out of these updates anytime by following the instructions in the messages or through your account settings.</li> <strong>Data Removal:</strong> You have the right to ask us to remove your personal data and tax-related information from FileYourStateTaxes whenever you want. Just contact us or use the data removal function in the software. But keep in mind, this might affect your access to the service.</li> <strong>Links to Third Party Sites:</strong> Links in the software will let you leave FileYourStateTaxes. The linked sites are not under the control of FileYourStateTaxes and FileYourStateTaxes is not responsible for the contents of any linked site or any link contained in a linked site, or any changes or updates to such sites. FileYourStateTaxes is providing these links to you only as a convenience, and the inclusion of any link does not imply endorsement by FileYourStateTaxes of the site.</li> <strong>Governing Law:</strong> This Agreement will be governed by and construed in accordance with the laws of the state of California.</li> <strong>Questions and Concerns:</strong> If you have any questions or concerns about these terms, feel free to reach out to us at <a href="mailto:help@fileyourstatetaxes.org">help@fileyourstatetaxes.org</a>.</li>
+          list_items_html: <strong>Easy Tax Filing:</strong> FileYourStateTaxes is a free and easy to use service built by Code for America to help you file your state tax return conveniently after you've completed your federal return.</li> <strong>Data Transfer:</strong> You're letting us use your federal return data as the starting point for your state tax return.</li> <strong>Questions for Accuracy:</strong> Sometimes we might ask you a few more questions to make sure your state tax return is complete and accurate.</li> <strong>Modernized eFile:</strong> We'll submit your state tax return using the Modernized eFile (MeF) system, which links it to your federal return.</li> <strong>Your Responsibility:</strong> You're responsible for making sure the information you provide is accurate and that you follow all federal and state tax laws.</li> <strong>No Guarantees:</strong> We do our best, but we can't guarantee the accuracy or success of your state tax return when you use FileYourStateTaxes.</li> <strong>Privacy and Security:</strong> We're serious about protecting your privacy and data. Check out our <a href="%{privacy_policy_link}" target="_blank" rel="noopener nofollow">Privacy Policy</a> for all the details.</li> <strong>Stay Updated:</strong> We'll send you updates about your state tax return through your preferred communication method - either text message (SMS) or email. This includes status updates, reminders, and important information.</li> <strong>Your Choice:</strong> You can change your preferred communication method or opt out of these updates anytime by following the instructions in the messages or through your account settings.</li> <strong>Data Removal:</strong> You have the right to ask us to remove your personal data and tax-related information from FileYourStateTaxes whenever you want. Just contact us or use the data removal function in the software. But keep in mind, this might affect your access to the service.</li> <strong>Links to Third Party Sites:</strong> Links in the software will let you leave FileYourStateTaxes. The linked sites are not under the control of FileYourStateTaxes and FileYourStateTaxes is not responsible for the contents of any linked site or any link contained in a linked site, or any changes or updates to such sites. FileYourStateTaxes is providing these links to you only as a convenience, and the inclusion of any link does not imply endorsement by FileYourStateTaxes of the site.</li> <strong>Governing Law:</strong> This Agreement will be governed by and construed in accordance with the laws of the state of California.</li> <strong>Questions and Concerns:</strong> If you have any questions or concerns about these terms, feel free to reach out to us at <a href="mailto:help@fileyourstatetaxes.org">help@fileyourstatetaxes.org</a>.</li>
           list_items_no_sms_html: "<strong>Stay Updated:</strong> We'll send you updates about your state tax return through email. This includes status updates, reminders, and important information.</li>\n"
           ny_text_html: |
             <strong>E-file your New York State income tax return at no extra charge.</strong><br><br>
@@ -3342,7 +3342,7 @@ en:
           information_html: "<strong>How do I find this information?</strong>"
           money_boxes_label: Please complete the following boxes based on what’s reported on Form 1099-G.
           need_additional_information: Great! We need some additional information about what’s on Form 1099-G. (If you have more than one 1099-G, you can add it at the end.)
-          other_tax_filing_options_html: <strong>Reminder:</strong> In %{filing_year_plus_one}, this tool does not support filing unemployment income received from another state. To file income received from another state, check out <a target="_blank" rel="noopener nofollow" href="%{link}">other tax filing options.</a>
+          other_tax_filing_options_html: <strong>Reminder:</strong> In %{filing_year_plus_one}, this service does not support filing unemployment income received from another state. To file income received from another state, check out <a target="_blank" rel="noopener nofollow" href="%{link}">other tax filing options.</a>
           payer_address: Payer's Street Address
           payer_name: Payer's Name
           payer_question_html: Please enter the <strong>payer's information located in the top left corner</strong> of the form&#58;
@@ -3406,11 +3406,11 @@ en:
           <strong>FileYourStateTaxes</strong> integrates with <strong>IRS Direct File</strong> to help you complete your state tax return <strong>for free.</strong> <br/><br/>
           <strong>We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.</strong><br /><br />
           Already filed your state taxes with us? <strong>You can download a copy of your state return until December 31, 2024</strong><br /><br />
-        header: A free state filing tool for Arizona and New York taxpayers using IRS Direct File
+        header: A free state filing service for Arizona and New York taxpayers using IRS Direct File
         section1_html: |
           <strong>How does it work?</strong>
           <ol class="list--numbered">
-            <li>File and submit your federal return with <a target="_blank" rel="nofollow noopener" href="https://directfile.irs.gov/">IRS Direct File</a> before using this tool.</li>
+            <li>File and submit your federal return with <a target="_blank" rel="nofollow noopener" href="https://directfile.irs.gov/">IRS Direct File</a> before using this service.</li>
             <li>Click "continue to file your state taxes"</li>
             <li>Answer a few questions to make sure this is the right service for you. <a target="_blank" rel="nofollow noopener" href="https://directfile.irs.gov/state">Learn more about who is eligible for this tax year</a>.</li>
             <li>Transfer your federal return to fill in most of your state return.</li>
@@ -3432,7 +3432,7 @@ en:
         faq: FAQ
         privacy_policy: Privacy Policy
         sms_terms: SMS Terms
-        state_file_description_html: FileYourStateTaxes is built by <a target="_blank" rel="noopener nofollow" href="https://www.codeforamerica.org">Code for America</a> in partnership with New York State and the state of Arizona to integrate with the IRS Direct File tool.
+        state_file_description_html: FileYourStateTaxes is built by <a target="_blank" rel="noopener nofollow" href="https://www.codeforamerica.org">Code for America</a> in partnership with New York State and the state of Arizona to integrate with the IRS Direct File service.
       login_options:
         email_signin: Sign in with email
         help_text_html: New to FileYourStateTaxes? <a href=%{link}>Get Started</a>
@@ -3466,7 +3466,7 @@ en:
         effective_date: This version of the policy is effective January 15, 2024.
         effective_date_header: Effective Date
         header: Privacy Policy
-        header_1_html: <a href='%{link}' target='_blank' rel='noopener nofollow'>FileYourStateTaxes.org</a> is a service created by Code for America Labs, Inc. ("Code for America", "we", "us", "our") to help households file their state taxes after using the federal IRS Direct File tool.
+        header_1_html: <a href='%{link}' target='_blank' rel='noopener nofollow'>FileYourStateTaxes.org</a> is a service created by Code for America Labs, Inc. ("Code for America", "we", "us", "our") to help households file their state taxes after using the federal IRS Direct File service.
         header_2_html: This Privacy Policy describes how we collect, use, share, and protect your personal information. By using our Services, you agree to the terms in this Privacy Policy. This Privacy Notice applies regardless of the type of device you use to access our Services.
         header_3_html: If you have any questions or concerns about this Privacy Notice, please contact us at <a href="mailto:help@fileyourstatetaxes.org">help@fileyourstatetaxes.org</a>
         how_we_collect_your_info: 'We collect your information from various sources, such as when you or your household members:'

From 25e752f8e17d4eff4f6371e9855dc9a803f19224 Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 12:30:08 -0800
Subject: [PATCH 04/12] replace 'the IRS Direct File service' with 'IRS Direct
 File'

---
 config/locales/en.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 689c52dfa9..e3a10498fb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2127,7 +2127,7 @@ en:
         already_started_html: Already started filing your state return? <a href="%{sign_in_url}">Sign in</a>.
         az:
           closed_html: |
-            <strong>FileYourStateTaxes</strong> is built in partnership with the state of Arizona to integrate with the IRS Direct File service.<br /><br />
+            <strong>FileYourStateTaxes</strong> is built in partnership with the state of Arizona to integrate with IRS Direct File.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of Arizona
           title: File your Arizona state taxes for free
@@ -2145,24 +2145,24 @@ en:
         help_text_title: What will I need to complete my state tax return?
         id:
           closed_html: |
-            <strong>FileYourStateTaxes</strong> is built in partnership with the state of Idaho to integrate with the IRS Direct File service.<br /><br />
+            <strong>FileYourStateTaxes</strong> is built in partnership with the state of Idaho to integrate with IRS Direct File.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of Idaho
           title: File your Idaho state taxes for free
         md:
           closed_html: |
-            <strong>FileYourStateTaxes</strong> is built in partnership with Maryland to integrate with the IRS Direct File service.<br /><br />
+            <strong>FileYourStateTaxes</strong> is built in partnership with Maryland to integrate with IRS Direct File.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of Maryland
           title: File your state taxes for free
         nc:
           closed_html: |
-            <strong>FileYourStateTaxes</strong> is built in partnership with the state of North Carolina to integrate with the IRS Direct File service.<br /><br />
+            <strong>FileYourStateTaxes</strong> is built in partnership with the state of North Carolina to integrate with IRS Direct File.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of North Carolina
           title: File your North Carolina state taxes for free
         nj:
-          closed_html: "<strong>FileYourStateTaxes</strong> is built in partnership with the New Jersey Office of Innovation to integrate with the IRS Direct File service.<br /><br />\nWe're closed for the tax season. Unfortunately you can no longer file your state return with us this year.              \n"
+          closed_html: "<strong>FileYourStateTaxes</strong> is built in partnership with the New Jersey Office of Innovation to integrate with IRS Direct File.<br /><br />\nWe're closed for the tax season. Unfortunately you can no longer file your state return with us this year.              \n"
           help_text_html: |
             <ul class="list--bulleted">
               <li>An <strong>accepted</strong> %{filing_year} federal return using <a href="https://directfile.irs.gov/">IRS Direct File</a>. (You don’t need a copy of this return; you’ll transfer your return here.)
@@ -2175,7 +2175,7 @@ en:
         not_you: Not %{user_name}?
         ny:
           closed_html: |
-            <strong>FileYourStateTaxes</strong> is built in partnership with New York State to integrate with the IRS Direct File service.<br /><br />
+            <strong>FileYourStateTaxes</strong> is built in partnership with New York State to integrate with IRS Direct File.<br /><br />
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by New York State
           title: File your New York State taxes for free
@@ -3240,7 +3240,7 @@ en:
           reject_code: 'Reject Code:'
           reject_desc: 'Reject Description:'
           title: Unfortunately, your %{filing_year} %{state_name} state tax return was rejected
-        thank_you_html: Thank you for filing your return with <strong>FileYourStateTaxes</strong>, built in partnership with the state of %{state_name} to integrate with the IRS Direct File service.
+        thank_you_html: Thank you for filing your return with <strong>FileYourStateTaxes</strong>, built in partnership with the state of %{state_name} to integrate with IRS Direct File.
       review:
         county: County
       shared:
@@ -3432,7 +3432,7 @@ en:
         faq: FAQ
         privacy_policy: Privacy Policy
         sms_terms: SMS Terms
-        state_file_description_html: FileYourStateTaxes is built by <a target="_blank" rel="noopener nofollow" href="https://www.codeforamerica.org">Code for America</a> in partnership with New York State and the state of Arizona to integrate with the IRS Direct File service.
+        state_file_description_html: FileYourStateTaxes is built by <a target="_blank" rel="noopener nofollow" href="https://www.codeforamerica.org">Code for America</a> in partnership with New York State and the state of Arizona to integrate with IRS Direct File.
       login_options:
         email_signin: Sign in with email
         help_text_html: New to FileYourStateTaxes? <a href=%{link}>Get Started</a>

From 2610d72ee7f79a2cde31899c5b492dfc264c51a9 Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 14:11:11 -0800
Subject: [PATCH 05/12] update title of senior dependents page

---
 .../state_file/questions/az_senior_dependents/edit.html.erb     | 2 +-
 config/locales/en.yml                                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/state_file/questions/az_senior_dependents/edit.html.erb b/app/views/state_file/questions/az_senior_dependents/edit.html.erb
index 7fc19e83fe..9ac8f65c4b 100644
--- a/app/views/state_file/questions/az_senior_dependents/edit.html.erb
+++ b/app/views/state_file/questions/az_senior_dependents/edit.html.erb
@@ -1,4 +1,4 @@
-<% title = t('.title') %>
+<% title = t('.title', dependents_name_list: @form.dependents.pluck(:first_name).to_sentence) %>
 <% content_for :page_title, title %>
 
 <% content_for :card do %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e3a10498fb..9d721663cf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2303,7 +2303,7 @@ en:
         edit:
           assistance_label: Did %{name} need assistance with daily living activities such as dressing, eating, taking medication, shopping, or preparing their food?
           passed_away_label: Did %{name} pass away in %{filing_year}?
-          title: Please provide some more information about the people in your family who are 65 years of age or older.
+          title: We need additional information about %{dependents_name_list}
       az_subtractions:
         edit:
           armed_forces_member_label_html: You or your spouse are a member of the Reserves, the National Guard, or the U.S. Armed Forces <strong>and</strong> received pay for active duty military service.

From 46f62f10c9ae43b3bd0cfcdf1b46a9849e23a8b1 Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 14:22:45 -0800
Subject: [PATCH 06/12] fix a failing test

---
 .../state_file/questions/eligible_controller_spec.rb           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/controllers/state_file/questions/eligible_controller_spec.rb b/spec/controllers/state_file/questions/eligible_controller_spec.rb
index a45df45832..1846603179 100644
--- a/spec/controllers/state_file/questions/eligible_controller_spec.rb
+++ b/spec/controllers/state_file/questions/eligible_controller_spec.rb
@@ -1,7 +1,6 @@
 require "rails_helper"
 
 describe StateFile::Questions::EligibleController do
-
   let(:intake) { create :state_file_az_refund_intake}
   before do
     sign_in intake
@@ -12,7 +11,7 @@
     it 'succeeds' do
       get :edit
       expect(response).to be_successful
-      expect(response_html).to have_text "You can use this tool to file your"
+      expect(response_html).to have_text I18n.t("state_file.questions.eligible.edit.title1", year: MultiTenantService.statefile.current_tax_year, state: "Arizona")
     end
   end
 end

From b567675e9d5aaa3e6fb218503d5bfb57a798134b Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 14:29:00 -0800
Subject: [PATCH 07/12] dynamically determine years for prior last names

---
 .../state_file/questions/az_prior_last_names/edit.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/az_prior_last_names/edit.html.erb b/app/views/state_file/questions/az_prior_last_names/edit.html.erb
index 510b02c94c..20b5ffcf9c 100644
--- a/app/views/state_file/questions/az_prior_last_names/edit.html.erb
+++ b/app/views/state_file/questions/az_prior_last_names/edit.html.erb
@@ -2,7 +2,7 @@
 <% content_for :page_title, title %>
 <% content_for :card do %>
   <h1 class="h2"><%= title %></h1>
-  <p><%= t(".subtitle") %></p>
+  <p><%= t(".subtitle", start_year: current_tax_year - 5, end_year: current_tax_year - 2) %></p>
 
   <%= form_with model: @form, url: { action: :update }, local: true, method: "put", builder: VitaMinFormBuilder do |f| %>
     <div class="question-with-follow-up">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9d721663cf..22c42e153a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2230,7 +2230,7 @@ en:
           prior_last_names_label:
             one: 'Enter all last names used in the last four years. (Ex: Smith, Jones, Brown)'
             other: Enter all last names used by you and your spouse in the last four years.
-          subtitle: This includes tax years 2019-2022.
+          subtitle: This includes tax years %{start_year}-%{end_year}.
           title:
             one: Did you file with a different last name in the last four years?
             other: Did you or your spouse file with a different last name in the last four years?
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 379794e1dd..e999604f7c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2198,7 +2198,7 @@ es:
             many: Ingresa todos los apellidos utilizados por usted y su cónyuge en los últimos cuatro años.
             one: 'Ingresa todos los apellidos que usaste en los últimos cuatro años. (Ejemplo: Smith, Jones, Brown)'
             other: Ingresa todos los apellidos utilizados por usted y su cónyuge en los últimos cuatro años.
-          subtitle: Esto incluye los años tributarios 2019-2022.
+          subtitle: Esto incluye los años tributarios %{start_year}-%{end_year}.
           title:
             many: "¿Usted o su cónyuge presentaron una declaración con un apellido diferente en los últimos cuatro años?"
             one: "¿Presentaste con un apellido diferente en los últimos cuatro años?"

From b796b3ccf558328a4e4091aebde9effacd617ad0 Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 14:58:38 -0800
Subject: [PATCH 08/12] update content on income review page

---
 .../questions/income_review/edit.html.erb     | 58 +++++++++----------
 config/locales/en.yml                         |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/views/state_file/questions/income_review/edit.html.erb b/app/views/state_file/questions/income_review/edit.html.erb
index bdeca7f9fa..75e995f2d0 100644
--- a/app/views/state_file/questions/income_review/edit.html.erb
+++ b/app/views/state_file/questions/income_review/edit.html.erb
@@ -4,26 +4,6 @@
   <h1 class="h2"><%= title %></h1>
   <p><%= t(".help_text") %></p>
 
-  <% if current_intake.state_file1099_rs.present? %>
-    <div class="white-group retirement-income" id="form1099rs">
-      <p class="text--bold spacing-below-0"><%= t(".retirement_income_title") %></p>
-      <% current_intake.state_file1099_rs.each do |state_1099r| %>
-        <div class="spacing-above-25">
-          <p class="text--bold spacing-below-5"><%= state_1099r.recipient_name %></p>
-          <p class="spacing-below-5"><%= state_1099r.payer_name %></p>
-          <%= link_to t(".review_and_edit_state_info"),
-                      StateFile::Questions::RetirementIncomeController.to_path_helper(
-                        action: :edit,
-                        id: state_1099r.id,
-                        return_to_review: params[:return_to_review]
-                      ),
-                      class: "button--small"
-          %>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
-
   <% if @w2s.present? %>
     <div class="white-group" id="w2s">
       <p class="text--bold spacing-below-0"><%= t(".w2s_title") %></p>
@@ -44,15 +24,6 @@
     </div>
   <% end %>
 
-  <% if current_intake.direct_file_json_data.interest_reports.count > 0 %>
-    <div class="white-group">
-      <p class="text--bold spacing-below-0"><%= t(".interest_income_title") %></p>
-      <p class="text--grey-bold spacing-above-15 spacing-below-0">
-        <%= t(".interest_income_body") %>
-      </p>
-    </div>
-  <% end %>
-
   <% if current_intake.direct_file_data.fed_unemployment > 0 %>
     <div class="white-group unemployment" id="form1099gs">
       <p class="text--bold spacing-below-0"><%= t(".unemployment_title") %></p>
@@ -80,6 +51,35 @@
     </div>
   <% end %>
 
+  <% if current_intake.state_file1099_rs.present? %>
+    <div class="white-group retirement-income" id="form1099rs">
+      <p class="text--bold spacing-below-0"><%= t(".retirement_income_title") %></p>
+      <% current_intake.state_file1099_rs.each do |state_1099r| %>
+        <div class="spacing-above-25">
+          <p class="text--bold spacing-below-5"><%= state_1099r.recipient_name %></p>
+          <p class="spacing-below-5"><%= state_1099r.payer_name %></p>
+          <%= link_to t(".review_and_edit_state_info"),
+                      StateFile::Questions::RetirementIncomeController.to_path_helper(
+                        action: :edit,
+                        id: state_1099r.id,
+                        return_to_review: params[:return_to_review]
+                      ),
+                      class: "button--small"
+          %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% if current_intake.direct_file_json_data.interest_reports.count > 0 %>
+    <div class="white-group">
+      <p class="text--bold spacing-below-0"><%= t(".interest_income_title") %></p>
+      <p class="text--grey-bold spacing-above-15 spacing-below-0">
+        <%= t(".interest_income_body") %>
+      </p>
+    </div>
+  <% end %>
+
   <% if current_intake.direct_file_data.fed_ssb > 0 || current_intake.direct_file_data.fed_taxable_ssb > 0 %>
     <div class="white-group">
       <p class="text--bold spacing-below-0"><%= t(".ssa_title") %></p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 22c42e153a..4fed2dadd1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2647,7 +2647,7 @@ en:
           why_ask_this: Why are you asking for this information?
       income_review:
         edit:
-          help_text: We will ask about any missing information.
+          help_text: We will collect any missing information.
           interest_income_body: No additional state info needed
           interest_income_title: Interest income (1099-INT)
           no_info_needed: No additional state info needed

From 7a2acc3f2e4a99a59e92f509878ffc922c180979 Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 15:36:40 -0800
Subject: [PATCH 09/12] update title styling for w2, 1099R; add state prefix to
 state number input + styling

---
 app/assets/stylesheets/_state-file.scss          | 16 ++++++++++++++++
 .../questions/retirement_income/edit.html.erb    |  4 ++--
 config/locales/en.yml                            |  4 ++--
 spec/features/state_file/review_page_spec.rb     |  4 ++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss
index 5ab8a91163..09b2104f1a 100644
--- a/app/assets/stylesheets/_state-file.scss
+++ b/app/assets/stylesheets/_state-file.scss
@@ -287,6 +287,22 @@
       padding: 0 1rem;
     }
 
+    .text-input-group:has(.text-input-group__prefix) {
+      border-width: 0.1rem;
+
+      .text-input {
+        border: none;
+      }
+    }
+
+    .text-input-group {
+      .text-input-group__prefix {
+        background: none;
+        box-shadow: none;
+        padding: 0 10px 0 10px;
+      }
+    }
+
     .question-with-follow-up__follow-up {
       :not(.not-centered) {
         margin: 0;
diff --git a/app/views/state_file/questions/retirement_income/edit.html.erb b/app/views/state_file/questions/retirement_income/edit.html.erb
index 50e0e97cf0..b4b36c6f7b 100644
--- a/app/views/state_file/questions/retirement_income/edit.html.erb
+++ b/app/views/state_file/questions/retirement_income/edit.html.erb
@@ -1,4 +1,4 @@
-<% @main_heading = t("state_file.questions.retirement_income.edit.title", payer_name: @state_file1099_r.payer_name) %>
+<% @main_heading = t("state_file.questions.retirement_income.edit.title_html", payer_name: @state_file1099_r.payer_name) %>
 <% content_for :page_title, @main_heading %>
 
 <% content_for :card do %>
@@ -18,7 +18,7 @@
             <%= f.vita_min_money_field(:state_tax_withheld_amount, t(".box14_html"), classes: ["form-width--long"]) %>
           </div>
           <div class="form-question spacing-below-15">
-            <%= f.cfa_input_field(:payer_state_identification_number, t(".box15_html"), classes: ["form-width--long"]) %>
+            <%= f.cfa_input_field(:payer_state_identification_number, t(".box15_html"), classes: ["form-width--long"], prefix: current_state_code.upcase) %>
           </div>
           <div class="form-question spacing-below-15">
             <%= f.vita_min_money_field(:state_distribution_amount, t(".box16_html"), classes: ["form-width--long"]) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4fed2dadd1..d0f4528fb9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3201,7 +3201,7 @@ en:
           box14_html: "<b>Box 14</b>, State tax withheld"
           box15_html: "<b>Box 15</b>, State/Payer’s State Number"
           box16_html: "<b>Box 16</b>, State distribution"
-          title: Please review your retirement income (1099-R) details for %{payer_name}.
+          title_html: Please review your retirement income (1099-R) details for <strong>%{payer_name}</strong>.
       return_status:
         accepted:
           check_payable: Make your check or money order payable to Arizona Department of Revenue. Write your full SSN, “%{filing_year} Tax” and 140 on your payment.
@@ -3387,7 +3387,7 @@ en:
           box19_html: "<strong>Box 19,</strong> Local income tax"
           box20_locality_name: "<strong>Box 20,</strong> Locality name"
           employer_state_id_error: EIN cannot be more than 16 characters.
-          instructions_1_html: Please review your state income details for <strong>%{employer}</strong>
+          instructions_1_html: Please review your job (W-2) details for <strong>%{employer}</strong>
           local_income_tax_amt_error: Cannot be greater than local wages and tips.
           local_wages_and_tips_amt_error: Please enter local wages and tips
           locality_nm_missing_error: Please select locality name
diff --git a/spec/features/state_file/review_page_spec.rb b/spec/features/state_file/review_page_spec.rb
index 0efedd4ce5..31439736db 100644
--- a/spec/features/state_file/review_page_spec.rb
+++ b/spec/features/state_file/review_page_spec.rb
@@ -51,7 +51,7 @@
         end
 
         # 1099R edit page
-        expect(page).to have_text strip_html_tags(I18n.t("state_file.questions.retirement_income.edit.title", payer_name: intake.state_file1099_rs.first.payer_name))
+        expect(page).to have_text strip_html_tags(I18n.t("state_file.questions.retirement_income.edit.title_html", payer_name: intake.state_file1099_rs.first.payer_name))
         fill_in strip_html_tags(I18n.t("state_file.questions.retirement_income.edit.box15_html")), with: "123456789"
         click_on I18n.t("general.continue")
 
@@ -72,7 +72,7 @@
         end
 
         # 1099R edit page
-        expect(page).to have_text strip_html_tags(I18n.t("state_file.questions.retirement_income.edit.title", payer_name: intake.state_file1099_rs.first.payer_name))
+        expect(page).to have_text strip_html_tags(I18n.t("state_file.questions.retirement_income.edit.title_html", payer_name: intake.state_file1099_rs.first.payer_name))
         fill_in strip_html_tags(I18n.t("state_file.questions.retirement_income.edit.box15_html")), with: "123456789"
         click_on I18n.t("general.continue")
 

From 514e41d7367df161ee5f4dc9c27185f68c814ee0 Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 16:41:34 -0800
Subject: [PATCH 10/12] update copy and styling for az public school
 contributions page; fix some unrelated i18n errors

---
 app/assets/stylesheets/_state-file.scss       |  6 +++
 app/assets/stylesheets/_variables.scss        |  1 +
 .../_form.html.erb                            | 44 +++++++++++++++++--
 config/locales/en.yml                         | 41 ++++++++++++++---
 config/locales/es.yml                         | 34 +++++++++++---
 .../state_file/complete_intake_spec.rb        |  2 +-
 6 files changed, 111 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss
index 09b2104f1a..9b69407ead 100644
--- a/app/assets/stylesheets/_state-file.scss
+++ b/app/assets/stylesheets/_state-file.scss
@@ -424,6 +424,12 @@
         margin-bottom: 0;
       }
     }
+
+    .text--help {
+      font-size: 1.3rem;
+      margin-bottom: 0.8rem;
+      color: $color-state-file-grey-darker;
+    }
   }
 
   .h1 {
diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
index 8b3853daa9..6fb5d4c0f3 100644
--- a/app/assets/stylesheets/_variables.scss
+++ b/app/assets/stylesheets/_variables.scss
@@ -50,6 +50,7 @@ $color-state-file-input-border: #1B1B1B;
 $color-state-file-primary: #21C834;
 $color-state-file-separator: #BCBCBC;
 $color-state-file-chat: #4dcce3;
+$color-state-file-grey-darker: #808080;
 
 // Size
 $intake-max-width: 570px;
diff --git a/app/views/state_file/questions/az_public_school_contributions/_form.html.erb b/app/views/state_file/questions/az_public_school_contributions/_form.html.erb
index d1580be843..e2a1721485 100644
--- a/app/views/state_file/questions/az_public_school_contributions/_form.html.erb
+++ b/app/views/state_file/questions/az_public_school_contributions/_form.html.erb
@@ -1,4 +1,4 @@
-<% @main_heading = t("state_file.questions.az_public_school_contributions.edit.title", year: current_tax_year) %>
+<% @main_heading = t("state_file.questions.az_public_school_contributions.edit.title_html") %>
 
 <% content_for :page_title, @main_heading %>
 
@@ -10,7 +10,7 @@
         <div class="white-group">
           <%= f.cfa_radio_set(
                 :made_contribution,
-                label_text: t('state_file.questions.az_public_school_contributions.edit.made_contribution', year: current_tax_year),
+                label_text: t('state_file.questions.az_public_school_contributions.edit.made_contribution', count: current_intake.filer_count, year: current_tax_year),
                 collection: [
                   { value: :yes, label: t('general.affirmative'), input_html: { "data-follow-up": "#contribution-details" } },
                   { value: :no, label: t('general.negative') }
@@ -20,14 +20,43 @@
         </div>
       </div>
 
+      <div class="reveal">
+        <button class="reveal__button"><%= t('.which_qualify') %></button>
+        <div class="reveal__content">
+          <ul>
+            <% t(".qualifying_list").each do |list_item| %>
+              <li><%= list_item %></li>
+            <% end %>
+          </ul>
+          <p><%= t(".more_details_html") %></p>
+        </div>
+      </div>
+
+      <div class="reveal">
+        <button class="reveal__button"><%= t(".donations_this_year", current_year: current_tax_year + 1) %></button>
+        <div class="reveal__content">
+          <p><%= t(".donations_this_year_details_html", current_year: current_tax_year + 1) %></p>
+        </div>
+      </div>
+
       <div class="question-with-follow-up__follow-up" id="contribution-details">
         <div class="white-group">
           <p class="form-question spacing-below-25"><%= t('state_file.questions.az_public_school_contributions.edit.additional_info') %></p>
           <div class="form-group-tight">
-            <%= f.cfa_input_field(:school_name, t('state_file.questions.az_public_school_contributions.edit.school_name'), classes: ["form-width--long"]) %>
+            <%= f.cfa_input_field(
+                  :school_name,
+                  t('state_file.questions.az_public_school_contributions.edit.school_name'),
+                  classes: ["form-width--long"],
+                  help_text: t("state_file.questions.az_public_school_contributions.edit.school_name_help_text")
+                ) %>
             <%= f.cfa_input_field(:ctds_code, t('state_file.questions.az_public_school_contributions.edit.ctds_code'), classes: ["form-width--long"]) %>
             <%= f.cfa_input_field(:district_name, t('state_file.questions.az_public_school_contributions.edit.district_name'), classes: ["form-width--long"]) %>
-            <%= f.vita_min_money_field(:amount, t('state_file.questions.az_public_school_contributions.edit.amount', year: current_tax_year), classes: ["form-width--long"]) %>
+            <%= f.vita_min_money_field(
+                  :amount,
+                  t('state_file.questions.az_public_school_contributions.edit.amount', year: current_tax_year),
+                  classes: ["form-width--long"],
+                  help_text: t("state_file.questions.az_public_school_contributions.edit.amount_help_text", count: current_intake.filer_count)
+                ) %>
             <div class="date-select">
               <%= f.cfa_date_select(
                     :date_of_contribution,
@@ -40,6 +69,13 @@
             </div>
           </div>
         </div>
+
+        <div class="reveal">
+          <button class="reveal__button"><%= t(".school_details_question") %></button>
+          <div class="reveal__content">
+            <p><%= t(".school_details_answer_html") %></p>
+          </div>
+        </div>
       </div>
     </div>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d0f4528fb9..c631539888 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2238,14 +2238,43 @@ en:
         destroy:
           removed: Removed contribution for %{school_name}
         edit:
-          additional_info: 'Please provide the following information for each public school you paid fees or made contributions to:'
-          amount: Amount of contribution/fees paid in %{year}
+          additional_info: Please add details for each public school you paid fees or made donations to.
+          amount: Amount of donations/fees paid in %{year}
+          amount_help_text:
+            one: Arizona will credit up to $200
+            other: Arizona will credit up to $400
           ctds_code: School Code/CTDS
-          date_of_contribution: Date of payment in %{year} (mm/dd)
+          date_of_contribution: Date of payment in %{year}
           district_name: School District Name
-          made_contribution: Did you pay fees or make cash contributions to a public school in %{year}? Do not include amounts claimed on last year’s tax return.
+          made_contribution:
+            one: Did you pay any fees or make any qualified cash donation to an Arizona public school in %{year}?
+            other: Did you or your spouse pay any fees or make any qualified cash donation to an Arizona public school in %{year}?
           school_name: School Name
-          title: Did you pay fees or make cash contributions to a public school in %{year}?
+          school_name_help_text: Please use the official school name
+          title_html: You might be eligible for the <a href="https://azdor.gov/sites/default/files/2023-03/PUBLICATION_guideline-public-school-ECA-tax-credit.pdf" target="_blank">Arizona Public School Credit</a>!
+        form:
+          donations_this_year: What about donations made in %{current_year}?
+          donations_this_year_details_html: |
+            FileYourStateTaxes only allows you to add payment to the corresponding tax period.
+            <br/><br/>
+            You can report any donations made in %{current_year} in next year’s tax return.
+          more_details_html: Visit the <a href="https://azdor.gov/sites/default/files/2023-03/PUBLICATION_guideline-public-school-ECA-tax-credit.pdf" target="_blank">Arizona Department of Revenue Guide</a> for more details.
+          qualifying_list:
+          - Extracurricular Activities
+          - Character Education
+          - Standardized Testing and Fees
+          - Career and Technical Education Assessment
+          - CPR Training
+          school_details_answer_html: |
+            You can find this information on the receipt you received from the school.
+            <br/><br/>
+            OR
+            <br/><br/>
+            Visit the Arizona Department of Revenue to find the details.
+            <br/><br/>
+            To avoid any errors, highlight the text in the pdf then copy (Ctrl + C) and paste (Ctrl + V) directly to this page.
+          school_details_question: Where can I find the school details?
+          which_qualify: Which donations and fees qualify?
         index:
           add_another: Add another contribution
           amount_contributed: 'Amount contributed: %{amount}'
@@ -2262,7 +2291,7 @@ en:
           charity_name: Charity Name
           date_of_contribution: Date of payment in %{filing_year} (mm/dd)
           main_heading: Did you make cash contributions to a qualifying charitable organization in %{filing_year}?
-          main_heading_html: Did you make cash contributions to a <a href="https://azdor.gov/sites/default/files/2024-01/CREDITS_2024_qco.pdf" target="_blank" >qualifying charitable organization</a> in %{filing_year}?
+          main_heading_html: Did you make cash contributions to a <a href="https://azdor.gov/sites/default/files/2024-01/CREDITS_2024_qco.pdf" target="_blank">qualifying charitable organization</a> in %{filing_year}?
           question_header: 'Please provide the following information for each cash donation to a qualifying charitable organization:'
         index:
           add_another: Add another contribution
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e999604f7c..5c5bd0dbc6 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2208,13 +2208,35 @@ es:
           removed: Contribución eliminada para %{school_name}
         edit:
           additional_info: 'Por favor, proporciona la siguiente información para cada escuela pública a la que pagaste tarifas o hiciste contribuciones:'
-          amount: Cantidad de contribución/tarifas pagadas en %{year}
+          amount: Cantidad de donación/tarifas pagadas en %{year}
+          amount_help_text:
+            one: Arizona permite un máximo crédito tributario de las escuelas públicas de $200
+            other: Arizona permite un máximo crédito tributario de las escuelas públicas de $400
           ctds_code: Código de la escuela/CTDS
-          date_of_contribution: Fecha de pago en %{year} (mm/dd)
+          date_of_contribution: Fecha de pago en %{year}
           district_name: Nombre del distrito escolar
-          made_contribution: "¿Pagaste tarifas o hiciste contribuciones en efectivo a una escuela pública en %{year}? No incluyas cantidades reclamadas en la declaración de impuestos del año pasado."
+          made_contribution:
+            one: "¿Pagaste tarifas o hiciste contribuciones en efectivo a una escuela pública en %{year}? No incluyas cantidades reclamadas en la declaración de impuestos del año pasado."
+            other: "¿Pagaste tarifas o hiciste contribuciones en efectivo a una escuela pública en %{year}? No incluyas cantidades reclamadas en la declaración de impuestos del año pasado."
           school_name: Nombre de la escuela
-          title: "¿Pagaste tarifas o hiciste contribuciones en efectivo a una escuela pública en %{year}?"
+          school_name_help_text: Por favor ingresa el nombre oficial
+          title_html: ¡Podrías ser elegible para recibir <a href="https://azdor.gov/sites/default/files/2023-03/PUBLICATION_guideline-public-school-ECA-tax-credit.pdf" target="_blank">el crédito tributario de las escuelas públicas de Arizona</a>!
+        form:
+          donations_this_year: "¿Qué pasa con las donaciones hechas en %{current_year}?"
+          donations_this_year_details_html: |
+            FileYourStateTaxes sólo te permite agregar donaciones del período fiscal correspondiente.
+            <br/><br/>
+            Puedes reportar cualquier donación hecha en %{current_year} en la declaración de impuestos del próximo año.
+          more_details_html: Visita el <a href="https://azdor.gov/sites/default/files/2023-03/PUBLICATION_guideline-public-school-ECA-tax-credit.pdf" target="_blank">Departamento de Ingresos de Arizona</a> (disponible en inglés) para más detalles.
+          qualifying_list:
+          - Actividades extracurriculares
+          - Educación en valores
+          - Pruebas estandarizadas y sus tarifas
+          - Evaluación de educación técnica y profesional
+          - Entrenamiento de Reanimación Cardiopulmonar (RCP)
+          school_details_answer_html: "Puedes encontrar esta información en el recibo que te entregaron en la escuela. \n<br/><br/>\nO\n<br/><br/>\nVisita el Departamento de Ingresos de Arizona para encontrar la información.\n"
+          school_details_question: "¿Dónde puedo encontrar la información de la escuela?"
+          which_qualify: "¿Qué donaciones y tarifas califican?"
         index:
           add_another: Añadir otra contribución
           amount_contributed: 'Cantidad contribuida: %{amount}'
@@ -2272,7 +2294,7 @@ es:
         edit:
           assistance_label: "¿%{name} necesitó ayuda con actividades diarias como vestirse, comer, tomar medicamentos, hacer compras o preparar su comida?"
           passed_away_label: "%{name}falleció en el %{filing_year}?"
-          title: Proporciónanos más información sobre las personas en tu familia que tienen 65 años o más.
+          title: Necesitamos información adicional sobre %{dependents_name_list}
       az_subtractions:
         edit:
           armed_forces_member_label_html: Tú o tu cónyuge son miembros de las Reservas, la Guardia Nacional o las Fuerzas Armadas de los Estados Unidos <strong>y</strong> recibieron un salario por el servicio activo.
@@ -3185,7 +3207,7 @@ es:
           box14_html: "<b>Box 14</b>, Impuesto estatal retenido"
           box15_html: "<b>Box 15</b>, Estado/Número de estado del pagador"
           box16_html: "<b>Box 16</b>, distribución estatal"
-          title: Revise los detalles de sus ingresos de jubilación (1099-R) para %{payer_name}.
+          title_html: Revise los detalles de sus ingresos de jubilación (1099-R) para %{payer_name}.
       return_status:
         accepted:
           check_payable: Haz tu cheque o giro postal a nombre del “Arizona Department of Revenue. Escribe tu SSN completo, "%{filing_year} Tax" y 140 en tu pago.
diff --git a/spec/features/state_file/complete_intake_spec.rb b/spec/features/state_file/complete_intake_spec.rb
index 7192e017c1..aa92cf549e 100644
--- a/spec/features/state_file/complete_intake_spec.rb
+++ b/spec/features/state_file/complete_intake_spec.rb
@@ -219,7 +219,7 @@
       expect(page).to have_text(I18n.t('state_file.questions.unemployment.index.1099_label', name: StateFileAzIntake.last.primary.full_name))
       click_on I18n.t("general.continue")
 
-      expect(page).to have_text I18n.t('state_file.questions.az_public_school_contributions.edit.title', year: filing_year)
+      expect(page).to have_text I18n.t('state_file.questions.az_public_school_contributions.edit.title_html')
       choose I18n.t("general.affirmative")
       fill_in "az322_contribution_school_name", with: "Tax Elementary"
       fill_in "az322_contribution_ctds_code", with: "123456789"

From 299bd00e8f00bd56d8535f0835277a700f57e2b9 Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Mon, 2 Dec 2024 17:06:12 -0800
Subject: [PATCH 11/12] fix i18n spec failures

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5457bf1330..67edd62cd7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2133,7 +2133,10 @@ en:
             We're closed for the tax season. Unfortunately you can no longer file your state return with us this year.
           supported_by: Supported by the state of Arizona
           title: File your Arizona state taxes for free
-        built_with_html: "<strong>FileYourStateTaxes</strong> takes about 10 to 15 minutes to complete. Get started by setting up your account. \n<br/><br/>\nThis service is built in partnership with the state of %{state_name} to integrate with IRS Direct File.\n"
+        built_with_html: |
+          <strong>FileYourStateTaxes</strong> takes about 10 to 15 minutes to complete. Get started by setting up your account.
+          <br/><br/>
+          This service is built in partnership with the state of %{state_name} to integrate with IRS Direct File.
         continue: To continue filing your %{state_name} State return, please sign in below
         download_your_record: Download Your Record
         help_text_html: |
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 0c8e739017..fb316256aa 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2097,7 +2097,10 @@ es:
             Estamos cerrados por la temporada de impuestos. Desafortunadamente no puede presentar su declaración estatal con nosotros este año.
           supported_by: Respaldada por el estado de Arizona
           title: Presenta tus impuestos estatales de Arizona sin costo
-        built_with_html: "<strong>FileYourStateTaxes</strong> ha sido creado en colaboración con el estado de %{state_name} para integrarse con la herramienta Direct File del IRS y solo toma de 10 a 15 minutos completarlo <strong>una vez que tu declaración federal sea aceptada</strong>. Comienza configurando tu cuenta.\n"
+        built_with_html: |
+          <strong>FileYourStateTaxes</strong> solo toma de 10 a 15 minutos completarlo. Comienza configurando una cuenta.
+          <br/><br/>
+          Esta herramienta ha sido creada en colaboración con el estado de %{state_name} para integrarse con la herramienta Direct File del IRS.
         continue: Para continuar presentando su declaración estatal de %{state_name}, inicie sesión a continuación
         download_your_record: Descargue tu registro
         help_text_html: |
@@ -2236,7 +2239,14 @@ es:
           - Pruebas estandarizadas y sus tarifas
           - Evaluación de educación técnica y profesional
           - Entrenamiento de Reanimación Cardiopulmonar (RCP)
-          school_details_answer_html: "Puedes encontrar esta información en el recibo que te entregaron en la escuela. \n<br/><br/>\nO\n<br/><br/>\nVisita el Departamento de Ingresos de Arizona para encontrar la información.\n"
+          school_details_answer_html: |
+            Puedes encontrar esta información en el recibo que te entregaron en la escuela.
+            <br/><br/>
+            O
+            <br/><br/>
+            Visita el Departamento de Ingresos de Arizona para encontrar la información.
+            <br/><br/>
+            Para evitar errores, resalte el texto en el PDF, luego cópielo (Ctrl + C) y péguelo (Ctrl + V) directamente en esta página.
           school_details_question: "¿Dónde puedo encontrar la información de la escuela?"
           which_qualify: "¿Qué donaciones y tarifas califican?"
         index:
@@ -2438,7 +2448,10 @@ es:
           public_school_tax_credit_paid_fees: Haber pagado tarifas relacionadas con la escuela o donado dinero a una escuela pública
           public_school_tax_credit_provide_info_html: Compartir información de la escuela, incluyendo el <a href="https://azdor.gov/sites/default/files/2023-03/PUBLICATION_ADESchoolListing.pdf" target="_blank" rel="noopener nofollow">código CTDS</a>
         edit:
-          body_html: Aquí están los créditos y deducciones que <strong>podrías</strong> reclamar con esta herramienta para maximizar tu reembolso.
+          body_html: |
+            Asegurémonos que este servicio es el adecuado para ti.
+            <br/><br/>
+            Estos son los créditos y las deducciones <strong>que puedes reclamar</strong> con este servicio para maximizar tu reembolso.
           not_supported: "¿Cuáles créditos y deducciones no admite esta herramienta este año?"
           not_supported_reveal_heading: "¿Quieres reclamar estos créditos o deducciones? "
           title1: "¡Buenas noticias! Puedes usar esta herramienta este año %{year} para presentar tus impuestos estatales %{state}."
@@ -3248,7 +3261,7 @@ es:
           box14_html: "<b>Box 14</b>, Impuesto estatal retenido"
           box15_html: "<b>Box 15</b>, Estado/Número de estado del pagador"
           box16_html: "<b>Box 16</b>, distribución estatal"
-          title_html: Revise los detalles de sus ingresos de jubilación (1099-R) para %{payer_name}.
+          title_html: Revise los detalles de sus ingresos de jubilación (1099-R) para <strong>%{payer_name}</strong>.
       return_status:
         accepted:
           check_payable: Haz tu cheque o giro postal a nombre del “Arizona Department of Revenue. Escribe tu SSN completo, "%{filing_year} Tax" y 140 en tu pago.

From 0aae48622df279c5de8ae6df38985cd9c9e4c50f Mon Sep 17 00:00:00 2001
From: Jenny Heath <jheath@codeforamerica.org>
Date: Tue, 3 Dec 2024 10:29:56 -0800
Subject: [PATCH 12/12] fix feature spec

---
 spec/features/state_file/complete_intake_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/state_file/complete_intake_spec.rb b/spec/features/state_file/complete_intake_spec.rb
index 25d74677b4..4a86b49c85 100644
--- a/spec/features/state_file/complete_intake_spec.rb
+++ b/spec/features/state_file/complete_intake_spec.rb
@@ -161,7 +161,7 @@
       step_through_df_data_transfer("Transfer Old sample")
       click_on I18n.t("general.continue")
 
-      expect(page).to have_text I18n.t("state_file.questions.az_senior_dependents.edit.title")
+      expect(page).to have_text I18n.t("state_file.questions.az_senior_dependents.edit.title", dependents_name_list: "Grampy")
       expect(page).to have_text I18n.t("state_file.questions.az_senior_dependents.edit.assistance_label", name: "Grampy")
       expect(page).to have_text I18n.t("state_file.questions.az_senior_dependents.edit.passed_away_label", name: "Grampy", filing_year: filing_year)
       choose "state_file_az_senior_dependents_form_dependents_attributes_0_needed_assistance_yes"
@@ -193,7 +193,7 @@
       expect(page).to have_text(I18n.t('state_file.questions.unemployment.index.1099_label', name: StateFileAzIntake.last.primary.full_name))
       click_on I18n.t("general.continue")
 
-      expect(page).to have_text I18n.t('state_file.questions.az_public_school_contributions.edit.title_html')
+      expect(strip_html_tags(page.body)).to have_text strip_html_tags(I18n.t('state_file.questions.az_public_school_contributions.edit.title_html'))
       choose I18n.t("general.affirmative")
       fill_in "az322_contribution_school_name", with: "Tax Elementary"
       fill_in "az322_contribution_ctds_code", with: "123456789"