From dd33f6279c63f8ad8420d6de59454cd9ed5ba21a Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 18:50:05 +0000 Subject: [PATCH 01/12] Replace "Bisq" > "Bisq1" and "Bisq 2" > "Bisq2" --- _layouts/page_downloads.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/page_downloads.html b/_layouts/page_downloads.html index 671a6258..c958537c 100644 --- a/_layouts/page_downloads.html +++ b/_layouts/page_downloads.html @@ -2,7 +2,7 @@ layout: page --- {% assign item = site.data[page.lang].downloads %} -

Bisq Downloads

+

Bisq1 Downloads

@@ -76,7 +76,7 @@

Bisq Downloads

{{ item.pSeeInstructions }}
 
-

Bisq 2 Downloads

+

Bisq2 Downloads

{{ item.bisq2BetaNote }} {% assign bisq2_archive = 'https://github.com/bisq-network/bisq2/archive' %} {% assign bisq2_releases = 'https://github.com/bisq-network/bisq2/releases' %} From 6498de5a5dcfe6679a70f23f5e8f04fd58fd1b5d Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 18:51:43 +0000 Subject: [PATCH 02/12] Add node to Bisq1 header --- _layouts/page_downloads.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_layouts/page_downloads.html b/_layouts/page_downloads.html index c958537c..a96209e6 100644 --- a/_layouts/page_downloads.html +++ b/_layouts/page_downloads.html @@ -3,6 +3,7 @@ --- {% assign item = site.data[page.lang].downloads %}

Bisq1 Downloads

+{{ item.bisq1ScopeNote}} From ba1015ebf5b45442a6b714a1466cbd176c22e65d Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 18:57:43 +0000 Subject: [PATCH 03/12] Rename Bisq2 header note token --- _layouts/page_downloads.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/page_downloads.html b/_layouts/page_downloads.html index a96209e6..5c92893e 100644 --- a/_layouts/page_downloads.html +++ b/_layouts/page_downloads.html @@ -78,7 +78,7 @@

Bisq1 Downloads

 

Bisq2 Downloads

- {{ item.bisq2BetaNote }} + {{ item.bisq2ScopeNote }} {% assign bisq2_archive = 'https://github.com/bisq-network/bisq2/archive' %} {% assign bisq2_releases = 'https://github.com/bisq-network/bisq2/releases' %} From c0b53f5c4e0d10f3740c056b22b8b54c90dd8b0a Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:05:24 +0000 Subject: [PATCH 04/12] Add downloads header notes for Bisq1 and Bisq2 --- _data/de.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_data/de.yml b/_data/de.yml index caa27649..f83ae119 100644 --- a/_data/de.yml +++ b/_data/de.yml @@ -142,4 +142,6 @@ downloads: pSeeInstructions: "

Für macOS und Windows folgen Sie bitte den Installationsanweisungen im bisq.wiki.

Lesen Sie Erste Schritte mit Bisq für Anweisungen, wie Sie Ihren ersten Handel abschließen können." hMobileNotifications: Bisq Handy-Benachrichtigungen pMobileNotifications: Halten Sie sich über Ihre Trades auf dem Laufenden und erhalten Sie Benachrichtigungen auf Ihrem Handy. - bisq2BetaNote: Bisq 2 befindet sich derzeit in der Beta-Phase. Erfahren Sie mehr im Ankündigungs-Blogpost. + bisq1ScopeNote: Die ursprüngliche Version von Bisq, die die Sicherheit des Multisig-Protokolls bietet und größere Handelsbeträge ermöglicht. + bisq2ScopeNote: Bietet derzeit das Bisq Easy Protokoll an, um Benutzer ohne Bitcoin einfach zu onboarden und die Reichweite der Verkäufer zu erweitern. Wird eines Tages eine verbesserte Version des Multisig-Protokolls übernehmen. Erfahren Sie mehr im Ankündigungs-Blogpost. + From 753fa708edbd01982f9ce927705515285f178970 Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:06:31 +0000 Subject: [PATCH 05/12] Add Bisq1 and Bisq2 downloads header notes --- _data/en.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_data/en.yml b/_data/en.yml index b5a1688a..18fffa6f 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -135,7 +135,8 @@ downloads: pSeeInstructions: "

For macOS and Windows please see our new installation instructions on the bisq.wiki.

See our Getting Started page how to quickly complete your first trade.

" hMobileNotifications: Bisq Mobile Notifications pMobileNotifications: Stay up-to-date on your trades and receive notifications on your mobile phone. - bisq2BetaNote: Bisq 2 is currently in beta. Learn more in the announcement blog post. + bisq1ScopeNote: The original version of Bisq, featuring the security of the multisig protocol and allowing larger trade amounts. + bisq2ScopeNote: Currently offering the Bisq Easy protocol to easily onboard users with no bitcoin, and extend the reach of sellers, will one day inherit a better version of the multisig protocol. Learn more in the announcement blog post. getting_started: pageTitle: Getting Started From 7f9f5e8e071840bcb66c8c91f539c67c636f05e9 Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:08:09 +0000 Subject: [PATCH 06/12] Add Bisq1 and Bisq2 downloads header notes --- _data/es.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_data/es.yml b/_data/es.yml index 6891e64b..469a9620 100644 --- a/_data/es.yml +++ b/_data/es.yml @@ -142,4 +142,5 @@ downloads: pSeeInstructions: "

For macOS and Windows please see our new installation instructions on the bisq.wiki.

Vea Iniciándose con Bisq para instrucciones sobre cómo completar su primer intercambio.

" hMobileNotifications: Notificaciones móviles Bisq pMobileNotifications: Manténgase al día en sus intercambios y reciba notificaciones en su celular. - bisq2BetaNote: Bisq 2 está actualmente en fase beta. Más información en la entrada de blog del anuncio. + bisq1ScopeNote: La versión original de Bisq, que ofrece la seguridad del protocolo multisig y permite cantidades de comercio más grandes. + bisq2ScopeNote: Actualmente ofrece el protocolo Bisq Easy para facilitar la incorporación de usuarios sin bitcoin y ampliar el alcance de los vendedores. Un día heredará una versión mejorada del protocolo multisig. Aprende más en el post del blog de anuncio. From 5f0a57b5d7db5e846e9dcc0f888641ff12e66237 Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:09:31 +0000 Subject: [PATCH 07/12] Add Bisq1 and Bisq2 downloads header notes --- _data/fr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_data/fr.yml b/_data/fr.yml index 0e72c8b1..a614ca3c 100644 --- a/_data/fr.yml +++ b/_data/fr.yml @@ -142,4 +142,5 @@ downloads: pSeeInstructions: "

For macOS and Windows please see our new installation instructions on the bisq.wiki.

Voir Pour commencer avec Bisq pour obtenir des instructions sur la façon d'effectuer votre premier échange.

" hMobileNotifications: Notifications Bisq sur téléphone portable pMobileNotifications: Restez au fait de l'évolution de vos transactions et recevez des notifications sur votre téléphone portable. - bisq2BetaNote: Bisq 2 est actuellement en version bêta. Pour en savoir plus, consultez le billet de blog d'annonce. + bisq1ScopeNote: La version originale de Bisq, offrant la sécurité du protocole multisig et permettant des montants de transaction plus importants. + bisq2ScopeNote: Propose actuellement le protocole Bisq Easy pour intégrer facilement les utilisateurs sans bitcoin et étendre la portée des vendeurs. Un jour, elle héritera d'une version améliorée du protocole multisig. En savoir plus dans le post du blog d'annonce. From 4d651077fd1e20a352bb962b127bf5d78ef2c324 Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:10:51 +0000 Subject: [PATCH 08/12] Add Bisq1 and Bisq2 downloads header notes --- _data/ja.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_data/ja.yml b/_data/ja.yml index c8c8aec9..44879d3a 100644 --- a/_data/ja.yml +++ b/_data/ja.yml @@ -142,4 +142,5 @@ downloads: pSeeInstructions: "

macOSとWindowsについては、bisq.wikiの新しいインストール手順をご覧ください。

最初のトレードを完了する方法についてはBisqの概要をご覧ください。

" hMobileNotifications: Bisqモバイル通知 pMobileNotifications: トレードを最新の状態に保ち、携帯電話で通知を受け取りましょう。 - bisq2BetaNote: Bisq 2 は現在ベータ版です。詳しくは 発表ブログ記事ご覧ください。 + bisq1ScopeNote: マルチシグプロトコルのセキュリティを提供し、より大きな取引額を可能にするBisqのオリジナルバージョン。 + bisq2ScopeNote: 現在、Bisq Easyプロトコルを提供しており、ビットコインを持っていないユーザーのオンボーディングを簡単にし、販売者のリーチを拡大しています。将来的には、マルチシグプロトコルのより良いバージョンを継承する予定です。詳細は発表ブログ投稿をご覧ください。 From 4ff3fd58b645b0d3907c2ec68f1d72d83808d0b9 Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:12:01 +0000 Subject: [PATCH 09/12] Add Bisq1 and Bisq2 downloads header notes --- _data/pt-BR.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_data/pt-BR.yml b/_data/pt-BR.yml index 02e9aa4c..d9dcb00c 100644 --- a/_data/pt-BR.yml +++ b/_data/pt-BR.yml @@ -142,4 +142,5 @@ downloads: pSeeInstructions: "

Para macOS e Windows, consulte nossas novas instruções de instalação no site bisq.wiki.

Veja Introdução ao Bisq para instruções sobre como fazer sua primeira negociação.

" hMobileNotifications: Notificações da Bisq Móvel pMobileNotifications: Mantenha-se atualizado sobre suas negociações e receba notificações no seu celular. - bisq2BetaNote: O Bisq 2 está atualmente na versão beta. Saiba mais na publicação do anúncio no blog. + bisq1ScopeNote: A versão original do Bisq, oferecendo a segurança do protocolo multisig e permitindo quantias maiores de negociação. + bisq2ScopeNote: Atualmente, oferece o protocolo Bisq Easy para facilitar a integração de usuários sem bitcoin e expandir o alcance dos vendedores. Um dia, herdará uma versão aprimorada do protocolo multisig. Saiba mais no post de anúncio do blog. From 854e4139083d0d5ab01b0c53a21da11c8867f2e4 Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:12:48 +0000 Subject: [PATCH 10/12] Add Bisq1 and Bisq2 downloads header notes --- _data/pt-PT.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_data/pt-PT.yml b/_data/pt-PT.yml index d516e2cd..f9637469 100644 --- a/_data/pt-PT.yml +++ b/_data/pt-PT.yml @@ -142,4 +142,5 @@ downloads: pSeeInstructions: "

Para macOS e Windows, consulte as nossas novas instruções de instalação na página bisq.wiki.

Confira Getting Started with Bisq para instruções de como completar a sua primeira troca.

" hMobileNotifications: Notificações móvies do Bisq pMobileNotifications: Mantenha-se atualizado sobre suas trocas e receba notificações no seu telemóvel. - bisq2BetaNote: O Bisq 2 está atualmente em fase beta. Saiba mais em publicação no blogue do anúncio. + bisq1ScopeNote: A versão original do Bisq, oferecendo a segurança do protocolo multisig e permitindo quantias de negociação mais elevadas. + bisq2ScopeNote: Atualmente, oferece o protocolo Bisq Easy para facilitar a integração de utilizadores sem bitcoin e expandir o alcance dos vendedores. Um dia, herdará uma versão melhorada do protocolo multisig. Saiba mais na post do blog de anúncio. From 19994a1b3eb931f34bb05983b756c1731e7c2cea Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:13:35 +0000 Subject: [PATCH 11/12] Add Bisq1 and Bisq2 downloads header notes --- _data/ru.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_data/ru.yml b/_data/ru.yml index f0f38cd6..9ec1b1ba 100644 --- a/_data/ru.yml +++ b/_data/ru.yml @@ -142,4 +142,5 @@ downloads: pSeeInstructions: "

Для macOS и Windows, пожалуйста, ознакомьтесь с нашими новыми инструкциями по установке на bisq.wiki.

Прочитайте статью «Начало работы с Bisq», чтобы узнать, как совершить свою первую сделку.

" hMobileNotifications: Мобильные уведомления Bisq pMobileNotifications: Получайте оперативные уведомления о сделках на мобильный телефон. - bisq2BetaNote: В настоящее время Bisq 2 находится в стадии бета-версии. Узнайте больше в анонсе в блоге. + bisq1ScopeNote: Оригинальная версия Bisq, обеспечивающая безопасность протокола multisig и позволяющая осуществлять сделки с большими суммами. + bisq2ScopeNote: В настоящее время предлагает протокол Bisq Easy, который упрощает onboarding пользователей без биткойнов и расширяет охват продавцов. Со временем он унаследует улучшенную версию протокола multisig. Узнайте больше в анонсирующем посте в блоге. From 476a1e4b6116d3327208e96f3daea9323499a69d Mon Sep 17 00:00:00 2001 From: suddenwhipvapor <124399749+suddenwhipvapor@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:14:34 +0000 Subject: [PATCH 12/12] Add Bisq1 and Bisq2 downloads header notes --- _data/zh-CN.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_data/zh-CN.yml b/_data/zh-CN.yml index f26b0811..8e10f4b6 100644 --- a/_data/zh-CN.yml +++ b/_data/zh-CN.yml @@ -142,4 +142,5 @@ downloads: pSeeInstructions: "

关于 macOS 和 Windows，请参阅 bisq.wiki上的新安装说明。

有关如何完成第一笔交易的说明，请参阅如何开始使用 Bisq。

" hMobileNotifications: Bisq 通知应用程序 pMobileNotifications: 保持最新的交易和接收通知在您的手机上。 - bisq2BetaNote: Bisq 2 目前处于测试阶段。了解更多信息，请参阅 公告博文。 + bisq1ScopeNote: Bisq 的原始版本，提供 multisig 协议的安全性，并允许更大的交易金额。 + bisq2ScopeNote: 目前提供 Bisq Easy 协议，方便无比特币的用户进行注册，并扩展卖家的覆盖范围。未来将继承改进版的 multisig 协议。了解更多内容，请参阅 公告博客文章。