From 03af393571b65bca1a856dcba8649dbd97b7ce9a Mon Sep 17 00:00:00 2001 From: John Hess Date: Tue, 1 Mar 2022 11:12:06 -0600 Subject: [PATCH 01/22] remove web-hosted resources --- _layouts/basic.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_layouts/basic.html b/_layouts/basic.html index ca50cfc..e4e52bb 100644 --- a/_layouts/basic.html +++ b/_layouts/basic.html @@ -7,7 +7,7 @@ {% include seo.html %} {{ site.title }} - + @@ -16,8 +16,8 @@ {{ content }} - - + + From f54f460f05007b65256a2d2ac4f71a129e10fd16 Mon Sep 17 00:00:00 2001 From: John Hess Date: Tue, 1 Mar 2022 11:51:24 -0600 Subject: [PATCH 02/22] remove web-hosted resources (matomo) --- _layouts/basic.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/basic.html b/_layouts/basic.html index e4e52bb..70a447b 100644 --- a/_layouts/basic.html +++ b/_layouts/basic.html @@ -23,7 +23,7 @@ - --> From cc073ac2f0910ac1d2a77e700c8421a49a36fc70 Mon Sep 17 00:00:00 2001 From: John Hess Date: Mon, 14 Mar 2022 12:10:45 -0500 Subject: [PATCH 03/22] turn matomo back on --- _layouts/basic.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/basic.html b/_layouts/basic.html index fbb841a..6c56600 100644 --- a/_layouts/basic.html +++ b/_layouts/basic.html @@ -23,7 +23,7 @@ - + From 493c3fbabd9dc0c7a540555ca3a1c05245339c82 Mon Sep 17 00:00:00 2001 From: John Hess Date: Mon, 14 Mar 2022 12:17:21 -0500 Subject: [PATCH 04/22] en-only omnipresent link to /chat; to be replaced with configurable, l10nable one --- _includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/footer.html b/_includes/footer.html index 5640e3b..d075c49 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -4,7 +4,7 @@ - View All Apps | Built on F-Droid Free Software + View All Apps | Chat | Built on F-Droid Free Software From b6c4b3d2b13d69c85c4b5d8b95842a005cafe0d2 Mon Sep 17 00:00:00 2001 From: John Hess Date: Mon, 14 Mar 2022 14:26:03 -0500 Subject: [PATCH 05/22] add chat copy, button in EN --- _data/en/home.yml | 8 ++++---- _data/home.yml | 8 ++++---- _scss/helpers/utilities.scss | 11 +++++++++++ _scss/pages/home.scss | 4 +++- index.html | 7 +++++-- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/_data/en/home.yml b/_data/en/home.yml index 7ca7486..47bb11d 100644 --- a/_data/en/home.yml +++ b/_data/en/home.yml @@ -2,12 +2,12 @@ site_name: 'Butter' page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] title: 'Life without internet made smoother.
Get access to tools that help.' 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. -button_text: 'Download Android App' + This Butter Box offers an Android app store and chat rooms. You can use the app store to discover and download free, ad-free apps or to spread the love and share apps offline. The chat rooms hang on to messages while you're gone and deliver them whenever a device reconnects to the Butter Box. +fdroid_apps_caption: Just a few of the apps available via Butter. +fdroid_button_text: 'Download Android App Store' +chat_button_text: 'Start a chat room instantly' image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] - modal_data: title: 'Butter: Free, ad-free apps to help you offline' logo: ['/assets/images/butter-app-icon-large.svg', 'Butter App Logo'] diff --git a/_data/home.yml b/_data/home.yml index 7ca7486..47bb11d 100644 --- a/_data/home.yml +++ b/_data/home.yml @@ -2,12 +2,12 @@ site_name: 'Butter' page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] title: 'Life without internet made smoother.
Get access to tools that help.' 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. -button_text: 'Download Android App' + This Butter Box offers an Android app store and chat rooms. You can use the app store to discover and download free, ad-free apps or to spread the love and share apps offline. The chat rooms hang on to messages while you're gone and deliver them whenever a device reconnects to the Butter Box. +fdroid_apps_caption: Just a few of the apps available via Butter. +fdroid_button_text: 'Download Android App Store' +chat_button_text: 'Start a chat room instantly' image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] - modal_data: title: 'Butter: Free, ad-free apps to help you offline' logo: ['/assets/images/butter-app-icon-large.svg', 'Butter App Logo'] diff --git a/_scss/helpers/utilities.scss b/_scss/helpers/utilities.scss index abe66fd..714b02e 100644 --- a/_scss/helpers/utilities.scss +++ b/_scss/helpers/utilities.scss @@ -64,6 +64,7 @@ body { &:hover { background-color: lighten($royal-blue, 5%); } + margin-bottom: 10px; } @@ -77,6 +78,13 @@ body { } } +.caption { + color: $dark-gray; + font-family: $text-font-family; + font-size: 16px; + margin-top: 8px; +} + .text-black { color: $black; } @@ -94,6 +102,9 @@ body { .mb-2 { margin-bottom: 24px; } +.mt-2 { + margin-top: 24px; +} // Arrows classes diff --git a/_scss/pages/home.scss b/_scss/pages/home.scss index f99af7b..cc7ee82 100644 --- a/_scss/pages/home.scss +++ b/_scss/pages/home.scss @@ -3,6 +3,7 @@ // ------------------------- .main-area { background-color: $gold; + min-height: 100vh; } // ------------------------- @@ -92,6 +93,7 @@ a:active { .content-area { &-wrapper { margin-top: 30px; + min-height: calc(100vh - 202px); // take up space above the footer .content-title { font-size: 42px; font-weight: 800; @@ -114,7 +116,7 @@ a:active { img { display: block; margin: 0 auto; - max-width: 100%; + max-width: 70%; } } } diff --git a/index.html b/index.html index da23f75..a40dbbf 100644 --- a/index.html +++ b/index.html @@ -8,12 +8,15 @@ layout: default
{{ page_data.page_logo[1] }} -

{{ page_data.title }}

+

{{ page_data.title }}

{{ page_data.text }}

- {{ page_data.button_text | upcase }}
{{ page_data.image[1] }} +

{{ page_data.fdroid_apps_caption }}

+ {{ page_data.fdroid_button_text | upcase }} + {{ page_data.chat_button_text | upcase }} +

{{ page_data.chat_text }}

From ebcfabfa83e03ef5bc948850bdc569f5f3edd9ba Mon Sep 17 00:00:00 2001 From: John Hess Date: Mon, 14 Mar 2022 15:51:55 -0500 Subject: [PATCH 06/22] force https on matomo.js; update footer link --- .ruby-version | 1 + Gemfile | 2 ++ _includes/footer.html | 5 +---- _layouts/basic.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..b502146 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.0.2 diff --git a/Gemfile b/Gemfile index 6c38134..0f42851 100644 --- a/Gemfile +++ b/Gemfile @@ -27,3 +27,5 @@ end # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] + +gem "webrick", "~> 1.7" diff --git a/_includes/footer.html b/_includes/footer.html index d075c49..ffa0360 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,10 +1,7 @@ diff --git a/_layouts/basic.html b/_layouts/basic.html index 6c56600..ccb02d2 100644 --- a/_layouts/basic.html +++ b/_layouts/basic.html @@ -29,7 +29,7 @@ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { - var u="//metrics.cleaninsights.org/"; + var u="https://metrics.cleaninsights.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '20']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; From 8d20bb37e6fa50de07564be3e27fb7fd269a87cb Mon Sep 17 00:00:00 2001 From: John Hess Date: Mon, 14 Mar 2022 17:35:46 -0500 Subject: [PATCH 07/22] per-environment copy, analytics --- _data/deployment.yml | 3 ++ _data/deployments/butterbox/deployment.yml | 3 ++ _data/deployments/web/deployment.yml | 3 ++ _data/en/home.yml | 13 +++++++-- _data/es/home.yml | 11 +++++-- _data/home.yml | 13 +++++++-- _layouts/basic.html | 34 +++++++++++----------- index.html | 10 ++++++- 8 files changed, 63 insertions(+), 27 deletions(-) create mode 100644 _data/deployment.yml create mode 100644 _data/deployments/butterbox/deployment.yml create mode 100644 _data/deployments/web/deployment.yml diff --git a/_data/deployment.yml b/_data/deployment.yml new file mode 100644 index 0000000..f83be1f --- /dev/null +++ b/_data/deployment.yml @@ -0,0 +1,3 @@ +# Deployment-specific variables to specify what features to surface. +has_internet: true +show_chat: false \ No newline at end of file diff --git a/_data/deployments/butterbox/deployment.yml b/_data/deployments/butterbox/deployment.yml new file mode 100644 index 0000000..328e313 --- /dev/null +++ b/_data/deployments/butterbox/deployment.yml @@ -0,0 +1,3 @@ +# Deployment-specific variables to specify what features to surface. +has_internet: false +show_chat: true \ No newline at end of file diff --git a/_data/deployments/web/deployment.yml b/_data/deployments/web/deployment.yml new file mode 100644 index 0000000..f83be1f --- /dev/null +++ b/_data/deployments/web/deployment.yml @@ -0,0 +1,3 @@ +# Deployment-specific variables to specify what features to surface. +has_internet: true +show_chat: false \ No newline at end of file diff --git a/_data/en/home.yml b/_data/en/home.yml index 47bb11d..dd7c98e 100644 --- a/_data/en/home.yml +++ b/_data/en/home.yml @@ -1,10 +1,17 @@ site_name: 'Butter' page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] title: 'Life without internet made smoother.
Get access to tools that help.' -text: | - This Butter Box offers an Android app store and chat rooms. You can use the app store to discover and download free, ad-free apps or to spread the love and share apps offline. The chat rooms hang on to messages while you're gone and deliver them whenever a device reconnects to the Butter Box. +text: + show_chat: | + This Butter Box offers an Android app store and chat rooms.
+ Download the Butter app to discover and download free, ad-free
+ apps or to spread the love and share apps offline. Or, create a
+ chat room which hangs on to messages while you're gone and
+ delivers them whenever your device reconnects to the Butter Box. + dont_show_chat: | + 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 Android App Store' +fdroid_button_text: 'Download Android App' chat_button_text: 'Start a chat room instantly' image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] diff --git a/_data/es/home.yml b/_data/es/home.yml index 745e2d0..8bd6531 100644 --- a/_data/es/home.yml +++ b/_data/es/home.yml @@ -1,9 +1,14 @@ site_name: 'Mantequilla' page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] -title: 'Para hacer tu vida sin Internet más fácil.
Obtén herramientas que ayudan.' -text: | +title: 'Para hacer tu vida sin Internet más fácil. Obtén herramientas que ayudan.' +text: + show_chat: | + Este Caja de Mantequilla presenta una colección de aplicaciones de Android y salas de chat. Descarga la aplicación Mantequilla para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. O, crea una sala de chat que conserva mensajes cuando no estás aquí y los entrega cuando se vuelve a conectar a la Caja de Mantequilla. + dont_show_chat: | Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. Úsala para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. -button_text: 'DESCARGA LA APLICACIÓN ANDROID' +fdroid_apps_caption: Unas aplicaciónes disponible de Mantequilla +fdroid_button_text: 'DESCARGA LA APLICACIÓN ANDROID' +chat_button_text: Crea una sala de chat image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] diff --git a/_data/home.yml b/_data/home.yml index 47bb11d..dd7c98e 100644 --- a/_data/home.yml +++ b/_data/home.yml @@ -1,10 +1,17 @@ site_name: 'Butter' page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] title: 'Life without internet made smoother.
Get access to tools that help.' -text: | - This Butter Box offers an Android app store and chat rooms. You can use the app store to discover and download free, ad-free apps or to spread the love and share apps offline. The chat rooms hang on to messages while you're gone and deliver them whenever a device reconnects to the Butter Box. +text: + show_chat: | + This Butter Box offers an Android app store and chat rooms.
+ Download the Butter app to discover and download free, ad-free
+ apps or to spread the love and share apps offline. Or, create a
+ chat room which hangs on to messages while you're gone and
+ delivers them whenever your device reconnects to the Butter Box. + dont_show_chat: | + 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 Android App Store' +fdroid_button_text: 'Download Android App' chat_button_text: 'Start a chat room instantly' image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] diff --git a/_layouts/basic.html b/_layouts/basic.html index ccb02d2..24da5d6 100644 --- a/_layouts/basic.html +++ b/_layouts/basic.html @@ -21,23 +21,23 @@ - - - - - + {% if site.data.deployment.has_internet %} + + + + {% endif %} diff --git a/index.html b/index.html index a40dbbf..4cbaf94 100644 --- a/index.html +++ b/index.html @@ -9,13 +9,21 @@ layout: default
{{ page_data.page_logo[1] }}

{{ page_data.title }}

-

{{ page_data.text }}

+

+ {% if site.data.deployment.show_chat %} + {{ page_data.text.show_chat }} + {% else %} + {{ page_data.text.dont_show_chat }} + {% endif %} +

{{ page_data.image[1] }}

{{ page_data.fdroid_apps_caption }}

{{ page_data.fdroid_button_text | upcase }} + {% if site.data.deployment.show_chat %} {{ page_data.chat_button_text | upcase }} + {% endif %}

{{ page_data.chat_text }}

From 4f0300548f75d7702ffe4e05b38dfc5614e38f90 Mon Sep 17 00:00:00 2001 From: John Hess Date: Mon, 14 Mar 2022 17:41:24 -0500 Subject: [PATCH 08/22] remove unintentionally included changes --- .ruby-version | 1 - Gemfile | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index b502146..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -3.0.2 diff --git a/Gemfile b/Gemfile index 0f42851..6c38134 100644 --- a/Gemfile +++ b/Gemfile @@ -27,5 +27,3 @@ end # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] - -gem "webrick", "~> 1.7" From fa03d6fb00eb331eb49e290f6c322ac98dcf58e9 Mon Sep 17 00:00:00 2001 From: John Hess Date: Mon, 14 Mar 2022 17:44:18 -0500 Subject: [PATCH 09/22] revert footer changes --- _includes/footer.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/_includes/footer.html b/_includes/footer.html index ffa0360..5640e3b 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,7 +1,10 @@ From a474bc61ed5978e92c794877e3197b10593288dc Mon Sep 17 00:00:00 2001 From: John Hess Date: Wed, 30 Mar 2022 16:40:50 -0500 Subject: [PATCH 10/22] Add jekyll-multiple-language-plugin and refactor strings into /_i18n --- Gemfile | 4 +++ _config.yml | 2 ++ _data/home.yml | 47 ++++++------------------------- _data/en/home.yml => _i18n/en.yml | 25 +++++++--------- _data/es/home.yml => _i18n/es.yml | 22 ++++++--------- _includes/footer.html | 5 +--- _includes/modal.html | 14 ++++----- _layouts/basic.html | 2 +- captive.html | 8 +++--- index.html | 17 ++++++----- 10 files changed, 53 insertions(+), 93 deletions(-) rename _data/en/home.yml => _i18n/en.yml (72%) rename _data/es/home.yml => _i18n/es.yml (78%) diff --git a/Gemfile b/Gemfile index 6c38134..d011e36 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem "jekyll", "~> 4.2.0" # If you have any plugins, put them here! group :jekyll_plugins do gem "jekyll-feed", "~> 0.12" + gem 'jekyll-multiple-languages-plugin' end # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem @@ -27,3 +28,6 @@ end # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] + +# HTTP Server for local development +gem "webrick", "~> 1.7" \ No newline at end of file diff --git a/_config.yml b/_config.yml index 740065e..8c5fbca 100644 --- a/_config.yml +++ b/_config.yml @@ -6,6 +6,7 @@ url: "" # the base hostname & protocol for your site, e.g. http://example.com twitter_username: Butter App github_username: Butter App logo: "/assets/images/butter-app-logo-small.svg" +languages: ['en', 'es'] # powered by jekyll-multiple-languages-plugin # Build settings sass: @@ -14,6 +15,7 @@ sass: plugins: - jekyll-feed + - jekyll-multiple-languages-plugin # Exclude from processing. # The following items will not be processed, by default. diff --git a/_data/home.yml b/_data/home.yml index dd7c98e..689898c 100644 --- a/_data/home.yml +++ b/_data/home.yml @@ -1,46 +1,15 @@ -site_name: 'Butter' -page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] -title: 'Life without internet made smoother.
Get access to tools that help.' -text: - show_chat: | - This Butter Box offers an Android app store and chat rooms.
- Download the Butter app to discover and download free, ad-free
- apps or to spread the love and share apps offline. Or, create a
- chat room which hangs on to messages while you're gone and
- delivers them whenever your device reconnects to the Butter Box. - dont_show_chat: | - 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 Android App' -chat_button_text: 'Start a chat room instantly' -image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] +# This file is sitewide, for all languages. +# To specify per-language data, use the _i18n folder's yml files. -modal_data: - title: 'Butter: Free, ad-free apps to help you offline' - logo: ['/assets/images/butter-app-icon-large.svg', 'Butter App Logo'] - text: | - Be in-the-know, be entertained, manage business and life—even with little internet. - Butter app makes it easy to find apps that use less internet and battery. - Download your favorites, and get free updates from Butter. Care to share? Send any app on your phone to a friend near you with Butter nearby. No internet needed. - info_list: - - By Team Butter - - Available for Android phones - - Less than 10 MB! - button_text: 'Download Android App' +page_logo: '/assets/images/butter-logo-feature-large.svg' +app_tiles_image: '/assets/images/butter-collection-features-offline-essentials.svg' + +modal: + butter_app_logo: '/assets/images/butter-app-icon-large.svg' button_url: '/assets/download/butter.apk' slider_list: - '/assets/images/slide-img-1.png' - '/assets/images/slide-img-2.png' - '/assets/images/slide-img-3.png' - '/assets/images/slide-img-4.png' - - '/assets/images/slide-img-5.png' - warning: | - You will need to enable downloads from unknown sources to install this app on your Android phone. - -captive_data: - 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. -

Once you've connected, simply open http://butterbox.lan in your browser. - continue_button: 'Continue' \ No newline at end of file + - '/assets/images/slide-img-5.png' \ No newline at end of file diff --git a/_data/en/home.yml b/_i18n/en.yml similarity index 72% rename from _data/en/home.yml rename to _i18n/en.yml index dd7c98e..068d4f7 100644 --- a/_data/en/home.yml +++ b/_i18n/en.yml @@ -1,5 +1,5 @@ site_name: 'Butter' -page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] +page_logo_alt: 'Butter App Feature Logo' title: 'Life without internet made smoother.
Get access to tools that help.' text: show_chat: | @@ -11,13 +11,15 @@ text: dont_show_chat: | 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 Android App' -chat_button_text: 'Start a chat room instantly' -image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] +fdroid_button_text: 'DOWNLOAD ANDROID APP' +chat_button_text: 'CREATE A 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 -modal_data: +modal: title: 'Butter: Free, ad-free apps to help you offline' - logo: ['/assets/images/butter-app-icon-large.svg', 'Butter App Logo'] + butter_app_logo_alt: 'Butter App Logo' text: | Be in-the-know, be entertained, manage business and life—even with little internet. Butter app makes it easy to find apps that use less internet and battery. @@ -26,18 +28,11 @@ modal_data: - By Team Butter - Available for Android phones - Less than 10 MB! - button_text: 'Download Android App' - button_url: '/assets/download/butter.apk' - slider_list: - - '/assets/images/slide-img-1.png' - - '/assets/images/slide-img-2.png' - - '/assets/images/slide-img-3.png' - - '/assets/images/slide-img-4.png' - - '/assets/images/slide-img-5.png' + button_text: 'DOWNLOAD ANDROID APP' warning: | You will need to enable downloads from unknown sources to install this app on your Android phone. -captive_data: +captive: welcome_message: | Welcome to Butterbox. welcome_details: | diff --git a/_data/es/home.yml b/_i18n/es.yml similarity index 78% rename from _data/es/home.yml rename to _i18n/es.yml index 8bd6531..09594d5 100644 --- a/_data/es/home.yml +++ b/_i18n/es.yml @@ -1,5 +1,5 @@ site_name: 'Mantequilla' -page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] +page_logo_alt: 'Logo de Mantequilla' title: 'Para hacer tu vida sin Internet más fácil. Obtén herramientas que ayudan.' text: show_chat: | @@ -8,13 +8,14 @@ text: Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. Úsala para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. fdroid_apps_caption: Unas aplicaciónes disponible de Mantequilla fdroid_button_text: 'DESCARGA LA APLICACIÓN ANDROID' -chat_button_text: Crea una sala de chat -image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] +chat_button_text: 'CREA UN SALA DE CHAT' +app_tiles_image_alt: 'colección de aplicaciones de Mantequilla' +view_all_apps: 'Ver todas las aplicaciones' +built_on_fdroid: 'Basado en el software libre F-Droid' - -modal_data: +modal: title: 'Mantequilla: aplicaciones gratuitas y sin anuncios para ayudarte cuando no tienes acceso a internet' - logo: ['/assets/images/butter-app-icon-large.svg', 'Butter App Logo'] + butter_app_logo_alt: 'Logo de aplicación Mantequilla' text: | Mantente al tanto, diviértete, administra tus negocios y tu vida, incluso con poco Internet. La aplicación Mantequilla facilita la tarea de encontrar aplicaciones que usan menos Internet y batería. Descarga tus favoritas y obtén actualizaciones gratuitas de Mantequilla. ¿Te interesa compartir? Envía cualquier aplicación en tu teléfono a un amigo cerca de ti con “Mantequilla cercano”. No se necesita internet. info_list: @@ -22,17 +23,10 @@ modal_data: - Disponible para teléfonos Android - Menos de 10 MB! button_text: 'DESCARGA' - button_url: '/assets/download/butter.apk' - slider_list: - - '/assets/images/slide-img-1.png' - - '/assets/images/slide-img-2.png' - - '/assets/images/slide-img-3.png' - - '/assets/images/slide-img-4.png' - - '/assets/images/slide-img-5.png' warning: | Debes 'habilitar descargas de fuentes desconocidas' para descargar esta aplicación en tu teléfono Android. -captive_data: +captive: welcome_message: | Bienvenido. Esto es "como la mantequilla." welcome_details: | diff --git a/_includes/footer.html b/_includes/footer.html index 5640e3b..c425dc8 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,10 +1,7 @@ diff --git a/_includes/modal.html b/_includes/modal.html index 7c3ba09..1a8e809 100644 --- a/_includes/modal.html +++ b/_includes/modal.html @@ -7,26 +7,26 @@
-

{{ page_data.modal_data.title }}

+

{% t modal.title %}

    - {% for item in page_data.modal_data.info_list %} + {% for item in site.translations[site.lang].modal.info_list %}
  • {{ item }}
    • {% endfor %}
- {{ page_data.modal_data.button_text | upcase }} + {% t modal.button_text %}
-

{{ page_data.modal_data.text }}

+

{% t modal.text %}

- {% for slide in page_data.modal_data.slider_list %} + {% for slide in page_data.modal.slider_list %}
slider image
@@ -35,7 +35,7 @@
-

{{ page_data.modal_data.warning | markdownify | remove: '

' | remove: '

' }}

+

{% t modal.warning %}

diff --git a/_layouts/basic.html b/_layouts/basic.html index 24da5d6..57d08ef 100644 --- a/_layouts/basic.html +++ b/_layouts/basic.html @@ -5,7 +5,7 @@ {% include seo.html %} - {{ site.title }} + {% t title %} diff --git a/captive.html b/captive.html index 95c7392..8a8e5a1 100644 --- a/captive.html +++ b/captive.html @@ -7,14 +7,14 @@ layout: basic
- {{ page_data.page_logo[1] }} -

{{ page_data.captive_data.welcome_message }}

-

{{ page_data.captive_data.welcome_details }}

+ {% t page_logo_alt %} +

{% t captive.welcome_message %}

+

{% t captive.welcome_details %}

- +
diff --git a/index.html b/index.html index 4cbaf94..a1a4439 100644 --- a/index.html +++ b/index.html @@ -7,24 +7,23 @@ layout: default
- {{ page_data.page_logo[1] }} -

{{ page_data.title }}

+ {% t page_logo_alt %} +

{% t title %}

{% if site.data.deployment.show_chat %} - {{ page_data.text.show_chat }} + {% t text.show_chat %} {% else %} - {{ page_data.text.dont_show_chat }} + {% t text.dont_show_chat %} {% endif %}

- {{ page_data.image[1] }} -

{{ page_data.fdroid_apps_caption }}

+ {% t app_tiles_image_alt %} +

{% t fdroid_apps_caption %}

- {{ page_data.fdroid_button_text | upcase }} + {% t fdroid_button_text %} {% if site.data.deployment.show_chat %} - {{ page_data.chat_button_text | upcase }} + {% t chat_button_text %} {% endif %} -

{{ page_data.chat_text }}

From 8d0cbce55b24319e74f116d5df960830d8932b98 Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 11:38:57 -0500 Subject: [PATCH 11/22] remove full stop --- _i18n/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 068d4f7..c8500ae 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -10,7 +10,7 @@ text: delivers them whenever your device reconnects to the Butter Box. dont_show_chat: | 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_apps_caption: Just a few of the apps available via Butter fdroid_button_text: 'DOWNLOAD ANDROID APP' chat_button_text: 'CREATE A CHAT ROOM' app_tiles_image_alt: 'Butter App features collection' From ac2e2be4e2bab396833e47cdb09ff9cc33f29065 Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 12:00:58 -0500 Subject: [PATCH 12/22] remove line breaks --- _i18n/en.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index c8500ae..81b6811 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -9,7 +9,7 @@ text: chat room which hangs on to messages while you're gone and
delivers them whenever your device reconnects to the Butter Box. dont_show_chat: | - 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. + 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 ANDROID APP' chat_button_text: 'CREATE A CHAT ROOM' @@ -21,9 +21,7 @@ modal: title: 'Butter: Free, ad-free apps to help you offline' butter_app_logo_alt: 'Butter App Logo' text: | - Be in-the-know, be entertained, manage business and life—even with little internet. - Butter app makes it easy to find apps that use less internet and battery. - Download your favorites, and get free updates from Butter. Care to share? Send any app on your phone to a friend near you with Butter nearby. No internet needed. + Be in-the-know, be entertained, manage business and life—even with little internet. Butter app makes it easy to find apps that use less internet and battery. Download your favorites, and get free updates from Butter. Care to share? Send any app on your phone to a friend near you with Butter nearby. No internet needed. info_list: - By Team Butter - Available for Android phones @@ -36,6 +34,6 @@ 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. + 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.

Once you've connected, simply open http://butterbox.lan in your browser. continue_button: 'Continue' \ No newline at end of file From 571daf249162cde0647ebb172ae94427da77c3bc Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 12:11:12 -0500 Subject: [PATCH 13/22] remove line breaks --- _i18n/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 81b6811..95e5ecd 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -9,7 +9,7 @@ text: chat room which hangs on to messages while you're gone and
delivers them whenever your device reconnects to the Butter Box. dont_show_chat: | - 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. + 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 ANDROID APP' chat_button_text: 'CREATE A CHAT ROOM' From f98d6812e2befc99dafaace88657cc46b06719cf Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 12:36:34 -0500 Subject: [PATCH 14/22] remove webrick --- Gemfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d011e36..c3f6c51 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,4 @@ platforms :mingw, :x64_mingw, :mswin, :jruby do end # Performance-booster for watching directories on Windows -gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] - -# HTTP Server for local development -gem "webrick", "~> 1.7" \ No newline at end of file +gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] \ No newline at end of file From acf11a2aef3702708e310596301ac5a7512dc4fc Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 12:40:30 -0500 Subject: [PATCH 15/22] whitespace --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c3f6c51..ecd1aee 100644 --- a/Gemfile +++ b/Gemfile @@ -27,4 +27,4 @@ platforms :mingw, :x64_mingw, :mswin, :jruby do end # Performance-booster for watching directories on Windows -gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] \ No newline at end of file +gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] From 9549af515d633ea76d152c188225290446e704ee Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 12:48:34 -0500 Subject: [PATCH 16/22] commit merge resolution --- _data/home.yml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/_data/home.yml b/_data/home.yml index 413f302..689898c 100644 --- a/_data/home.yml +++ b/_data/home.yml @@ -1,4 +1,3 @@ -<<<<<<< HEAD # This file is sitewide, for all languages. # To specify per-language data, use the _i18n folder's yml files. @@ -7,37 +6,6 @@ app_tiles_image: '/assets/images/butter-collection-features-offline-essentials.s modal: butter_app_logo: '/assets/images/butter-app-icon-large.svg' -======= -site_name: 'Butter' -page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] -title: 'Life without internet made smoother.
Get access to tools that help.' -text: - show_chat: | - This Butter Box offers an Android app store and chat rooms.
- Download the Butter app to discover and download free, ad-free
- apps or to spread the love and share apps offline. Or, create a
- chat room which hangs on to messages while you're gone and
- delivers them whenever your device reconnects to the Butter Box. - dont_show_chat: | - 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 Android App' -chat_button_text: 'Start a chat room instantly' -image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] - -modal_data: - title: 'Butter: Free, ad-free apps to help you offline' - logo: ['/assets/images/butter-app-icon-large.svg', 'Butter App Logo'] - text: | - Be in-the-know, be entertained, manage business and life—even with little internet. - Butter app makes it easy to find apps that use less internet and battery. - Download your favorites, and get free updates from Butter. Care to share? Send any app on your phone to a friend near you with Butter nearby. No internet needed. - info_list: - - By Team Butter - - Available for Android phones - - Less than 10 MB! - button_text: 'Download Android App' ->>>>>>> master button_url: '/assets/download/butter.apk' slider_list: - '/assets/images/slide-img-1.png' From 082abe57770cc6758ba9312c2a0af151d5bd8f66 Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 12:50:32 -0500 Subject: [PATCH 17/22] commit merge resolution --- _i18n/es.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/_i18n/es.yml b/_i18n/es.yml index 6446631..09594d5 100644 --- a/_i18n/es.yml +++ b/_i18n/es.yml @@ -1,9 +1,5 @@ site_name: 'Mantequilla' -<<<<<<< HEAD:_i18n/es.yml page_logo_alt: 'Logo de Mantequilla' -======= -page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] ->>>>>>> master:_data/es/home.yml title: 'Para hacer tu vida sin Internet más fácil. Obtén herramientas que ayudan.' text: show_chat: | @@ -12,15 +8,10 @@ text: Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. Úsala para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. fdroid_apps_caption: Unas aplicaciónes disponible de Mantequilla fdroid_button_text: 'DESCARGA LA APLICACIÓN ANDROID' -<<<<<<< HEAD:_i18n/es.yml chat_button_text: 'CREA UN SALA DE CHAT' app_tiles_image_alt: 'colección de aplicaciones de Mantequilla' view_all_apps: 'Ver todas las aplicaciones' built_on_fdroid: 'Basado en el software libre F-Droid' -======= -chat_button_text: Crea una sala de chat -image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] ->>>>>>> master:_data/es/home.yml modal: title: 'Mantequilla: aplicaciones gratuitas y sin anuncios para ayudarte cuando no tienes acceso a internet' From 6804a880bad9f6d06311df286f13d386cd2db231 Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 13:13:00 -0500 Subject: [PATCH 18/22] jekyll-multiple-languages-plugin compatible language selector for header --- _data/home.yml | 6 +++++- _includes/header.html | 11 ++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/_data/home.yml b/_data/home.yml index 689898c..ad33fe3 100644 --- a/_data/home.yml +++ b/_data/home.yml @@ -12,4 +12,8 @@ modal: - '/assets/images/slide-img-2.png' - '/assets/images/slide-img-3.png' - '/assets/images/slide-img-4.png' - - '/assets/images/slide-img-5.png' \ No newline at end of file + - '/assets/images/slide-img-5.png' + +language_selector: + en: English + es: Español \ No newline at end of file diff --git a/_includes/header.html b/_includes/header.html index f364c2e..3769f59 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -6,13 +6,18 @@ Butter App Logo
-

{{ site.data.home.site_name }}

+

{{ site.data.home.site_name }}

From 5f25d8b70274a805d30d0b9ba054ee54b901b9ad Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 13:18:40 -0500 Subject: [PATCH 19/22] remove duplicate style --- _scss/pages/home.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/_scss/pages/home.scss b/_scss/pages/home.scss index 068113f..f6c826e 100644 --- a/_scss/pages/home.scss +++ b/_scss/pages/home.scss @@ -95,7 +95,6 @@ a:active { margin-top: 30px; min-height: calc(100vh - 202px); // take up space above the footer margin-bottom: 30px; - min-height: calc(100vh - 202px); // take up space above the footer .content-title { font-size: 42px; font-weight: 800; From 2b41a5d9691eed61e80a43e0b313b7074ed9d6ac Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 16:20:33 -0500 Subject: [PATCH 20/22] merge in weblate changes to en/es yamls --- _i18n/en.yml | 14 +++++--------- _i18n/es.yml | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 95e5ecd..3173237 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -3,11 +3,7 @@ page_logo_alt: 'Butter App Feature Logo' title: 'Life without internet made smoother.
Get access to tools that help.' text: show_chat: | - This Butter Box offers an Android app store and chat rooms.
- Download the Butter app to discover and download free, ad-free
- apps or to spread the love and share apps offline. Or, create a
- chat room which hangs on to messages while you're gone and
- delivers them whenever your device reconnects to the Butter Box. + This Butter Box offers an Android app store and chat rooms. Download the Butter app to discover and download free, ad-free apps or to spread the love and share apps offline. Or, create a chat room which hangs on to messages while you're gone and delivers them whenever your device reconnects to the Butter Box. dont_show_chat: | 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 @@ -23,9 +19,9 @@ modal: text: | Be in-the-know, be entertained, manage business and life—even with little internet. Butter app makes it easy to find apps that use less internet and battery. Download your favorites, and get free updates from Butter. Care to share? Send any app on your phone to a friend near you with Butter nearby. No internet needed. info_list: - - By Team Butter - - Available for Android phones - - Less than 10 MB! + - By Team Butter + - Available for Android phones + - Less than 10 MB! button_text: 'DOWNLOAD ANDROID APP' warning: | You will need to enable downloads from unknown sources to install this app on your Android phone. @@ -36,4 +32,4 @@ captive: 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.

Once you've connected, simply open http://butterbox.lan in your browser. - continue_button: 'Continue' \ No newline at end of file + continue_button: 'Continue' diff --git a/_i18n/es.yml b/_i18n/es.yml index 09594d5..ab7cd29 100644 --- a/_i18n/es.yml +++ b/_i18n/es.yml @@ -1,11 +1,11 @@ site_name: 'Mantequilla' page_logo_alt: 'Logo de Mantequilla' -title: 'Para hacer tu vida sin Internet más fácil. Obtén herramientas que ayudan.' +title: 'Para hacer tu vida sin Internet más fácil.
Obtén herramientas que ayudan.' text: show_chat: | - Este Caja de Mantequilla presenta una colección de aplicaciones de Android y salas de chat. Descarga la aplicación Mantequilla para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. O, crea una sala de chat que conserva mensajes cuando no estás aquí y los entrega cuando se vuelve a conectar a la Caja de Mantequilla. + Este Caja de Mantequilla presenta una colección de aplicaciones de Android y salas de chat. Descarga la aplicación Mantequilla para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. O, crea una sala de chat que conserva mensajes cuando no estás aquí y los entrega cuando se vuelve a conectar a la Caja de Mantequilla. dont_show_chat: | - Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. Úsala para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. + Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. Úsala para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. fdroid_apps_caption: Unas aplicaciónes disponible de Mantequilla fdroid_button_text: 'DESCARGA LA APLICACIÓN ANDROID' chat_button_text: 'CREA UN SALA DE CHAT' @@ -14,22 +14,23 @@ view_all_apps: 'Ver todas las aplicaciones' built_on_fdroid: 'Basado en el software libre F-Droid' modal: - title: 'Mantequilla: aplicaciones gratuitas y sin anuncios para ayudarte cuando no tienes acceso a internet' + title: 'Mantequilla: aplicaciones gratuitas y sin anuncios para ayudarte cuando + no tienes acceso a internet' butter_app_logo_alt: 'Logo de aplicación Mantequilla' text: | Mantente al tanto, diviértete, administra tus negocios y tu vida, incluso con poco Internet. La aplicación Mantequilla facilita la tarea de encontrar aplicaciones que usan menos Internet y batería. Descarga tus favoritas y obtén actualizaciones gratuitas de Mantequilla. ¿Te interesa compartir? Envía cualquier aplicación en tu teléfono a un amigo cerca de ti con “Mantequilla cercano”. No se necesita internet. info_list: - - Autor Team Butter - - Disponible para teléfonos Android - - Menos de 10 MB! + - Autor Team Butter + - Disponible para teléfonos Android + - Menos de 10 MB! button_text: 'DESCARGA' warning: | - Debes 'habilitar descargas de fuentes desconocidas' para descargar esta aplicación en tu teléfono Android. + Debes 'habilitar descargas de fuentes desconocidas' para descargar esta aplicación en tu teléfono Android. captive: welcome_message: | - Bienvenido. Esto es "como la mantequilla." + Bienvenido. Esto es "como la mantequilla." welcome_details: | - Esta red no proporciona acceso a Internet, solo lo mejor de la siguiente, la aplicación Mantequilla. Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. -

Una vez que se haya conectado, simplemente abra http://comolamantequilla.lan en su navegador. - continue_button: 'Continuar' \ No newline at end of file + Esta red no proporciona acceso a Internet, solo lo mejor de la siguiente, la aplicación Mantequilla. Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. +

Una vez que se haya conectado, simplemente abra http://comolamantequilla.lan en su navegador. + continue_button: 'Continuar' From 8aa3cbf40db596503b3cc3d178129213852fcfae Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 16:37:48 -0500 Subject: [PATCH 21/22] undo local changes to i18n that conflict with weblate --- _i18n/es.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/_i18n/es.yml b/_i18n/es.yml index ab7cd29..09594d5 100644 --- a/_i18n/es.yml +++ b/_i18n/es.yml @@ -1,11 +1,11 @@ site_name: 'Mantequilla' page_logo_alt: 'Logo de Mantequilla' -title: 'Para hacer tu vida sin Internet más fácil.
Obtén herramientas que ayudan.' +title: 'Para hacer tu vida sin Internet más fácil. Obtén herramientas que ayudan.' text: show_chat: | - Este Caja de Mantequilla presenta una colección de aplicaciones de Android y salas de chat. Descarga la aplicación Mantequilla para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. O, crea una sala de chat que conserva mensajes cuando no estás aquí y los entrega cuando se vuelve a conectar a la Caja de Mantequilla. + Este Caja de Mantequilla presenta una colección de aplicaciones de Android y salas de chat. Descarga la aplicación Mantequilla para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. O, crea una sala de chat que conserva mensajes cuando no estás aquí y los entrega cuando se vuelve a conectar a la Caja de Mantequilla. dont_show_chat: | - Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. Úsala para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. + Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. Úsala para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. fdroid_apps_caption: Unas aplicaciónes disponible de Mantequilla fdroid_button_text: 'DESCARGA LA APLICACIÓN ANDROID' chat_button_text: 'CREA UN SALA DE CHAT' @@ -14,23 +14,22 @@ view_all_apps: 'Ver todas las aplicaciones' built_on_fdroid: 'Basado en el software libre F-Droid' modal: - title: 'Mantequilla: aplicaciones gratuitas y sin anuncios para ayudarte cuando - no tienes acceso a internet' + title: 'Mantequilla: aplicaciones gratuitas y sin anuncios para ayudarte cuando no tienes acceso a internet' butter_app_logo_alt: 'Logo de aplicación Mantequilla' text: | Mantente al tanto, diviértete, administra tus negocios y tu vida, incluso con poco Internet. La aplicación Mantequilla facilita la tarea de encontrar aplicaciones que usan menos Internet y batería. Descarga tus favoritas y obtén actualizaciones gratuitas de Mantequilla. ¿Te interesa compartir? Envía cualquier aplicación en tu teléfono a un amigo cerca de ti con “Mantequilla cercano”. No se necesita internet. info_list: - - Autor Team Butter - - Disponible para teléfonos Android - - Menos de 10 MB! + - Autor Team Butter + - Disponible para teléfonos Android + - Menos de 10 MB! button_text: 'DESCARGA' warning: | - Debes 'habilitar descargas de fuentes desconocidas' para descargar esta aplicación en tu teléfono Android. + Debes 'habilitar descargas de fuentes desconocidas' para descargar esta aplicación en tu teléfono Android. captive: welcome_message: | - Bienvenido. Esto es "como la mantequilla." + Bienvenido. Esto es "como la mantequilla." welcome_details: | - Esta red no proporciona acceso a Internet, solo lo mejor de la siguiente, la aplicación Mantequilla. Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. -

Una vez que se haya conectado, simplemente abra http://comolamantequilla.lan en su navegador. - continue_button: 'Continuar' + Esta red no proporciona acceso a Internet, solo lo mejor de la siguiente, la aplicación Mantequilla. Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. +

Una vez que se haya conectado, simplemente abra http://comolamantequilla.lan en su navegador. + continue_button: 'Continuar' \ No newline at end of file From a602a48ea0b21cfdbc7b580867411021dda1b2a6 Mon Sep 17 00:00:00 2001 From: John Hess Date: Thu, 7 Apr 2022 17:05:12 -0500 Subject: [PATCH 22/22] merge in weblate spanish updates --- _i18n/es.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/_i18n/es.yml b/_i18n/es.yml index 09594d5..ab7cd29 100644 --- a/_i18n/es.yml +++ b/_i18n/es.yml @@ -1,11 +1,11 @@ site_name: 'Mantequilla' page_logo_alt: 'Logo de Mantequilla' -title: 'Para hacer tu vida sin Internet más fácil. Obtén herramientas que ayudan.' +title: 'Para hacer tu vida sin Internet más fácil.
Obtén herramientas que ayudan.' text: show_chat: | - Este Caja de Mantequilla presenta una colección de aplicaciones de Android y salas de chat. Descarga la aplicación Mantequilla para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. O, crea una sala de chat que conserva mensajes cuando no estás aquí y los entrega cuando se vuelve a conectar a la Caja de Mantequilla. + Este Caja de Mantequilla presenta una colección de aplicaciones de Android y salas de chat. Descarga la aplicación Mantequilla para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. O, crea una sala de chat que conserva mensajes cuando no estás aquí y los entrega cuando se vuelve a conectar a la Caja de Mantequilla. dont_show_chat: | - Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. Úsala para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. + Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. Úsala para descubrir y descargar aplicaciones gratuitas y sin publicidad o compartir cuando no tienes conexión. fdroid_apps_caption: Unas aplicaciónes disponible de Mantequilla fdroid_button_text: 'DESCARGA LA APLICACIÓN ANDROID' chat_button_text: 'CREA UN SALA DE CHAT' @@ -14,22 +14,23 @@ view_all_apps: 'Ver todas las aplicaciones' built_on_fdroid: 'Basado en el software libre F-Droid' modal: - title: 'Mantequilla: aplicaciones gratuitas y sin anuncios para ayudarte cuando no tienes acceso a internet' + title: 'Mantequilla: aplicaciones gratuitas y sin anuncios para ayudarte cuando + no tienes acceso a internet' butter_app_logo_alt: 'Logo de aplicación Mantequilla' text: | Mantente al tanto, diviértete, administra tus negocios y tu vida, incluso con poco Internet. La aplicación Mantequilla facilita la tarea de encontrar aplicaciones que usan menos Internet y batería. Descarga tus favoritas y obtén actualizaciones gratuitas de Mantequilla. ¿Te interesa compartir? Envía cualquier aplicación en tu teléfono a un amigo cerca de ti con “Mantequilla cercano”. No se necesita internet. info_list: - - Autor Team Butter - - Disponible para teléfonos Android - - Menos de 10 MB! + - Autor Team Butter + - Disponible para teléfonos Android + - Menos de 10 MB! button_text: 'DESCARGA' warning: | - Debes 'habilitar descargas de fuentes desconocidas' para descargar esta aplicación en tu teléfono Android. + Debes 'habilitar descargas de fuentes desconocidas' para descargar esta aplicación en tu teléfono Android. captive: welcome_message: | - Bienvenido. Esto es "como la mantequilla." + Bienvenido. Esto es "como la mantequilla." welcome_details: | - Esta red no proporciona acceso a Internet, solo lo mejor de la siguiente, la aplicación Mantequilla. Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. -

Una vez que se haya conectado, simplemente abra http://comolamantequilla.lan en su navegador. - continue_button: 'Continuar' \ No newline at end of file + Esta red no proporciona acceso a Internet, solo lo mejor de la siguiente, la aplicación Mantequilla. Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. +

Una vez que se haya conectado, simplemente abra http://comolamantequilla.lan en su navegador. + continue_button: 'Continuar'