From 82eae966f3b37351166a83a0b629c26c55fab84c Mon Sep 17 00:00:00 2001 From: m52go Date: Tue, 11 Aug 2020 10:13:37 -0400 Subject: [PATCH 1/8] Update front page copy --- _data/en.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_data/en.yml b/_data/en.yml index edcb41c4..ec650098 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -37,7 +37,7 @@ footer: homepage_content: title: "Exchange, Decentralized." - intro: "Bisq is an open-source, peer-to-peer application that allows you to buy and sell cryptocurrencies in exchange for national currencies. No registration required." + intro: "Buy and sell bitcoin for fiat (or other cryptocurrencies) privately and securely using Bisq's peer-to-peer network and open-source desktop software. No registration required." buttonWindows: Download for Windows buttonMac: Download for Mac buttonDebian: Download for Debian/Ubuntu @@ -56,21 +56,21 @@ homepage_content: currentVersion: Current Version hFeatures: Features hIdentityVerifications: No Identity Verification - pIdentityVerifications: Instantly Accessible. No need for registration or approval from a central authority. + pIdentityVerifications: Get started in minutes. No need to wait for approval from a central authority. hDecentralized: Decentralized pDecentralized: Trading takes place on a global P2P network of users running Bisq on their own machines. hSafe: Safe - pSafe: "Bisq never holds your funds. Security deposits and multisig trade wallets encourage safe, successful trades." + pSafe: "Bisq never holds your funds. Deposits held in 2-of-2 multisig wallets encourage safe, successful trades." hPrivate: Private - pPrivate: No one except trading partners exchange personally identifying data. All personal data is stored locally. + pPrivate: Your data is stored locally on-disk, and is never sent to a central server. Every Bisq node is a Tor hidden service by default. hSecure: Secure and Always On pSecure: End-to-end encrypted communication routed over Tor and no down time. hOpen: Open - pOpen: "

Code is open source, and project strategy is discussed openly on Keybase and GitHub.

" + pOpen: "

Code is open-source, and project strategy is discussed openly on Keybase and GitHub.

" hEasy: Easy to Use - pEasy: "

We've made all this sophistication simple—make your first trade in under 10 minutes!

" + pEasy: "

We've made all this sophistication simple—make your first trade in under 10 minutes!

" hBisqDao: The Bisq DAO - pBisqDao1: Decentralized governance for a decentralized exchange. + pBisqDao1: Decentralized governance for a decentralized exchange, built on top of Bitcoin. pBisqDao2: Learn more here hGetStarted: How to Get Started divGetStarted: "With Bisq, you can start trading in less than 10 minutes:" From fd26be17e6e67e976eed5d550cba3dcfe55eb86a Mon Sep 17 00:00:00 2001 From: m52go Date: Tue, 11 Aug 2020 10:17:05 -0400 Subject: [PATCH 2/8] Remove unused front page copy items --- _data/de.yml | 2 -- _data/en.yml | 2 -- _data/es.yml | 2 -- _data/fr.yml | 2 -- _data/ja.yml | 2 -- _data/pt-BR.yml | 2 -- _data/pt-PT.yml | 2 -- _data/ru.yml | 2 -- _data/zh-CN.yml | 2 -- _layouts/page_home.html | 7 ------- 10 files changed, 25 deletions(-) diff --git a/_data/de.yml b/_data/de.yml index 9305c5d4..fc03f2de 100644 --- a/_data/de.yml +++ b/_data/de.yml @@ -63,8 +63,6 @@ homepage_content: pSafe: "Bisq verfügt nie über Ihre Gelder. Kautionen und Multisig-Trade-Wallets ermöglichen sichere und erfolgreiche Trades." hPrivate: Privat pPrivate: Niemand außer den Trading-Partnern tauscht persönliche Identifizierungsdaten aus. Alle persönlichen Daten werden lokal gespeichert. - hSecure: Sicher und immer verfügbar - pSecure: "End-to-End verschlüsselte Kommunikation, die über Tor geleitet wird, ohne Ausfallzeiten." hOpen: Offen pOpen: "

Der Code ist Open Source und die Projektstrategie wird auf Keybase und GitHub offen diskutiert.

" hEasy: Einfach zu bedienen diff --git a/_data/en.yml b/_data/en.yml index ec650098..b82a2366 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -63,8 +63,6 @@ homepage_content: pSafe: "Bisq never holds your funds. Deposits held in 2-of-2 multisig wallets encourage safe, successful trades." hPrivate: Private pPrivate: Your data is stored locally on-disk, and is never sent to a central server. Every Bisq node is a Tor hidden service by default. - hSecure: Secure and Always On - pSecure: End-to-end encrypted communication routed over Tor and no down time. hOpen: Open pOpen: "

Code is open-source, and project strategy is discussed openly on Keybase and GitHub.

" hEasy: Easy to Use diff --git a/_data/es.yml b/_data/es.yml index 61f7c9f1..5b7b9baa 100644 --- a/_data/es.yml +++ b/_data/es.yml @@ -63,8 +63,6 @@ homepage_content: pSafe: "Bisq nunca retiene sus fondos. Los depósitos de seguridad y los monederos de intercambio multifirma permiten intercambios seguros y exitosos." hPrivate: Privado pPrivate: Nadie excepto los pares de intercambio intercambian datos de identificación personal. Todos los datos se guardan de manera local. - hSecure: Seguro y siempre en funcionamiento - pSecure: Comunicación cifrada de extremo a extremo enrutada vía Tor y sin caídas. hOpen: Abierto pOpen: "

Código es abierto y la estrategia del proyecto se discute abiertamente en KeybaseyGitHub.

" hEasy: Fácil de Usar diff --git a/_data/fr.yml b/_data/fr.yml index 70235a83..da274161 100644 --- a/_data/fr.yml +++ b/_data/fr.yml @@ -63,8 +63,6 @@ homepage_content: pSafe: "Bisq ne détient jamais vos fonds. Les dépôts de garantie et les portefeuilles multisig favorisent des transactions sûres et réussies." hPrivate: Privé pPrivate: Personne d'autre que les partenaires de trading ne peuvent communiquer vos données personnelles. Toutes les données sont stockées localement. - hSecure: Sécurisé et toujours disponible - pSecure: Communication cryptée de bout en bout sur Tor et sans down time. hOpen: Ouvrir pOpen: "

Le code est open source, et la stratégie du projet est discutée ouvertement sur Keybase et GitHub.

" hEasy: Facile à utiliser diff --git a/_data/ja.yml b/_data/ja.yml index a884aed7..293f8687 100644 --- a/_data/ja.yml +++ b/_data/ja.yml @@ -63,8 +63,6 @@ homepage_content: pSafe: "Bisqが資産を保有することはありません。セキュリティデポジットとマルチシグトレードウォレットによって、安全で成功したトレードを促進します。" hPrivate: プライベート pPrivate: 取引パートナー以外とは、個人を特定するデータを交換しません。すべての個人データはローカルに保存されます。 - hSecure: 安全で常にオン - pSecure: ダウンタイムなしでTor経由でルーティングされるエンドツーエンドの暗号化通信。 hOpen: オープン pOpen: "

コードはオープンソースで、プロジェクト戦略はKeybaseとGitHubでオープンに議論されています。

" hEasy: 使うのが簡単 diff --git a/_data/pt-BR.yml b/_data/pt-BR.yml index af2b2c8d..b61c854e 100644 --- a/_data/pt-BR.yml +++ b/_data/pt-BR.yml @@ -63,8 +63,6 @@ homepage_content: pSafe: "Bisq nunca custodia seus fundos. Depósitos de segurança e carteiras para negociação multi-assinatura promovem negociações seguras e bem-sucedidas." hPrivate: Privado pPrivate: "Ninguém, exceto parceiros de negociação, troca dados de identificação pessoal. Todos os dados pessoais são armazenados localmente." - hSecure: Seguro e sempre funcionando - pSecure: Comunicação criptografada de ponta a ponta roteada através do Tor e sem tempo de inatividade. hOpen: Aberto pOpen: "

O código é aberto, e a estratégia do projeto é discutida abertamente no Keybase e GitHub.

" hEasy: Fácil de Usar diff --git a/_data/pt-PT.yml b/_data/pt-PT.yml index 6f56fd93..270f54ec 100644 --- a/_data/pt-PT.yml +++ b/_data/pt-PT.yml @@ -63,8 +63,6 @@ homepage_content: pSafe: "Bisq nunca possui os seus fundos. Os depósitos de segurança e carteiras de negócio multi-assinatura promovem negociações seguras e bem-sucedidas." hPrivate: Privado pPrivate: "Ninguém, exceto parceiros de negociação trocam dados de identificação pessoal. Todos os dados pessoais são armazenados localmente." - hSecure: Seguro e sempre Online - pSecure: Comunicação encriptada de ponta a ponta roteada por Tor e sem tempo de inatividade. hOpen: Aberto pOpen: "

O código é open source, e a stratégia do projeto é discutida em aberto no Keybase e GitHub.

" hEasy: Fácil de usar diff --git a/_data/ru.yml b/_data/ru.yml index a3f7480a..9429ec97 100644 --- a/_data/ru.yml +++ b/_data/ru.yml @@ -63,8 +63,6 @@ homepage_content: pSafe: "Bisq никогда не имеет доступа к вашим средствам. Безопасность и успешное завершение сделок обеспечивается внесением залога и использованием мультиподписей." hPrivate: Конфиденциальность pPrivate: Личной идентифицирующей информацией обмениваются только контрагенты. Все личные данные хранятся на компьютерах пользователей. - hSecure: Безопасность и бесперебойность работы - pSecure: Сквозное шифрование через Tor и отсутствие простоев в работе. hOpen: Открытость pOpen: "

Исходный код открыт, а стратегия проекта обсуждается в Keybase и на GitHub.

" hEasy: Простота использования diff --git a/_data/zh-CN.yml b/_data/zh-CN.yml index 85b55eff..3bec16d5 100644 --- a/_data/zh-CN.yml +++ b/_data/zh-CN.yml @@ -63,8 +63,6 @@ homepage_content: pSafe: "Bisq 从来不持有你的资金。安全存款和多重团体交易钱包鼓励安全、成功的交易。" hPrivate: 隐私 pPrivate: 除了贸易伙伴，没有人交换个人身份数据。所有个人资料均储存于本地。 - hSecure: 全天在线以及安全 - pSecure: 点对点加密通信路由到 Tor，没有停机时间。 hOpen: 开放 pOpen: "

代码是开源的，项目策略在Keybase和GitHub上公开讨论。" hEasy: 便利 diff --git a/_layouts/page_home.html b/_layouts/page_home.html index 0fe16086..e4270767 100644 --- a/_layouts/page_home.html +++ b/_layouts/page_home.html @@ -189,13 +189,6 @@

{{ item.hSafe }}

{{ item.hPrivate }}

{{ item.pPrivate }}

- {% comment %} -
- Secure -

{{ item.hSecure }}

-

{{ item.pSecure }}

-
- {% endcomment %}
Open Source

{{ item.hOpen }}

From ab52140a049f7e08105dd9fa49a3bb7bb164d866 Mon Sep 17 00:00:00 2001 From: m52go Date: Tue, 11 Aug 2020 10:27:16 -0400 Subject: [PATCH 3/8] Update getting-started link on downloads page --- _data/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/en.yml b/_data/en.yml index b82a2366..09fa0e9e 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -201,7 +201,7 @@ downloads: tdVerificationText0: PGP Signature tdVerificationText1: PGP Signatures tdVerificationText2: PGP Public Key - pSeeInstructions: "

See Getting Started with Bisq for instructions how to complete your first trade.

" + pSeeInstructions: "

See our Getting Started page to see 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. p2MobileNotifications:

Bisq version 0.8.0 or higher is required to receive mobile notifications.

From 993491ed06e10c54c79a6b3f54b69f9faa9dd09e Mon Sep 17 00:00:00 2001 From: m52go Date: Tue, 11 Aug 2020 10:30:51 -0400 Subject: [PATCH 4/8] Remove v0.8.0 note about notifications app v0.8.0 is long gone. --- _data/de.yml | 1 - _data/en.yml | 1 - _data/es.yml | 1 - _data/fr.yml | 1 - _data/ja.yml | 1 - _data/pt-BR.yml | 1 - _data/pt-PT.yml | 1 - _data/ru.yml | 1 - _data/zh-CN.yml | 1 - _layouts/page_downloads.html | 1 - 10 files changed, 10 deletions(-) diff --git a/_data/de.yml b/_data/de.yml index fc03f2de..c548504d 100644 --- a/_data/de.yml +++ b/_data/de.yml @@ -204,7 +204,6 @@ downloads: pSeeInstructions: "

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. - p2MobileNotifications:

Für den Empfang von Handy-Benachrichtigungen ist die Bisq Version 0.8.0 oder höher erforderlich.

faq: hFAQ: FAQ diff --git a/_data/en.yml b/_data/en.yml index 09fa0e9e..05451ed3 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -204,7 +204,6 @@ downloads: pSeeInstructions: "

See our Getting Started page to see 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. - p2MobileNotifications:

Bisq version 0.8.0 or higher is required to receive mobile notifications.

faq: hFAQ: FAQ diff --git a/_data/es.yml b/_data/es.yml index 5b7b9baa..7ce93f85 100644 --- a/_data/es.yml +++ b/_data/es.yml @@ -204,7 +204,6 @@ downloads: pSeeInstructions: "

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. - p2MobileNotifications:

La versión de Bisq 0.8.0 o superior se requiere para recibir notificaciones de celular.

faq: hFAQ: FAQ diff --git a/_data/fr.yml b/_data/fr.yml index da274161..41a0d05d 100644 --- a/_data/fr.yml +++ b/_data/fr.yml @@ -204,7 +204,6 @@ downloads: pSeeInstructions: "

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. - p2MobileNotifications:

Une version de Bisq 0.8.0 ou plus est nécessaire pour recevoir des notifications sur portable.

faq: hFAQ: FAQ diff --git a/_data/ja.yml b/_data/ja.yml index 293f8687..fc3a8c1b 100644 --- a/_data/ja.yml +++ b/_data/ja.yml @@ -204,7 +204,6 @@ downloads: pSeeInstructions: "

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

" hMobileNotifications: Bisqモバイル通知 pMobileNotifications: トレードを最新の状態に保ち、携帯電話で通知を受け取りましょう。 - p2MobileNotifications:

モバイル通知を受信するには、Bisqバージョン0.8.0以降が必要です。

faq: hFAQ: FAQ diff --git a/_data/pt-BR.yml b/_data/pt-BR.yml index b61c854e..eb543d29 100644 --- a/_data/pt-BR.yml +++ b/_data/pt-BR.yml @@ -204,7 +204,6 @@ downloads: pSeeInstructions: "

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. - p2MobileNotifications:

A versão Bisq 0.8.0 ou superior é necessária para receber notificações móveis.

faq: hFAQ: Perguntas Frequentes diff --git a/_data/pt-PT.yml b/_data/pt-PT.yml index 270f54ec..7b470f23 100644 --- a/_data/pt-PT.yml +++ b/_data/pt-PT.yml @@ -204,7 +204,6 @@ downloads: pSeeInstructions: "

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. - p2MobileNotifications:

A versão do Bisq 0.8.0 ou superior é necessária para receber notificações móveis.

faq: hFAQ: FAQ diff --git a/_data/ru.yml b/_data/ru.yml index 9429ec97..692a72f2 100644 --- a/_data/ru.yml +++ b/_data/ru.yml @@ -204,7 +204,6 @@ downloads: pSeeInstructions: "

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

" hMobileNotifications: Мобильные уведомления Bisq pMobileNotifications: Получайте оперативные уведомления о сделках на мобильный телефон. - p2MobileNotifications:

Для получения мобильных уведомлений необходима версия Bisq 0.8.0 или новее.

faq: hFAQ: ЧаВо diff --git a/_data/zh-CN.yml b/_data/zh-CN.yml index 3bec16d5..fbe48cb9 100644 --- a/_data/zh-CN.yml +++ b/_data/zh-CN.yml @@ -204,7 +204,6 @@ downloads: pSeeInstructions: "

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

" hMobileNotifications: Bisq 通知应用程序 pMobileNotifications: 保持最新的交易和接收通知在您的手机上。 - p2MobileNotifications:

接收手机通知需要Bisq 0.8.0或更高版本。

faq: hFAQ: FAQ diff --git a/_layouts/page_downloads.html b/_layouts/page_downloads.html index 69bb2188..427cbba0 100644 --- a/_layouts/page_downloads.html +++ b/_layouts/page_downloads.html @@ -83,5 +83,4 @@
{{ item.hMobileNotifications }}
Get it on Google Play   Get it on the App Store - {{ item.p2MobileNotifications }}
From 394ba19ed7c7becbe7b5625951e35095bf94ff3d Mon Sep 17 00:00:00 2001 From: m52go Date: Wed, 12 Aug 2020 12:38:52 -0400 Subject: [PATCH 5/8] Update faq, part i First 2 sections: core functions and trading details. --- _data/en.yml | 39 +++++++++++++++++++++------------------ _layouts/page_faq.html | 9 +++++---- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/_data/en.yml b/_data/en.yml index 05451ed3..18dccc77 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -214,24 +214,27 @@ faq: source code and license.

Bisq employs three primary mechanisms to achieve security:

    -
  1. All bitcoins traded with Bisq are secured in a 2-of-2 +
  2. All bitcoin traded with Bisq is secured in a 2-of-2 multisignature address.
  3. Both traders are required to pay security deposits. These are refunded after trades are completed.
    4. -
  4. Trade disputes are handled through a 3-tier mechanism that includes trader chat, mediation, and arbitration.
    5. -

When trading fiat currency for bitcoin, there is always some chargeback risk, as fiat transactions can technically be reversed.

To mitigate this risk, Bisq:

  • only supports payment methods which are known to make chargebacks difficult—this is why Bisq does not support PayPal and credit cards, for example. See more on chargeback risks.
  • employs an account signing mechanism that forces a 0.01 BTC buy limit until a buyer's integrity is verified.
- hDifferent: "There are already other decentralized exchanges. How is Bisq different?" +
  • Trade disputes are handled through a 3-tier mechanism that includes trader chat, mediation, and arbitration.
    • +

    When trading fiat currency for bitcoin, there is always some chargeback risk, as fiat transactions can often be reversed.

    To mitigate this risk, Bisq:

    • only supports payment methods which are known to make chargebacks difficult—this is why Bisq does not support PayPal and credit cards, for example. See more on chargeback risks.
    • employs an account signing mechanism that forces a 0.01 BTC buy limit until a buyer's integrity (not identity!) is verified.
    + hDifferent: "How is Bisq different from other decentralized exchanges?" pDifferent: > -

    Currently no other project fits our definition of a decentralized bitcoin-to-fiat exchange. OpenBazaar is one project that comes close to mirroring Bisq's principles, but it's a general-purpose marketplace, not a specialized currency exchange.

    Most exchanges claiming to be decentralized either do not support fiat exchange, or operate with a client-server architecture and do not fit our definition. And of course there are a lot of ICO projects with whitepapers but they have not proven yet that they can deliver any working software.

    To be properly decentralized, one must avoid single points of failure:

      -
    • Bisq does not hold any bitcoins. All are held in multisignature addresses rather than a Bisq-controlled wallet.
      • -
    • Bisq does not hold any national currency. National currency is transferred directly from one trader to the other.
      • -
    • Bisq uses a peer-to-peer network over Tor. This means there are no servers to be hacked or DDoS'd.
      • -
    • Bisq does not know traders. No data is stored on who trades with whom.
      • -
    • Bisq does not require registration. This means privacy is maintained, there are no “approval” wait times, and identity theft is impossible.
      • -
    • Bisq is not a company. It is an open-source project organized as a Decentralized Autonomous Organization (DAO). +

      Bisq is a peer-to-peer trading network, not a centralized service. It's software you run on your own hardware, not a website run by someone else. It's open-source and community-driven.

      And you can trade bitcoin for fiat currencies with it!

      The difference between Bisq and other so-called decentralized exchanges is as stark as the difference between owning your own home and renting someone else's—in the former case you have full control over the property, and in the latter you're always subject to the landlord's whims and demands (no matter how nice the landlord may seem to be).

      With Bisq you're always the owner—not just owner of your bitcoin, but also owner of your data.

      +
        +
      • Bisq does not hold any bitcoin. All bitcoin used for trading is held in 2-of-2 multisignature addresses controlled solely by the trading peers themselves.
        • +
      • Bisq does not hold any national currency. National currency is transferred directly from one trader to the other using traditional banking and payment services.
        • +
      • All Bisq data is transferred over its own secure peer-to-peer network, which is built on top of the Tor network—no central servers. This means there are no data honeypots, rendering large-scale hacks of customer information databases impossible.
        • +
      • Bisq does not know anything about traders who use its network, and no data is stored on who trades with whom.
        • +
      • Bisq does not require registration. This means user privacy is protected, and it also means there is no waiting period to have your account approved for trading.
        • +
      • Bisq is code, not a company. It is an open-source project organized as a decentralized autonomous organization (DAO) built on top of Bitcoin.
      +

      See a more comprehensive introduction on the wiki.

      hPaymentMethods: "Which payment methods are supported?" ulPaymentMethods: > +

      Payment methods vary by country, but here's a brief listing.

      Please see the payment methods wiki article for more details.

      • Advanced Cash
      • AliPay
        • @@ -258,22 +261,21 @@ faq:
      • US Postal Money Order
      • WeChat Pay
      • Western Union
        • -
      • Zelle (ClearXchange)
        • +
      • Zelle
      -

      Please see our payment methods doc for more details. Different payment methods have different trading limits and trading periods.

      hTradingDetails: Trading Details hTradeLimits: "What are the trade limits?" pTradeLimits: > -

      Fiat trades

      To discourage fraud in fiat transactions, Bisq imposes limits on trade amounts. These limits are derived from the payment method's chargeback risk, its signing status, and its age (i.e., the time since you created the payment account in Bisq).

      There are no limits on the number of trades you can do—just the amount per trade.

      For most bank-based payment methods like SEPA or Zelle, the maximum trade size is 0.25 BTC. For services like PerfectMoney and AliPay, it is 1 BTC.

      Lower-risk payment methods start to age as soon as they're created in Bisq. When you create such a payment account in Bisq, its trade limit will be 25% of the full trade limit. After 30 days, it will increase to 50% of the full trade limit, and after 60 days it will increase to 100% of the full trade limit.

      Higher-risk payment accounts must be signed by a trusted peer in order to start aging. Until this signing, they are limited to buying 0.01 BTC. The account signing doc has more details.

      Note that selling limits for higher-risk payment methods are not affected by signing and follow regular account aging as described for lower-risk payment methods above.

      Altcoin trades

      Altcoin trades up to 2 BTC are allowed from day one—altcoins do not have chargeback risk, so account aging is not needed.

      +

      Fiat trades

      To discourage fraud in fiat transactions, Bisq imposes limits on trade sizes. These limits are derived from a payment method's chargeback risk, its signing status, and its age (i.e., the time since you created the payment account in Bisq).

      There are no limits on the number of trades you can do—just the amount per trade.

      For most bank-based payment methods like SEPA or Zelle, the maximum trade size is 0.25 BTC. For services like PerfectMoney and AliPay, it is 1 BTC. See the full list of payment methods and limits here.

      Trade size limits are based on risk factor of the payment method:

      • Lower-risk payment methods have higher initial limits which increase over time through a mechanism called account aging (in short, account aging allows 25% of the full trade size to be traded as soon as the account is created in Bisq, 50% of the full trade size to be traded after 30 days have passed since account creation, and 100% of the full trade size 60 days after account creation). Basically, the older an account is, the bigger trades it can do.
      • Higher-risk payment accounts must be signed by a trusted peer in order for account aging to begin. Until this signing, they are limited to buying 0.01 BTC per trade, regardless of how old the account is.

      See the account limits wiki article or this video for more details on both.

      Altcoin trades

      Altcoin trades up to 2 BTC are allowed from day one—altcoins do not have chargeback risk, so account aging is not needed.

      hSecurityDeposit: "Why does Bisq require a security deposit?" pSecurityDeposit: > -

      Security deposits create incentives for both buyer and seller to follow the rules of Bisq's trading protocol. They are locked into multisig escrow along with the bitcoin being traded, and are returned to each user when the trade completes successfully.

      If a trade is disputed through a mediator or arbitrator, some or all of that party's security deposit may be awarded to the counterparty. Examples of protocol violations include a buyer failing to pay a seller, or a seller failing to acknowledge receipt of a buyer's payment.

      Most Bisq trades complete without any problem thanks in part to the incentives that security deposits create.

      See this document for full trading rules.

      +

      Security deposits create strong incentives for buyers and sellers to follow the rules of Bisq's trading protocol. Deposits are locked into multisig escrow along with the bitcoin being traded, and are returned to each user when the trade is complete.

      If a trade is disputed through a mediator or arbitrator, some or all of the offending party's security deposit may be awarded to the counterparty. Examples of protocol violations include a buyer failing to pay a seller, paying with a different account or with a different name, or a seller failing to acknowledge receipt of a buyer's payment.

      Most Bisq trades complete without any problem thanks in part to the incentives that security deposits create.

      See this wiki article for full trading rules.

      hPrivacy: "How does Bisq protect my privacy?" pPrivacy: >

      Bisq is standalone, open-source software that you can inspect before running on your machine, and as a result, you don't have to trust that any server is logging your personal details (as you would in the case of a website).

      As for the trading process, your payment information is stored locally on your machine, and only your trading partner (and your mediator or arbitrator, in case of a dispute) can ever see it. All data exchanged between users is encrypted and signed.

      To transmit data from one user to another, Bisq uses a P2P network built on top of Tor, which provides a high degree of anonymity. The user doesn't need to do any additional work for all of this to work—it is all integrated in the application.

      hTradeDuration: "How long does a trade take?" pTradeDuration: > -

      Trade duration is determined by the transfer times of the currencies you're using. National currency transfers can be instant (Faster Payment) or can take a few days (SEPA).

      Bitcoin transactions take about 10 minutes to confirm, and at least one confirmation is required before the buyer can send the fiat or altcoins.

      Altcoin trade periods are always 1 day (or 1 hour for Altcoins Instant trades).

      Please see the list of payment methods for complete details.

      +

      Trade duration is determined by payment method. Some payment methods are instant (e.g., Faster Payment) while others can take a few days (e.g., SEPA).

      As far as Bisq is concerned, the deposit transaction needs to be confirmed once before the buyer can send payment. Bitcoin transactions take about 10 minutes to confirm, so with quick traders and quick payment method, a Bisq trade can be completed in a matter of minutes.

      Altcoin trade periods are always 1 day (or 1 hour for Altcoins Instant trades).

      Please see the list of payment methods for complete details.

      hTradeCost: "How much does it cost to trade on Bisq?" pTradeCost: >

      To trade on Bisq, users pay (1) trading fees to Bisq and (2) mining fees to miners.

      @@ -283,15 +285,16 @@ faq: Mining fees

      An offer maker only pays mining fees for the trade fee transaction. An offer taker pays mining fees for the trade fee transaction, deposit transaction, and payout transaction. This is because mining fees fluctuate and it's impossible for the offer maker to know what mining fees will be at the time their offer is taken.

      -

      Bisq uses this service to estimate fees. Users can see actual mining fees after they've created or taken an offer.

      +

      Bisq uses mempool.space to estimate fees. Users can see actual mining fees after they've created or taken an offer.

      hOpenOffer: "Why do I need to keep my application online when I have an open offer?" pOpenOffer: > +

      There are no central servers on the Bisq network—so all peers are responsible for keeping their offers online.

      If you have published an offer, your Bisq application needs to stay online so it can react when another trader wants to take your offer (the multisig deposit transaction is created in the take-offer process). Be sure you have deactivated your computer's standby mode so your Bisq application can stay online (monitor standby is not a problem).

      If your Bisq application does go offline, your offer will get removed from the distributed offerbook. It will be re-published the next time you start your Bisq application.

      After an offer has been taken and the trade process has started, neither trader needs to be online continuously, but each trader will need to be online periodically to check if any action is needed on their side (e.g. sending fiat/altcoin, confirming payment receipt, etc).

      hEditOffer: "How can I edit my offer?" pEditOffer: "

      Version 0.7.0 introduced offer editing in the Portfolio > My open offers section without paying additional fees.

      " hBank: "Will my bank know I'm buying bitcoins?" pBank: > -

      There have been reports that some banks have closed client accounts when they sense Bitcoin activity.

      The reference text (sometimes called "reason for payment" or similar) of the bank transfer used to trade with Bisq must always only include the Bisq trade ID, which is a random sequence of characters, just like many other purchase IDs. Putting anything else as a "reason for payment" is considered a violation of the trade protocol and will result in a dispute.

      To avoid problems, we recommend setting up a dedicated bank account for buying and selling bitcoins. If the bank were to block this account, it would cause fewer problems for you than if the bank were to block your primary account.

      Never mention anything else other than the Bisq trade ID in the subject field.

      +

      There have been reports of banks closing accounts upon suspecting bitcoin activity.

      As a result, Bisq requires that there be absolutely no mention of "Bisq" or "Bitcoin" or anything else other than the trade's ID (which is an alphanumeric code that looks like a generic invoice/purchase ID) in the "reason for payment" section of bank transfers.

      This rule is strictly enforced, and putting anything else in the "reason for payment" field is considered a violation of the trade protocol and will result in a dispute.

      We recommend setting up a dedicated bank account for buying and selling bitcoin in case any issues arise.

      hDisputeRsolution: Dispute Resolution hArbitrationProcess: "How does dispute resolution work?" pArbitrationProcess: > diff --git a/_layouts/page_faq.html b/_layouts/page_faq.html index 9fbc79c2..9ede05d1 100644 --- a/_layouts/page_faq.html +++ b/_layouts/page_faq.html @@ -6,20 +6,21 @@

      {{ item.hFAQ }}

      {{ item.hCoreFunctions }}

      +
      -
      {{ item.hSafeOpenSource }}
      +
      {{ item.hDifferent }}
      - {{ item.pSafeOpenSource }} + {{ item.pDifferent }}
      -
      {{ item.hDifferent }}
      +
      {{ item.hSafeOpenSource }}
      - {{ item.pDifferent }} + {{ item.pSafeOpenSource }}
      From 7c1e26bbc969561369b179c36121d1e830c2b42d Mon Sep 17 00:00:00 2001 From: m52go Date: Wed, 12 Aug 2020 13:25:13 -0400 Subject: [PATCH 6/8] Remove edit-offer faq item --- _data/de.yml | 2 -- _data/en.yml | 2 -- _data/es.yml | 2 -- _data/fr.yml | 2 -- _data/ja.yml | 2 -- _data/pt-BR.yml | 2 -- _data/pt-PT.yml | 2 -- _data/ru.yml | 2 -- _data/zh-CN.yml | 2 -- _layouts/page_faq.html | 9 --------- 10 files changed, 27 deletions(-) diff --git a/_data/de.yml b/_data/de.yml index c548504d..87f71489 100644 --- a/_data/de.yml +++ b/_data/de.yml @@ -287,8 +287,6 @@ faq: hOpenOffer: "Warum muss die Software online bleiben, wenn ich ein offenes Angebot habe?" pOpenOffer: >

      Wenn Sie ein Angebot veröffentlicht haben, muss Ihre Bisq-Anwendung online bleiben, damit sie reagieren kann, wenn ein anderer Trader Ihr Angebot annehmen möchte (die Multisig-Einzahlungstransaktion wird im Take-Offer-Prozess angelegt). Stellen Sie sicher, dass Sie den Standby-Modus Ihres Computers deaktiviert haben, damit Ihre Bisq-Anwendung online bleiben kann (Monitor-Standby ist kein Problem).

      Wenn Ihre Bisq-Anwendung offline geht, wird Ihr Angebot aus dem verteilten Offerbook entfernt. Sie wird beim nächsten Start Ihrer Bisq-Anwendung erneut veröffentlicht.

      Nachdem ein Angebot angenommen wurde und der Trading-Prozess begonnen hat, müssen die Trader nicht kontinuierlich online sein, aber jeder Trader muss regelmäßig online sein, um zu überprüfen, ob von seiner Seite Maßnahmen erforderlich sind (z.B. Versand von Fiat/Altcoin, Bestätigung des Zahlungseingangs, etc.).

      - hEditOffer: "Wie kann ich mein Angebot bearbeiten?" - pEditOffer: "

      In der Version 0.7.0 wurde die Angebotsbearbeitung im Bereich Portfolio > Meine offenen Angebote ohne zusätzliche Gebühren eingeführt.

      " hBank: "Wird meine Bank herausfinden, dass ich Bitcoins kaufe?" pBank: >

      Es gibt Berichte, dass einige Banken Kundenkonten geschlossen haben, wenn sie Bitcoin-Aktivitäten erkannt haben.

      Der Referenztext (manchmal auch als "Zahlungsgrund" oder ähnlich bezeichnet) der Banküberweisung, die für das Trading auf Bisq verwendet wird, darf immer nur die Bisq Trade ID enthalten, die eine zufällige Folge von Zeichen ist, genau wie viele andere Kauf-IDs. Irgendetwas anderes als "Zahlungsgrund" zu verwenden, gilt als Verletzung des Trade-Protokolls und führt zu einem Streitfall.

      Um Probleme zu vermeiden, empfehlen wir die Einrichtung eines eigenen Bankkontos für den Kauf und Verkauf von Bitcoins. Wenn die Bank dieses Konto sperren würde, hätten Sie dadurch weniger Probleme, als wenn die Bank Ihr Hauptkonto sperren würde.

      Erwähnen Sie niemals etwas anderes als die Bisq Trade ID im Betreff-Feld.

      diff --git a/_data/en.yml b/_data/en.yml index 18dccc77..d45dcf92 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -290,8 +290,6 @@ faq: pOpenOffer: >

      There are no central servers on the Bisq network—so all peers are responsible for keeping their offers online.

      If you have published an offer, your Bisq application needs to stay online so it can react when another trader wants to take your offer (the multisig deposit transaction is created in the take-offer process). Be sure you have deactivated your computer's standby mode so your Bisq application can stay online (monitor standby is not a problem).

      If your Bisq application does go offline, your offer will get removed from the distributed offerbook. It will be re-published the next time you start your Bisq application.

      After an offer has been taken and the trade process has started, neither trader needs to be online continuously, but each trader will need to be online periodically to check if any action is needed on their side (e.g. sending fiat/altcoin, confirming payment receipt, etc).

      - hEditOffer: "How can I edit my offer?" - pEditOffer: "

      Version 0.7.0 introduced offer editing in the Portfolio > My open offers section without paying additional fees.

      " hBank: "Will my bank know I'm buying bitcoins?" pBank: >

      There have been reports of banks closing accounts upon suspecting bitcoin activity.

      As a result, Bisq requires that there be absolutely no mention of "Bisq" or "Bitcoin" or anything else other than the trade's ID (which is an alphanumeric code that looks like a generic invoice/purchase ID) in the "reason for payment" section of bank transfers.

      This rule is strictly enforced, and putting anything else in the "reason for payment" field is considered a violation of the trade protocol and will result in a dispute.

      We recommend setting up a dedicated bank account for buying and selling bitcoin in case any issues arise.

      diff --git a/_data/es.yml b/_data/es.yml index 7ce93f85..e35bea6d 100644 --- a/_data/es.yml +++ b/_data/es.yml @@ -331,8 +331,6 @@ faq: hOpenOffer: "¿Por qué necesito mantener mi aplicación en línea cuando tengo una oferta abierta?" pOpenOffer: >

      Si ha publicado una oferta, su aplicación Bisq necesita estar en línea para reaccionar cuando otro comerciante quiera tomar la oferta (la transacción de depósito multisig se crea en el proceso de tomar la oferta). Asegúrese de que ha desactivado el modo en suspensión de la computadora para que la aplicación Bisq pueda mantenerse en línea(el stand-by del monitor no es un problema).

      Si su aplicación Bisq se desconecta, su oferta se eliminará del libro de ofertas distribuido. Se volverá a publicar la próxima vez que inicie la aplicación Bisq.

      Despueś de que una oferta haya sido tomada y el proceso de intercambio haya comenzado, ningún comerciante necesita permanecer en línea contínuamente, pero cada comerciante necesitará estar en línea periódicamente para comprobar si alguna acción se necesita de su lado (Ej. enviar fiat/altcoin, confirmar el recepción de pago, etc).

      - hEditOffer: "¿Cómo puedo editar mi oferta?" - pEditOffer: "

      La versión 0.7.0 introdujo la edición de ofertas en la sección Portafolio > Mis ofertas abiertas sin pagar comisiones adicionales.

      " hBank: "¿Sabrá mi banco que estoy comprando bitcoins?" pBank: >

      Se sabe de casos en que algunos bancos han cerrado cuentas de cientes al notar actividad con Bitcoin.

      El texto de referencia (a veces llamado "razón de pago" o parecido) de la transferencia bancaria usada para intercambiar con Bisq debe siempre incluir solo la ID de intercambio Bisq, que es una secuencia de caracteres aleatorios, como cuaquier otra ID de compra. Poner cualquier otra "razón de pago" se considera una violación de el protocolo de intercambio y resultará en disputa.

      Para evitar problemas, recomendamos configurar una cuenta bancaria dedicada para comprar y vender bitcoins. Si el banco bloqueara esa cuenta, le causaría menos problemas que si el banco bloqueara su cuenta principal.

      Nunca mencione nada más que la ID de intercambio Bisq en el campo de asunto.

      diff --git a/_data/fr.yml b/_data/fr.yml index 41a0d05d..6265ad9c 100644 --- a/_data/fr.yml +++ b/_data/fr.yml @@ -305,8 +305,6 @@ faq: hOpenOffer: "Pourquoi dois-je garder le programme connecté lorsque j'ai une offre en cours?" pOpenOffer: >

      Si vous avez publié une offre, votre application Bisq doit rester en ligne pour pouvoir réagir quand un autre trader voudra accepter votre offre (la transaction de dépôt multisig est créée lors du processus de take-offer). Assurez-vous d'avoir désactivé le mode veille de votre ordinateur pour que votre application Bisq puisse rester en ligne (la veille du moniteur n'est pas un problème).

      Si votre application Bisq est offline, votre offre sera retirée de l'offerbook. Elle sera republiée la prochaine fois que vous lancerez votre application Bisq.

      Après qu'une offre a été acceptée et que le processus de transaction a commencé, aucun des deux trader n'a besoin d'être en ligne en permanence, mais chaque trader devra être en ligne périodiquement pour vérifier si une action est nécessaire de leur côté (par exemple, l'envoi de fiat/altcoin, la confirmation de réception du paiement, etc).

      - hEditOffer: "Comment puis-je modifier mon offre?" - pEditOffer: "

      La version 0.7.0 intègre la possibilité de modifier une offre dans le Portfolio > Aller dans la section Mes offres en cours sans payer de frais supplémentaires.

      " hBank: "Est-ce que ma banque saura que j'achète des bitcoins?" pBank: >

      Il a été rapporté que certaines banques ont fermé des comptes clients lorsqu'elles détecte une activité en relation avec Bitcoin.

      Le texte de référence (parfois appelé "motif du paiement" ou équivalent) du virement bancaire utilisé pour trader avec Bisq doit toujours exclusivement contenir l'ID de la transaction Bisq, qui est une séquence aléatoire de caractères, comme cela est le cas pour beaucoup d'autres référence d'achat. Toute autre raison de paiement est considérée comme une violation du protocole de transaction et donnera lieu à un différend.

      Pour éviter les problèmes, nous vous recommandons de créer un compte bancaire dédié à l'achat et à la vente de bitcoins. Si la banque bloquait ce compte, cela vous causerait moins de problèmes que si elle bloquait votre compte principal.

      Ne mentionnez jamais rien d'autre que l'ID de la transaction Bisq dans le champ relatif à l'objet.

      diff --git a/_data/ja.yml b/_data/ja.yml index fc3a8c1b..6b5b5e89 100644 --- a/_data/ja.yml +++ b/_data/ja.yml @@ -305,8 +305,6 @@ faq: hOpenOffer: "オープンオファーがあるときに、アプリケーションをオンラインに保つ必要があるのはなぜですか？" pOpenOffer: >

      もしあなたがオファーを公開した場合、Bisqアプリケーションはオンラインのままにして、別のトレーダーがオファーを受け取りたいときに反応できるようにする必要があります（マルチシグデポジットトランザクションはテイクオフプロセスで作成されます）。 Bisqアプリケーションがオンライン状態を維持できるように、コンピューターのスタンバイモードを無効にしてください（モニターのスタンバイは問題ありません）。

      Bisqアプリケーションがオフラインになった場合、オファーは配布されたオファーブックから削除されます。これは次回Bisqアプリケーションを起動したときに再発行されます。

      オファーが取得されてトレードプロセスが開始された後、どちらのトレーダーも継続的にオンラインである必要はありませんが、各トレーダーは定期的にオンラインになり、自分の側で何らかのアクションが必要かどうかを確認する必要があります（例：法定通貨/アルトコインの送信、支払い受領の承認など）。

      - hEditOffer: "オファーをどのように変更できますか？" - pEditOffer: "

      バージョン0.7.0では、追加手数料を支払わない、ポートフォリオ＞マイオープンオファーセクションでのオファー編集を導入しました。

      " hBank: "銀行はビットコインを購入していることを知りますか？" pBank: >

      一部の銀行がビットコインの活動を検知したときに顧客の口座を閉鎖したという報告があります。

      Bisqとの取引に使用される銀行振込の参照テキスト（「支払い理由」などと呼ばれることもある）には、常にBisqトレードIDのみを含める必要があります。これは他の多くの購入IDと同様にランダムな文字列です。「支払いの理由」として他のものを置くことは、取引プロトコルの違反とみなされ、係争を引き起こす可能性があります。

      問題を回避するために、ビットコインの売買専用の銀行口座を設定することをお勧めします。 銀行がこの口座をブロックする場合、銀行があなたの主口座をブロックする場合よりも、あなたにとって問題が少ないでしょう。

      件名フィールドには、Bisq取引ID以外のものは一切記載しないでください。

      diff --git a/_data/pt-BR.yml b/_data/pt-BR.yml index eb543d29..63e4eb2f 100644 --- a/_data/pt-BR.yml +++ b/_data/pt-BR.yml @@ -285,8 +285,6 @@ faq: hOpenOffer: "Por que preciso manter meu programa on-line quando tenho uma oferta aberta?" pOpenOffer: >

      Se você publicou uma oferta, seu programa Bisq precisa ficar on-line para que possa reagir quando outro negociador quiser aceitar sua oferta (a transação de depósito multi-assinatura é criada no processo aceitar oferta). Certifique-se de ter desativado o modo de espera do seu computador para que seu programa Bisq possa permanecer on-line (o modo de espera do monitor não é um problema)

      Se o seu programa Bisq ficar off-line, sua oferta será removida do livro de ofertas distribuído. Sua oferta será republicada na próxima vez que você iniciar seu programa Bisq.

      Depois de uma oferta ter sido aceita e o processo de negociação ter iniciado, nenhum dos negociadores precisa estar on-line continuamente, mas cada trader precisará estar on-line periodicamente para verificar se alguma ação é necessária de sua parte (por exemplo, enviar fiat/altcoin, confirmar o recibo de pagamento, etc.).

      - hEditOffer: "Como posso editar minha oferta?" - pEditOffer: "

      A versão 0.7.0 introduziu edição de ofertas na seção Portfólio > Minhas ofertas abertas sem pagamento de taxas adicionais.

      " hBank: "Meu banco saberá que estou comprando bitcoins?" pBank: >

      Há relatos de que alguns bancos fecharam contas de clientes quando perceberam atividades relacionadas a Bitcoin.

      O texto de referência (às vezes chamado de "motivo do pagamento" ou similar) da transferência bancária usada para negociar com a Bisq deve sempre incluir apenas o código da negociação Bisq, que é uma sequência aleatória de caracteres, assim como muitos outros códigos de compra. Colocar qualquer outra coisa como "motivo do pagamento" é considerado uma violação do protocolo de negociações e resultará em uma disputa.

      Para evitar problemas, recomendamos a criação de uma conta bancária dedicada à compra e venda de bitcoins. Se o banco bloquear esta conta, isso causará menos problemas para você do que se o banco bloquear sua conta principal.

      Nunca mencione nada além do código da negociação Bisq no campo dedicado a isso.

      diff --git a/_data/pt-PT.yml b/_data/pt-PT.yml index 7b470f23..96ef5eeb 100644 --- a/_data/pt-PT.yml +++ b/_data/pt-PT.yml @@ -287,8 +287,6 @@ faq: hOpenOffer: "Por que é que preciso manter o meu programa online quando tenho uma oferta aberta?" pOpenOffer: >

      Se você publicou uma oferta, o seu programa Bisq precisa ficar online para que ele possa reagir quando um outro negociante quiser aceitar sua oferta (a transação de depósito de multi-assinatura é criada no processo aceitação da oferta). Certifique-se de ter desativado o modo de espera do seu computador para que o seu programa Bisq possa permanecer online (o modo de espera do monitor não é um problema).

      Se o seu programa Bisq ficar offline, a sua oferta será removida do livro de ofertas distribuído. Ela será publicada novamente na próxima vez que você iniciar o seu programa Bisq.

      Após uma oferta ter sido aceite e o processo de troca ter iniciado, nenhum dos negociantes precisa estar online continuamente, mas cada negociante precisará estar online periodicamente para verificar se alguma ação é necessária do seu lado (por exemplo, enviando moeda fiduciária/altcoin, confirmar a receção de pagamento, etc).

      - hEditOffer: "Como posso editar minha oferta?" - pEditOffer: "

      A Versão 0.7.0 iintroduziu a edição de ofertas na secção Portfólio > Minhas ofertas abertas sem ter de pagar taxas adicionais.

      " hBank: "O meu banco saberá que estou comprando bitcoins?" pBank: >

      Houve relatos de que alguns bancos fecharam contas de clientes quando se apercebem da atividade relacionada com o Bitcoin.

      O texto de referência (às vezes chamado de "motivo do pagamento" ou similar) da transferência bancária usada para negociar com o Bisq deve sempre apenas incluir o ID de negociação do Bisq, que é uma sequência aleatória de caracteres, assim como muitos outros IDs de compra. Colocar qualquer outra coisa como uma "razão para pagamento" é considerado uma violação do protocolo de troca e resultará em uma disputa.

      TPara evitar problemas, recomendamos a criação de uma conta bancária dedicada à compra e venda de bitcoins. Se o banco bloqueasse essa conta, isso causaria menos problemas para você do que se o banco bloqueasse a sua conta principal.

      Nunca mencione outra coisa que não seja o ID de troca do Bisq no campo de assunto.

      diff --git a/_data/ru.yml b/_data/ru.yml index 692a72f2..2d503f18 100644 --- a/_data/ru.yml +++ b/_data/ru.yml @@ -285,8 +285,6 @@ faq: hOpenOffer: "Почему нужно, чтобы приложение было всегда запущено, когда у меня есть открытое предложение?" pOpenOffer: >

      Когда вы публикуете предложение, приложение Bisq должно оставаться запущенным, чтобы другой пользователь мог принять его (во время этого создаётся мультиподписная транзакция). Выключите переход в режим сна на своём компьютере, чтобы приложение Bisq оставалось в сети (переход монитора в спящий режим монитор не влияет на работу приложения).

      Если ваше приложение Bisq отключится от сети, ваше предложение исчезнет из списка доступных предложений. Оно снова появится в списке при следующем запуске Bisq.

      После принятия предложения и начала сделки контрагентам не требуется постоянно находится в сети, однако им следует периодически запускать приложение, чтобы убедиться, чтобы от них не требуется совершения каких-либо действий (напр., отправки национальной валюты/альткойнов, подтверждения платежа и т. д.).

      - hEditOffer: "Могу ли я отредактировать мое предложение?" - pEditOffer: "

      Начиная с версии 0.7.0 в приложении появилась возможность редактирования предложения в разделе Сделки > Мои текущие предложения без оплаты дополнительной комиссии.

      " hBank: "Узнают ли в моем банке о том, что я покупаю биткойны?" pBank: >

      Сообщалось о том, что некоторые банки закрывали счета своих клиентов, когда заподозрили их в покупке биткойнов.

      При совершении банковского перевода в поле назначения платежа нужно всегда указывать только идентификатор сделки Bisq, который представляет собой случайный набор символов. Если вы укажете иное назначение платежа, это будет рассматриваться как нарушение торгового протокола и приведет к открытию спора.

      Во избежание проблем мы рекомендуем создать отдельный банковский счет для торговли биткойнами. Если банк заблокирует этот счёт, вы столкнётесь с меньшим количеством сложностей по сравнению с блокировкой вашего основного счёта.

      Никогда не указывайте ничего, кроме идентификатора сделки Bisq, в поле назначения платежа.

      diff --git a/_data/zh-CN.yml b/_data/zh-CN.yml index fbe48cb9..d9cd2b05 100644 --- a/_data/zh-CN.yml +++ b/_data/zh-CN.yml @@ -283,8 +283,6 @@ faq: hOpenOffer: "当我有一个未完成的报价为什么需要我的应用程序保持在线？" pOpenOffer: >-

      如果您已经发布了一个报价，那么您的 Bisq 应用程序需要保持在线状态，以便当其他交易员想要接收您的报价时，它可以做出反应（多重签名保证金交易是在接收报价过程中创建的）。确保您已经停用了计算机的待机模式，以便您的 Bisq 应用程序可以在线（显示器待机不会有问题）。

      如果您的 Bisq 应用程序离线，您的报价将从分布式报价列表中删除。它将在您下次启动 Bisq 应用程序时重新发布。

      在收到报价并开始交易流程后，两名交易员都不需要一直在线，但每名交易员都需要定期在线，以检查他们是否需要采取任何行动（例如发送法币/数字货币、确认收到付款等）。

      - hEditOffer: "我怎么修改我的报价？" - pEditOffer: "

      0.7.0 版本在 交易 > 我的未完成报价部分引入了报价编辑功能，无需支付额外费用。

      " hBank: "银行会知道我在购买比特币吗？" pBank: >

      有报道称，一些银行在观察到有比特币活动时，就关闭了客户账户。

      用于与 Bisq 进行交易的银行转账的参考文本（有时称为“付款原因”或类似的文本）必须始终只能包含 Bisq 交易 ID ，这是一个随机的字符序列，就像许多其他付款 ID 一样。把其他任何东西作为“付款理由”都被认为违反了交易协议，并将导致纠纷。

      为了避免出现问题，我们建议设立一个专门的银行账户来买卖比特币。如果银行冻结了你的账户，你所遇到的问题会比银行冻结你的主要账户要少一些。

      参考文本（付款理由）中除了 Bisq 交易 ID 外，不要提及任何其他内容。

      diff --git a/_layouts/page_faq.html b/_layouts/page_faq.html index 9ede05d1..a37d6446 100644 --- a/_layouts/page_faq.html +++ b/_layouts/page_faq.html @@ -92,15 +92,6 @@
      -
      {{ item.hEditOffer }}
      -
      -
      - {{ item.pEditOffer }} -
      -
      -
      -
      {{ item.hBank }}
      From fc51edd949d3c67afbcd89e6d6b7205d1779c521 Mon Sep 17 00:00:00 2001 From: m52go Date: Wed, 12 Aug 2020 15:18:10 -0400 Subject: [PATCH 7/8] Update faq, part ii Next 3 sections: dispute resolution, dao, and miscellaneous. --- _data/en.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/_data/en.yml b/_data/en.yml index d45dcf92..964572cd 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -296,10 +296,10 @@ faq: hDisputeRsolution: Dispute Resolution hArbitrationProcess: "How does dispute resolution work?" pArbitrationProcess: > -

      Bisq provides a 3-layer mechanism for resolving disputes: trader chat, mediation, and arbitration.

      Trader chat enables traders to resolve small issues themselves privately over end-to-end encrypted chat right in Bisq. If this doesn't work, traders can engage a mediator to examine the situation and suggest a payout. In rare circumstances that mediation fails, a trader can choose to engage an arbitrator to re-examine the situation and make a payout.

      Please note that the scope of the arbitrator role changed significantly with the launch of the new trade protocol on v1.2.

      See documentation for more details on how this process works.

      +

      Bisq provides a 3-layer mechanism for resolving disputes: trader chat, mediation, and arbitration.

      Trader chat enables traders to resolve small issues themselves privately over end-to-end encrypted chat right in Bisq. If this doesn't work, traders can engage a mediator to examine the situation and suggest a payout. In rare circumstances that mediation fails, a trader can choose to engage an arbitrator to re-examine the situation and make a payout.

      Veteran users: please note that the arbitrator role changed significantly with the launch of the new trade protocol on v1.2.

      See documentation for more details on how this process works.

      hCollusion: "How is collusion between mediators, arbitrators, and traders prevented?" pCollusion: > -

      With the launch of the new trading protocol in v1.2, arbitrators no longer have a key in the multisig escrow. This means that traders retain absolute control of their funds, and there is no possibility of collusion.

      Mediators and arbitrators are still bonded roles, however, because even though they cannot sign a payout transaction to resolve a dispute, they can advise how to resolve a dispute, and it's important that they are responsible and fair when doing so.

      +

      With the launch of the new trading protocol in v1.2, multisig escrows went from 2-of-3 to 2-of-2 arrangements, so that only the two trading peers have control of trading funds (instead of the 2 trading peers and an arbitrator). With no keys in the multisig escrow, it is no longer possible for a mediator or abitrator to collude with another trader to release funds maliciously.

      Mediators and arbitrators are still bonded roles, however, because even though they cannot sign a payout transaction to resolve a dispute, they can advise how to resolve a dispute, and it's important that they be responsive, responsible, and fair when doing so.

      hChargeback: "What happens if the person buying bitcoin does a chargeback after the bitcoin has been released from the multisig address?" pChargeback: >

      Bisq only supports payment methods for which chargebacks are not easy (e.g., this is why PayPal and credit cards are not supported). But there is still a little chargeback risk with banks. If a bank executes a chargeback after the BTC has been released, there is nothing a mediator or arbitrator can do.

      Bisq's goal is to make this scenario as unattractive as possible, using three primary mechanisms:

        @@ -318,7 +318,7 @@ faq: hBisqDAO: The Bisq DAO hBisqDaoWhat: "What is the Bisq DAO?" pBisqDaoWhat: > -

        The Bisq DAO (decentralized autonomous organization) is a decentralized governance mechanism for the Bisq software. It takes the place of a company. How good can decentralized software possibly be if it's still controlled by a single entity, like a company?

        Decentralized software is no good without decentralized governance.

        That's why Bisq is not a company or legal entity of any kind—instead, it's organized as a DAO. The DAO handles the software's funding and strategy-making to enable the Bisq network to thrive, and at the same time, harden it against attacks on the infrastructure that powers its leadership and operation.

        In a nutshell, the Bisq DAO enables Bisq to become even more censorship-resistant, a core principle of the project from the very beginning.

        Read more about the Bisq DAO in this introductory doc.

        +

        The Bisq DAO (decentralized autonomous organization) is a decentralized governance mechanism for the Bisq software, built on Bitcoin. It takes the place of a company. How good can decentralized software possibly be if it's still controlled by a single entity, like a company?

        Decentralized software is no good without decentralized governance.

        That's why Bisq is not a company or legal entity of any kind—instead, it's organized as a DAO. The DAO handles the software's funding and strategy-making to enable the Bisq network to thrive, and at the same time, harden it against attacks on the infrastructure that powers its leadership and operation.

        In a nutshell, the Bisq DAO enables Bisq to become even more censorship-resistant, a core principle of the project from the very beginning.

        Read more about the Bisq DAO in this introductory doc.

        hBisqDaoHow: "How does the Bisq DAO work?" pBisqDaoHow: >

        The primary purposes of the Bisq DAO are financing the project and determining strategy.

          @@ -327,7 +327,7 @@ faq:

        Learn more about how this actually works in this series of short 3-5 minute videos.

        hNeedToKnow: "What do I need to know about the DAO, as a trader?" pNeedToKnow: > -

        Since the Bisq DAO is a governance mechanism, it doesn't affect the day-to-day usage of the software very much.

        One thing you should be aware of is what the BSQ token actually does. Practically speaking, you'll pay lower trading fees by using BSQ instead of BTC.

        But why have the BSQ token at all? Because it enables Bisq contributors to be paid for their work without any central wallets or points of control. When you buy BSQ, you're directly paying a Bisq contributor for their work, and in the process, helping to sustain the whole project. The dynamic this token enables is not possible with plain bitcoin.

        When you use BSQ to pay trading fees, it's destroyed and 'burned' out of existence.

        See more about how this process works in this doc or in this video series.

        +

        Since the Bisq DAO is a governance mechanism, it doesn't affect the day-to-day usage of the software very much.

        One thing you should be aware of is what the BSQ token actually does. Practically speaking, you'll pay lower trading fees by using BSQ instead of BTC.

        But why have the BSQ token at all? Because it enables Bisq contributors to be paid for their work without any central wallets or points of control. When you buy BSQ, you're directly paying a Bisq contributor for their work, and in the process, helping to sustain the whole project. The dynamic this token enables is not possible with plain bitcoin.

        When you use BSQ to pay trading fees, it's destroyed and 'burned' out of existence.

        See more about how this process works in this doc or in this video series.

        hUseBSQ: "Can I use Bisq without BSQ and without this DAO?" pUseBSQ: >

        You could. All you'd have to do is pay your trading fees with BTC instead of BSQ. But we hope you don't, because doing so would render the project unsustainable.

        Before the Bisq DAO, trading fees went to just a couple of wallets owned by specific Bisq contributors (arbitrators). All other contributors were not paid. Bisq needs its contributors to be paid in regular, predictable ways to ensure continual (and reliable) development, service, and growth; the Bisq DAO enables this to happen by distributing trading fees to all contributors in a totally decentralized way.

        The Bisq DAO and BSQ token enable a funding and governance mechanism that is not possible with plain bitcoin. We highly recommend you check our documentation and video series to learn more.

        @@ -337,26 +337,22 @@ faq: hMiscellaneous: Miscellaneous hNoBitcoins: "If I don’t have any bitcoin, how can I obtain some to pay the security deposit and mining fees for my first trade?" pNoBitcoins: > -

        Bitcoin security deposits are necessary to protect Bisq traders from fraud and abuse.

        Security deposits are set to be a percentage of the trade amount—2% by default—but they can be adjusted by the offer maker.

        - -

        We realize this requirement may be a barrier for bitcoin beginners, but there are plenty of ways to get your first bitcoin: friends and family, Bitcoin meetups, Bitcoin ATMs, vouchers, work for it, etc.

        - hPaymentSupport: "Does Bisq support ‘XYZ’ payments?" +

        Bitcoin security deposits are necessary to protect Bisq traders from fraud and abuse.

        Security deposits are set to be a percentage of the trade amount—actual percent varies by BTC price volatility, but minimum is 0.006 BTC—but the percent can be adjusted by the offer maker to be as low as 15% or as high as 50%.

        The security deposit percentage set by the offer maker applies to both the buyer and the seller.

        +

        We realize this requirement may be a barrier for bitcoin beginners, and have listed some ideas on how to get your first bitcoin on the wiki.

        + hPaymentSupport: "Can Bisq support XYZ payment method?" pPaymentSupport: > -

        Bisq already supports a wide range of payment methods for national currencies, but new ones may be added as long as:

          +

          Bisq already supports a wide range of payment methods for national currencies, but the two major requirements for new ones are:

          • chargebacks are unlikely
          • mediators and arbitrators can view evidence of the transaction
            • -

          National bank transfers are supported in every country.

          You can suggest a new payment method on the forum, Keybase, or GitHub.

          +

        National bank transfers are supported in every country.

        You can suggest a new payment method in the growth repository on GitHub.

        hSoftwareBugs: "What happens in case of software bugs?" pSoftwareBugs: > -

        If the Bisq application recognizes that you're having a software problem, it will display a “support ticket” button. Your arbitrator will forward your bug report to the developers, who will begin an investigation of the problem. You may be asked - for the log file to assist in the process. -

        If the button does not appear, you can open a support ticket by hitting Cmd+o (or Ctrl+o, depending on your system) when the trade is selected in the Portfolio > Open Trades list.

        - hMultisg: "What is a Bitcoin ‘multisignature address’?" +

        If you encounter a bug during a trade, try opening a dispute with a mediator. If that isn't possible, you can reach out in the #support channel on Keybase. + hMultisg: "What is a Bitcoin multisignature address?" pMultisig: >

        "Multisig", as it's called, is built into Bitcoin as a simple version of a smart contract. A multisig address is generated with multiple public keys and a specification of how many of those keys must sign to release funds.

        Bisq uses 2-of-2 multisig addresses. This means two public keys are used to create the payment address (those of both traders), and any transactions from the address must be signed by both parties (e.g, for trading funds to be released).

        In case of a dispute, mediators and/or arbitrators examine the situation and suggest payouts both traders can approve. See this wiki article for more on how Bisq handles disputes.

        hOtherQuestions: "I have a question that isn’t covered here…?" - pOtherQuestions: "

        Please post your question on the Bisq forum or Keybase.

        " - + pOtherQuestions: "

        Feel free to reach out on Keybase or any other channel.

        " markets: buy: Buy BTC Offers From 45e5267a5f4d654b99c7d4c25a435711db5eaf59 Mon Sep 17 00:00:00 2001 From: m52go Date: Thu, 27 Aug 2020 08:17:41 -0400 Subject: [PATCH 8/8] Integrate advice from bayernator --- _data/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/en.yml b/_data/en.yml index 964572cd..c3097b3a 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -331,7 +331,7 @@ faq: hUseBSQ: "Can I use Bisq without BSQ and without this DAO?" pUseBSQ: >

        You could. All you'd have to do is pay your trading fees with BTC instead of BSQ. But we hope you don't, because doing so would render the project unsustainable.

        Before the Bisq DAO, trading fees went to just a couple of wallets owned by specific Bisq contributors (arbitrators). All other contributors were not paid. Bisq needs its contributors to be paid in regular, predictable ways to ensure continual (and reliable) development, service, and growth; the Bisq DAO enables this to happen by distributing trading fees to all contributors in a totally decentralized way.

        The Bisq DAO and BSQ token enable a funding and governance mechanism that is not possible with plain bitcoin. We highly recommend you check our documentation and video series to learn more.

        - hBisqToken: "Is Bisq doing a token because it needs money? What's the issuance schedule for the token?" + hBisqToken: "Is Bisq using a token because it needs money? What's the issuance schedule for the token?" pBisqToken: >

        Bisq already earns revenue from trading fees. It's not launching this DAO and BSQ token for earning revenue—it's doing it to distribute the revenue it already earns to more people without any central points of control.

        BSQ tokens are issued every time a contributor's compensation request is approved through voting, and the tokens are destroyed every time a trader uses BSQ to pay trading fees.

        BSQ issuance is not a 1-time event, and its purpose is not to raise capital. You can see a walk-through of the BSQ issuance process in this video series.

        hMiscellaneous: Miscellaneous @@ -348,7 +348,7 @@ faq: hSoftwareBugs: "What happens in case of software bugs?" pSoftwareBugs: >

        If you encounter a bug during a trade, try opening a dispute with a mediator. If that isn't possible, you can reach out in the #support channel on Keybase. - hMultisg: "What is a Bitcoin multisignature address?" + hMultisg: "What is a multisignature address?" pMultisig: >

        "Multisig", as it's called, is built into Bitcoin as a simple version of a smart contract. A multisig address is generated with multiple public keys and a specification of how many of those keys must sign to release funds.

        Bisq uses 2-of-2 multisig addresses. This means two public keys are used to create the payment address (those of both traders), and any transactions from the address must be signed by both parties (e.g, for trading funds to be released).

        In case of a dispute, mediators and/or arbitrators examine the situation and suggest payouts both traders can approve. See this wiki article for more on how Bisq handles disputes.

        hOtherQuestions: "I have a question that isn’t covered here…?"