Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CHANGELOG.md
#	source/layouts/layout.html.haml

Author: roalz

Diff for: .editorconfig

@@ -11,6 +11,7 @@ root = true
 # use the same settings everywhere
 [*]
 end_of_line = lf
+charset = utf-8
 insert_final_newline = true
 indent_style = space
 indent_size = 2

Diff for: .gitignore

@@ -3,3 +3,4 @@
 /.cache
 /.sass-cache
 /build
+/_site

Diff for: .ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

Diff for: CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log
 All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) 
+and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
 - zh-CN and zh-TW translations from @tianshuo.
 - de translation from @mpbzh.
 - it-IT translation from @roalz.
+- sv translation from @magol.
+- tr-TR translation from @karalamalar.
+
+### Changed
+- Start versioning based on the current English version at 0.3.0 to help
+translation authors keep things up-to-date.
 
 ## [0.3.0] - 2015-12-03
 ### Added

Diff for: CONTRIBUTING.md

@@ -1,7 +1 @@
-Hi there,
-
-Please open a pull request with any suggestions you have.
-
-Edit files in [`source/`](source/). Each sub-directory is a different language translation of [`source/index.haml`](source/index.haml).
-
-You will need a maintainer to run `rake publish` for you once changes are merged in in order to update keepachangelog.com.
+See [README](README.md#development).

Diff for: Gemfile

@@ -1,12 +1,12 @@
 source "https://rubygems.org"
 
 gem "addressable"
-gem "middleman", "~>3.4.0"
+gem "middleman", "~> 4.1.0"
 gem "middleman-autoprefixer"
 gem "middleman-blog"
 gem "middleman-livereload"
 gem "middleman-minify-html"
 gem "middleman-syntax"
-gem 'middleman-gh-pages'
-
+gem "middleman-gh-pages"
 gem "redcarpet"
+gem "pry"

Diff for: Gemfile.lock

@@ -1,165 +1,149 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    autoprefixer-rails (6.0.3)
+    addressable (2.4.0)
+    autoprefixer-rails (6.4.0.1)
       execjs
-      json
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    chunky_png (1.3.4)
+    backports (3.6.8)
+    coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    compass (1.0.3)
-      chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
-      compass-import-once (~> 1.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
-      multi_json (~> 1.0)
-      sass (>= 3.3.0, < 3.5)
+    coffee-script-source (1.10.0)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
+    concurrent-ruby (1.0.2)
+    contracts (0.13.0)
+    dotenv (2.1.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.0.8)
-    execjs (2.6.0)
-    ffi (1.9.10)
+    eventmachine (1.2.0.1)
+    execjs (2.7.0)
+    fast_blank (1.0.0)
+    fastimage (2.0.0)
+      addressable (~> 2)
+    ffi (1.9.14)
     haml (4.0.7)
       tilt
-    hike (1.2.3)
-    hooks (0.4.1)
-      uber (~> 0.0.14)
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
+    hashie (3.4.4)
     htmlcompressor (0.2.0)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
     json (1.8.3)
-    kramdown (1.9.0)
-    listen (3.0.3)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    middleman (3.4.0)
+    kramdown (1.11.1)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    memoist (0.14.0)
+    method_source (0.8.2)
+    middleman (4.1.10)
       coffee-script (~> 2.2)
-      compass (>= 1.0.0, < 2.0.0)
       compass-import-once (= 1.0.5)
-      execjs (~> 2.0)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.4.0)
-      middleman-sprockets (>= 3.1.2)
+      middleman-cli (= 4.1.10)
+      middleman-core (= 4.1.10)
       sass (>= 3.4.0, < 4.0)
-      uglifier (~> 2.5)
-    middleman-autoprefixer (2.6.1)
-      autoprefixer-rails (~> 6.0.1)
+    middleman-autoprefixer (2.7.0)
+      autoprefixer-rails (>= 6.3.1, < 7.0.0)
       middleman-core (>= 3.3.3)
-    middleman-blog (3.5.3)
-      addressable (~> 2.3.5)
-      middleman-core (~> 3.2)
+    middleman-blog (4.0.1)
+      addressable (~> 2.3)
+      middleman-core (>= 4.0.0)
       tzinfo (>= 0.3.0)
-    middleman-core (3.4.0)
-      activesupport (~> 4.1)
+    middleman-cli (4.1.10)
+      thor (>= 0.17.0, < 2.0)
+    middleman-core (4.1.10)
+      activesupport (~> 4.2)
+      addressable (~> 2.3)
+      backports (~> 3.6)
       bundler (~> 1.1)
-      capybara (~> 2.4.4)
+      contracts (~> 0.13.0)
+      dotenv
       erubis
-      hooks (~> 0.3)
+      execjs (~> 2.0)
+      fast_blank
+      fastimage (~> 2.0)
+      hamster (~> 3.0)
+      hashie (~> 3.4)
       i18n (~> 0.7.0)
-      listen (~> 3.0.3)
-      padrino-helpers (~> 0.12.3)
+      listen (~> 3.0.0)
+      memoist (~> 0.14)
+      padrino-helpers (~> 0.13.0)
+      parallel
       rack (>= 1.4.5, < 2.0)
-      thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.4.1, < 2.0)
+      sass (>= 3.4)
+      servolux
+      tilt (~> 1.4.1)
+      uglifier (~> 3.0)
     middleman-gh-pages (0.0.3)
       rake (> 0.9.3)
-    middleman-livereload (3.4.3)
+    middleman-livereload (3.4.6)
       em-websocket (~> 0.5.1)
       middleman-core (>= 3.3)
       rack-livereload (~> 0.3.15)
     middleman-minify-html (3.4.1)
       htmlcompressor (~> 0.2.0)
       middleman-core (>= 3.2)
-    middleman-sprockets (3.4.2)
-      middleman-core (>= 3.3)
-      sprockets (~> 2.12.1)
-      sprockets-helpers (~> 1.1.0)
-      sprockets-sass (~> 1.3.0)
-    middleman-syntax (2.0.0)
-      middleman-core (~> 3.2)
-      rouge (~> 1.0)
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
-    minitest (5.8.1)
-    multi_json (1.11.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    padrino-helpers (0.12.5)
+    middleman-syntax (3.0.0)
+      middleman-core (>= 3.2)
+      rouge (~> 2.0)
+    minitest (5.9.0)
+    padrino-helpers (0.13.2)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.5)
-      tilt (~> 1.4.1)
-    padrino-support (0.12.5)
+      padrino-support (= 0.13.2)
+      tilt (>= 1.4.1, < 3)
+    padrino-support (0.13.2)
       activesupport (>= 3.1)
+    parallel (1.9.0)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.6.4)
     rack-livereload (0.3.16)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
     rake (10.4.2)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     redcarpet (3.3.3)
-    rouge (1.10.1)
-    sass (3.4.19)
-    sprockets (2.12.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.1.0)
-      sprockets (~> 2.0)
-    sprockets-sass (1.3.1)
-      sprockets (~> 2.0)
-      tilt (~> 1.1)
+    rouge (2.0.5)
+    sass (3.4.22)
+    servolux (0.12.0)
+    slop (3.6.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uber (0.0.15)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+    uglifier (3.0.1)
+      execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   addressable
-  middleman (~> 3.4.0)
+  middleman (~> 4.1.0)
   middleman-autoprefixer
   middleman-blog
   middleman-gh-pages
   middleman-livereload
   middleman-minify-html
   middleman-syntax
+  pry
   redcarpet
 
 BUNDLED WITH
-   1.10.6
+   1.12.0