Fix merge bug in English locale info

config/locales/en.yml

@@ -1,3 +1,4 @@
+# License: CC0-1.0
 # Files in the config/locales directory are used for internationalization
 # and are automatically loaded by Rails. If you want to use locales other
 # than English, add the necessary files in this directory.
@@ -37,6 +38,8 @@ en:
         body: 'Comment content'
   organization:
     name: "Organisation"
+  organization_page:
+    promote: "Promote this organization"
   donation:
    amount: "Total Amount"
    date: "Transaction Date"
@@ -54,8 +57,9 @@ en:
         subject: "Donation receipt for %{nonprofit_name}"
         transfer_info_html: "This transfer will appear on your bank statement as %{label}"
         transfer_label_html: "<strong>Donation %{nonprofit_statement}</strong>."
-        oneoff_donation_html: "Thank you for your donation to <strong>%{nonprofit_name}</strong> and for joining thousands of people across Europe who are invested in making our movement a true force to be reckoned with. Your support will go towards ensuring we can move fast to win the campaigns that matter to all of us."
+        oneoff_donation_html: "Your donation towards <strong>%{nonprofit_name}</strong> was successful!"
-        recurring_donation_html: "Thank you for your regular donation to <strong>%{nonprofit_name}</strong> and for joining thousands of people across Europe who are invested in making our movement a true force to be reckoned with. Your support will go towards ensuring we can move fast to win the campaigns that matter to all of us."
+        recurring_donation_html: "Your recurring donation towards <strong>%{nonprofit_name}</strong>, started on %{start_date}, has been successfully paid."
+        recurring_donation_cancel_modify_html: "If you need to update your card or cancel your recurring donation, please follow this link: <a href=\"%{management_url}\">%{management_url}</a>"
       donor_direct_debit_notification:
         subject: "Donation receipt for %{nonprofit_name}"
         transfer_info_html: "This transfer will appear on your bank statement as %{label}"
@@ -166,3 +170,61 @@ en:
           twitter: "Tweet"
           twitter_message: "Join me in supporting"
         finish: "Finish"
+  registration:
+    get_started:
+      header: "Get started"
+      description: "Let's get started with Houdini. To begin, fill out your initial nonprofit and info."
+    wizard:
+      tabs:
+        nonprofit: "Nonprofit"
+        contact: "Contact"
+      nonprofit:
+        name:
+          label: "Organization Name"
+          placeholder: "Ending Poverty in the Fox Valley Inc."
+        website:
+          label: "Website URL"
+          placeholder: "http://www.endpovertyinthefoxvalleyinc.org"
+        email:
+          label: "Org Email (public)"
+          placeholder: "contact@endpovertyinthefoxvalleyinc.org"
+        phone:
+          label: "Org Phone (public)"
+          placeholder: "(555) 555-5555"
+        city:
+          label: "City"
+          placeholder: "Appleton"
+        state:
+          label: "State"
+          placeholder: "WI"
+        zip:
+          label: "Zip Code"
+          placeholder: "54915"
+      contact:
+        name:
+          label: "Your Name"
+          placeholder: "Penelope Schultz"
+        email:
+          label: "Your Email (used for login)"
+          placeholder: "penelope@endpovertyinthefoxvalleyinc.org"
+        password:
+          label: "New Password"
+        password_confirmation:
+          label: "Retype Password"
+        phone:
+          label: "Your Phone (for account recovery)"
+          placeholder: "(555) 555-5555"
+      save_and_finish: "Save & Finish"
+      saving: "Saving..."
+      next: "Next"
+  footer:
+    terms_and_privacy: "Terms & Privacy"
+    about: "About"
+  login:
+    header: "Login"
+    email: "Email"
+    password: "Password"
+    login: "Login"
+    logging_in: "Logging you in..."
+    forgot_password: "Forgot Password?"
+    get_started: "Get Started"