Merge branch 'master' into update-social-links

bisq-network · Sep 11, 2020 · f75e91f · f75e91f
2 parents d9f5c62 + 0a8933c
commit f75e91f
Show file tree

Hide file tree

Showing 37 changed files with 188 additions and 359 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Please submit proposed changes as pull requests, ideally with commit messages th
 
 ---
 
-**NOTE**
+**NOTE ON COMPENSATION**
 
 If you're expecting compensation from the Bisq DAO for your work, please make sure you've corresponded with the repo's maintainer to ensure the work you plan to do is currently prioritized and budgeted.
 
@@ -18,6 +18,16 @@ See further details on the [this wiki page](https://bisq.wiki/Growth_Team#Proces
 
 ---
 
+**NOTE ON TRANSLATIONS**
+
+All translations work, for the website and otherwise, takes place on [Transifex](https://www.transifex.com/bisq/). Please do not make pull requests for non-English text changes in this repository!
+
+If you'd like to propose adding a new language to the website, please get in touch in the #transifex channel [on Keybase](https://keybase.io/team/bisq) or open an issue in this repository.
+
+See further details on the [this wiki page](https://bisq.wiki/Translation).
+
+---
+
 A pull requests should generally have a singular, well-defined purpose. For example, a pull request to add a blog post should just add a blog post, not add a blog post _and_ change spacing/indentation on some other page.
 
 You should fork this repository, create a new branch, and make all your changes there. Please don't commit your changes to the `master` branch.

diff --git a/_data/de.yml b/_data/de.yml
@@ -16,6 +16,7 @@ footer:
   ulResources: Ressourcen
   liDownloads: Downloads
   liRoadmap: Roadmap
+  liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Mitarbeiten
   liMarketData: Marktdaten API
   joinBisq: Treten Sie der Community bei
@@ -326,7 +327,7 @@ stats:
   pTotalDate: Während des letzten Monats
   pDailyAverageTrade: Täglich durchschnittliche Trades
   pSoftwareDownloads: Software Downloads
-  pSoftwareDownloadsVersion: Für v1.3.4 (voraussichtlich)
+  pSoftwareDownloadsVersion: Für v1.3.7 (voraussichtlich)
   pGithubContributors: GitHub Mitarbeiter
   pToDate: Bis Ende letzten Monats
   pTwitterFollowers: Twitter Follower

diff --git a/_data/en.yml b/_data/en.yml
@@ -16,6 +16,7 @@ footer:
   ulResources: Resources
   liDownloads: Downloads
   liRoadmap: Roadmap
+  liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Contribute
   liMarketData: Market Data API
   joinBisq: Join the Community
@@ -362,7 +363,7 @@ stats:
   pTotalDate: Through last month
   pDailyAverageTrade: Daily Average Trades
   pSoftwareDownloads: Software Downloads
-  pSoftwareDownloadsVersion: For v1.3.4 (approximate)
+  pSoftwareDownloadsVersion: For v1.3.7 (approximate)
   pGithubContributors: GitHub Contributors
   pToDate: As of last month
   pTwitterFollowers: Twitter Followers

diff --git a/_data/es.yml b/_data/es.yml
@@ -16,6 +16,7 @@ footer:
   ulResources: Recursos
   liDownloads: Descargas
   liRoadmap: Hoja de ruta
+  liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Contribuir
   liMarketData: API de datos de mercado
   joinBisq: Unirse a la comunidad
@@ -377,7 +378,7 @@ stats:
   pTotalDate: Durante el mes pasado
   pDailyAverageTrade: Promedio diario de operaciones
   pSoftwareDownloads: Las descargas de software fueron
-  pSoftwareDownloadsVersion: "Para la versión v1.3.4 (aproximado)"
+  pSoftwareDownloadsVersion: "Para la versión v1.3.7 (aproximado)"
   pGithubContributors: Contribuyentes de GitHub
   pToDate: Hasta el mes pasado
   pTwitterFollowers: Seguidores de Twitter

diff --git a/_data/fr.yml b/_data/fr.yml
@@ -16,6 +16,7 @@ footer:
   ulResources: Ressources
   liDownloads: Téléchargements
   liRoadmap: Feuille de route
+  liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Contribuer
   liMarketData: API pour les données du marché
   joinBisq: Rejoignez la communauté
@@ -344,7 +345,7 @@ stats:
   pTotalDate: Au cours du mois dernier
   pDailyAverageTrade: Moyenne journalière des transactions
   pSoftwareDownloads: Téléchargements du logiciel
-  pSoftwareDownloadsVersion: For v1.3.4 (approximation)
+  pSoftwareDownloadsVersion: For v1.3.7 (approximation)
   pGithubContributors: Contributeurs GitHub
   pToDate: Depuis le mois dernier
   pTwitterFollowers: Followers sur Twitter

diff --git a/_data/ja.yml b/_data/ja.yml
@@ -16,6 +16,7 @@ footer:
   ulResources: リソース
   liDownloads: ダウンロード
   liRoadmap: ロードマップ
+  liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: 貢献
   liMarketData: 市場データAPI
   joinBisq: コミュニティに参加
@@ -340,7 +341,7 @@ stats:
   pTotalDate: 先月まで
   pDailyAverageTrade: 日々の平均トレード
   pSoftwareDownloads: ソフトウェアダウンロード
-  pSoftwareDownloadsVersion: v1.3.4（概算）の場合
+  pSoftwareDownloadsVersion: v1.3.7（概算）の場合
   pGithubContributors: GitHub 貢献者
   pToDate: 先月より
   pTwitterFollowers: Twitterフォロワー

diff --git a/_data/languages.yml b/_data/languages.yml
@@ -58,6 +58,6 @@
   tag: "ru"
   enabled: Yes
   accept_languages: ["ru"]
-  site_name: "Update this before merging"
-  site_desc: "Update this before merging"
+  site_name: "Bisq - децентрадизированная сеть обмена биткойном."
+  site_desc: "Bisq является открытым компьютерным программным обеспечением для купли и продажи биткойна за фиативные валюты или альтернативные криптовалюты."
   telegram_link: https://t.me/bisq_p2p
diff --git a/_data/pt-BR.yml b/_data/pt-BR.yml
@@ -16,6 +16,7 @@ footer:
   ulResources: Recursos
   liDownloads: Downloads
   liRoadmap: Plano
+  liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Contribuir
   liMarketData: API de dados de mercado
   joinBisq: Junte-se à Comunidade
@@ -324,7 +325,7 @@ stats:
   pTotalDate: Até o fim do mês passado
   pDailyAverageTrade: Média diária de negociações
   pSoftwareDownloads: Downloads do software
-  pSoftwareDownloadsVersion: "Para v1.3.4 (aproximadamente)"
+  pSoftwareDownloadsVersion: "Para v1.3.7 (aproximadamente)"
   pGithubContributors: Contribuidores no GitHub
   pToDate: No mês passado
   pTwitterFollowers: Seguidores no Twitter

diff --git a/_data/pt-PT.yml b/_data/pt-PT.yml
@@ -16,6 +16,7 @@ footer:
   ulResources: Recursos
   liDownloads: Downloads
   liRoadmap: Roadmap
+  liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Contribuir
   liMarketData: API de Informação de Mercado
   joinBisq: Junte-se à Comunidade
@@ -326,7 +327,7 @@ stats:
   pTotalDate: Durante o mês passado
   pDailyAverageTrade: Média de negócios por dia
   pSoftwareDownloads: Downloads do Software
-  pSoftwareDownloadsVersion: Para v1.3.4 (aproximativa)
+  pSoftwareDownloadsVersion: Para v1.3.7 (aproximativa)
   pGithubContributors: Contribuintes no GitHub
   pToDate: Até o mês passado
   pTwitterFollowers: Seguidores no Twitter

diff --git a/_data/ru.yml b/_data/ru.yml
@@ -16,6 +16,7 @@ footer:
   ulResources: Ресурсы
   liDownloads: Загрузить
   liRoadmap: Дорожная карта
+  liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Стать участником проекта
   liMarketData: API для доступа к рыночным данным
   joinBisq: Присоединяйтесь к сообществу
@@ -324,7 +325,7 @@ stats:
   pTotalDate: с прошлого месяца
   pDailyAverageTrade: Среднее кол-во сделок в день
   pSoftwareDownloads: Загрузок программы
-  pSoftwareDownloadsVersion: версии v1.3.4 (приблизительно)
+  pSoftwareDownloadsVersion: версии v1.3.7 (приблизительно)
   pGithubContributors: Участников проекта на GitHub
   pToDate: в прошлом месяце
   pTwitterFollowers: Читателей в Twitter

diff --git a/_data/zh-CN.yml b/_data/zh-CN.yml
@@ -16,6 +16,7 @@ footer:
   ulResources: 资料
   liDownloads: 下载
   liRoadmap: 计划
+  liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: 贡献
   liMarketData: 市场数据 API
   joinBisq: 加入社区
@@ -325,7 +326,7 @@ stats:
   pTotalDate: 上月数据
   pDailyAverageTrade: 每日交易数
   pSoftwareDownloads: 软件下载数
-  pSoftwareDownloadsVersion: 在 v1.3.4（近似数）
+  pSoftwareDownloadsVersion: 在 v1.3.7（近似数）
   pGithubContributors: GitHub 贡献者
   pToDate: 截止上月
   pTwitterFollowers: Twitter 粉丝数

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -36,15 +36,15 @@ <h5 class="text-uppercase small grey">{{ item.ulResources }}</h5>
                   <a href="{% lingual_link vision %}">Vision</a>
                 </li>
                 <li>
-                  <a href="https://github.com/orgs/bisq-network/projects/3" target="_blank">Roadmap</a>
+                  <a href="https://github.com/orgs/bisq-network/projects/3" target="_blank">{{ item.liRoadmap }}</a>
                 </li>
               </div>
               <div class="virtual-column">
                 <li>
                   <a href="https://docs.bisq.network/contributor-checklist.html" target="_blank" rel="noopener">{{ item.liContribute }}</a>
                 </li>
                 <li>
-                  <a href="/benefactors">Benefactors</a>
+                  <a href="/benefactors">{{ item.liBenefactors }}</a>
                 </li>
               </div>
               <div class="virtual-column">

diff --git a/_includes/main_nav.html b/_includes/main_nav.html
@@ -52,9 +52,6 @@
 
       <!-- additional links for mobile menu (these show in "learn more" dropdown on desktop) -->
 
-      <li class="downloads-mobile nav-item">
-        <a class="nav-link" href="{% lingual_link community %}">{{ mainNavLabels.community }}</a>
-      </li>
       <li class="downloads-mobile nav-item">
         <a class="nav-link" href="/blog">{{ mainNavLabels.blog }}</a>
       </li>
@@ -83,12 +80,6 @@
               <a href="/blog/">{{ mainNavLabels.blog }}</a>
             </div>
           </div>
-
-          <div class="dropdown-item btn-icon">
-            <div class="float-right">
-              <a href="{% lingual_link community %}">{{ mainNavLabels.community }}</a>
-            </div>
-          </div>
         </div>
       </li>
 

diff --git a/_layouts/page_home.html b/_layouts/page_home.html
@@ -254,7 +254,7 @@ <h2>{{ item.hGetStarted }}</h2>
 
 <div class="grey-back" style="margin-bottom:0">
   <div class="row-block container">
-    <h2 id="join-the-community">{{ item.hJoin }}</h2>
+    <h2 id="community">{{ item.hJoin }}</h2>
 
     <div class="row">
 

diff --git a/_layouts/page_stats.html b/_layouts/page_stats.html
@@ -30,37 +30,37 @@ <h1>{{ item.hNetworkStats }}</h1>
 
 <div class='plain-stat-container'>
   <p class='stat-label'>{{item.pTotalTrades}}</p>
-  <p class='stat-figure'>68,161</p>
+  <p class='stat-figure'>71,333</p>
   <p class='stat-note'>{{item.pTotalDate}}</p>
 </div>
 
 <div class='plain-stat-container'>
   <p class='stat-label'>{{item.pDailyAverageTrade}}</p>
-  <p class='stat-figure'>101</p>
+  <p class='stat-figure'>99</p>
   <p class='stat-note'>{{item.pTotalDate}}</p>
 </div>
 
 <div class='plain-stat-container'>
   <p class='stat-label'>{{item.pSoftwareDownloads}}</p>
-  <p class='stat-figure'>18,292</p> <!--10469+3669+343+3811=18292-->
+  <p class='stat-figure'>10,007</p> <!--2406+155+5767+1679=10007-->
   <p class='stat-note'>{{item.pSoftwareDownloadsVersion}}</p>
 </div>
 
 <div class='plain-stat-container'>
   <p class='stat-label'>{{item.pGithubContributors}}</p>
-  <p class='stat-figure'>223</p>
+  <p class='stat-figure'>224</p>
   <p class='stat-note'>{{item.pToDate}}</p>
 </div>
 
 <div class='plain-stat-container'>
   <p class='stat-label'>{{item.pTwitterFollowers}}</p>
-  <p class='stat-figure'>21,540</p>
+  <p class='stat-figure'>21,865</p>
   <p class='stat-note'>{{item.pToDate}}</p>
 </div>
 
 <div class='plain-stat-container'>
   <p class='stat-label'>{{item.pKeybaseUsers}}</p>
-  <p class='stat-figure'>1,120</p>
+  <p class='stat-figure'>1,170</p>
   <p class='stat-note'>{{item.pToDate}}</p>
 </div>