Merge branch 'master' into master

.gitignore

@@ -4,4 +4,6 @@ html/*.html
 html/graphics/*.html
 _site
 .sass-cache
-_config.yml
+_config.yml
+.tx/
+tx.py

404.html

@@ -1,5 +1,6 @@
 ---
 layout: base
+title: title.404
 ---
 
 {% include 404/menu.html %}

Gemfile.lock

@@ -10,13 +10,13 @@ GEM
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.6)
     eventmachine (1.2.6-x64-mingw32)
-    ffi (1.9.23)
-    ffi (1.9.23-x64-mingw32)
+    ffi (1.9.24)
+    ffi (1.9.24-x64-mingw32)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.1)
+    jekyll (3.8.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -69,4 +69,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

Makefile

@@ -3,7 +3,7 @@
 # goal of this makefile is to avoid needing to install a ruby toolchain for
 # casual contributors.
 
-PROJECT ?= 
+PROJECT ?=
 PORT ?= 8080
 APP_ENV=dev
 
@@ -28,4 +28,4 @@ run: container
 	docker run -it -p $(PORT):80 $(PROJECT)bitcoincashorg:latest
 
 serve: _config.yml
-	bundler exec jekyll serve &
+	bundle exec jekyll serve &

_config-dev.yml

@@ -41,11 +41,34 @@ exclude:
   - 'Gemfile.lock'
   - 'Makefile'
   - 'Rakefile'
-  - COPYING
+  - 'COPYING'
+  - 'Dockerfile'
+  - 'docker-compose.yml'
 
 languages:
   - en
+  # - cs
+  # # - de-ch
+  # - de
+  # # - el
+  # - es
+  # - fr
+  # - hi
+  # - id
+  # - it
+  # - ja
   - ko
+  # - ms
+  # - nl
+  # - pl
+  # - pt-BR
+  # - pt-PT
+  # - ru
+  # - sk
+  # - tr
+  # - vi
+  - zh-CN
+  # - zh-TW
 
 exclude_from_localizations: ["js", "assets", "css", "img", "fonts", "media-kit"]
 

_config-prod.yml

@@ -41,32 +41,23 @@ exclude:
   - 'Gemfile.lock'
   - 'Makefile'
   - 'Rakefile'
-  - COPYING
+  - 'COPYING'
+  - 'Dockerfile'
+  - 'docker-compose.yml'
 
 languages:
   - en
-  - cs
-  # - de-ch
-  - de
-  # - el
-  - es
+  - zh-CN
+  - zh-TW
   - fr
-  - hi
-  - id
-  - it
+  - de
   - ja
   - ko
-  - ms
-  - nl
-  - pl
   - pt-BR
-  - pt-PT
   - ru
-  - sk
+  - es
   - tr
-  - vi
-  - zh-CN
-  - zh-TW
+  - id
 
 exclude_from_localizations: ["js", "assets", "css", "img", "fonts", "media-kit"]
 

_data/languages.yml

@@ -1,23 +1,23 @@
-'cs': 'Čeština'
+# 'cs': 'Čeština'
 # 'de-ch': 'Deutsch Schweiz'
 'de': 'Deutsch Deutschland'
 # 'el': 'ελληνικά'
 'en': 'English'
 'es': 'Español'
 'fr': 'Français'
-'hi': 'हिन्दी'
+# 'hi': 'हिन्दी'
 'id': 'Bahasa Indonesia'
-'it': 'Italiano'
+# 'it': 'Italiano'
 'ja': '日本語'
 'ko': '한국어'
-'ms': 'Bahasa Melayu'
-'nl': 'Nederlands'
-'pl': 'Język Polski'
+# 'ms': 'Bahasa Melayu'
+# 'nl': 'Nederlands'
+# 'pl': 'Język Polski'
 'pt-BR': 'Português Brasil'
-'pt-PT': 'Português Portugal'
+# 'pt-PT': 'Português Portugal'
 'ru': 'Русский'
-'sk': 'Slovenčina'
+# 'sk': 'Slovenčina'
 'tr': 'Türkçe'
-'vi': 'Tiếng Việt'
+# 'vi': 'Tiếng Việt'
 'zh-CN': '简体中文'
 'zh-TW': '繁體中文'