Merge branch 'butter-box' into ui-refresh

_i18n/en.yml

@@ -1,20 +1,10 @@
 site_name: 'Butter'
 page_logo_alt: 'Butter App Feature Logo'
-title: 'Welcome to the Butter Box'
 
-apps_subtitle: 'Get Android apps.'
+title: 'Life without internet made smoother. <br /> Get access to tools that help.'
-apps_text: 'Download the Butter app to view a collection of apps that use less internet and battery.'
+main_text: Butter features a collection of apps to make life without the internet a little smoother. Use it to discover and download free, ad-free apps or to spread the love and share offline.
 fdroid_apps_caption: 'Just a few of the apps available via Butter'
 fdroid_button_text: 'Download Butter'
-fdroid_button_subtext: 'LESS THAN 10 MB'
-apps_expander_text: 'Which apps?'
-apps_expanded_text: 'Butter features apps for entertainment, sharing offline, navigating, taking pictures, and more!'
-
-chat_subtitle: 'See what people are saying.'
-chat_text: 'Check the chat for messages, videos, or files from nearby peers.'
-chat_button_text: 'View Chat'
-chat_secondary_cta: 'Open my own chat room'
-
 app_tiles_image_alt: 'Butter App features collection'
 view_all_apps: 'View All Apps'
 built_on_fdroid: Built on F-Droid Free Software
@@ -32,9 +22,19 @@ modal:
   warning: |
     You will need to enable downloads from unknown sources to install this app on your Android phone.
 
+# These are for the butter box UI which lives in the separate `butter-box` branch.
+butter_box_title: 'Welcome to the Butter Box'
+apps_subtitle: 'Get Android Apps.'
+apps_text: 'Download the Butter app to view a collection of apps that use less internet and battery.'
+fdroid_button_subtext: 'LESS THAN 10 MB'
+apps_expander_text: 'Which apps?'
+apps_expanded_text: 'Butter features apps for entertainment, sharing offline, navigating, taking pictures, and more!'
+chat_subtitle: 'See what people are saying.'
+chat_text: 'Check the chat for messages, videos, or files from nearby peers.'
+chat_button_text: 'View Chat'
+chat_secondary_cta: 'Open my own chat room'
+
 captive:
-  welcome_message: |
-    Welcome to Butterbox.
   welcome_details: |
     This network doesn't provide internet access, just the next best thing, the Butter app. Butter features a collection of apps to make life without the internet a little smoother.
     <br/><br/>Once you've connected, simply open http://butterbox.lan in your browser. 

captive.html

@@ -8,7 +8,7 @@ layout: basic
   <div class="container">
     <div class="content-area-wrapper text-center">
       <img src="{{site.baseurl}}{{ page_data.page_logo }}" alt="{% t page_logo_alt %}" />
-      <h1 class="content-title mb-2">{% t captive.welcome_message %}</h1>
+      <h1 class="content-title mb-2">{% t butter_box_title %}</h1>
       <p class="content-text text-black ls-40 mb-2">{% t captive.welcome_details %}</p>
       <!-- Use NoDogSplash-provided variables to render a "continue" button -->
       <form method="get" action="$authaction">

index.html

@@ -8,7 +8,7 @@ layout: default
   <div class="container">
     <div class="content-area-topper">
       <img class="topper-img" src="{{site.baseurl}}{{ page_data.page_logo }}" alt="{% t page_logo_alt %}" />
-      <h1 class="content-title mb-2 mt-2">{% t title %}</h1>
+      <h1 class="content-title mb-2 mt-2">{% t butter_box_title %}</h1>
     </div>
     <div class="content-area-wrapper">
       <p class="content-subtitle text-black ls-40 mb-2">{% t apps_subtitle %}</p>