diff --git a/_config.yml b/_config.yml
index 0679541d3..6128636ec 100644
--- a/_config.yml
+++ b/_config.yml
@@ -45,7 +45,7 @@ translations:
     feedbackspan: "Apakah bab ini bermanfaat?"
     feedback: "Beritahu kami dan bantu kami memperbaiki panduan!"
     getstarted: "Lanjutkan ke bab berikutnya"
-  jp:
+  ja:
     overview: "概要"
     tagline: "はじめてからのOpenStreetMapガイド"
     contribute: "ガイドの拡充にご協力ください"
diff --git a/_layouts/default.html b/_layouts/default.html
index 22012b1c6..3be6b1f2a 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -39,17 +39,18 @@
     <div class="fillG cell12" id="banner-top">
       <small class='language-switcher marginL cell6 cf'>
         <a lang='en'>English</a> |
-        <a lang='bi'>Bahasa Indonesia</a> |
-        <a lang='jp'>日本語</a> |
-        <a lang='pt'>Português</a> |
-        <a lang='it'>Italiano</a> |
-        <a lang='fr'>Français</a> |
         <a lang='de'>Deutsch</a> |
         <a lang='es'>Español</a> |
+        <a lang='fr'>Français</a> |
         <a lang='hr'>Hrvatski</a> |
-        <a lang='uk'>Українська</a> |
+        <a lang='bi'>Bahasa Indonesia</a> |
+        <a lang='it'>Italiano</a> |
+        <a lang='ja'>日本語</a> |
+        <a lang='no'>Norsk</a> |
+        <a lang='pt'>Português</a> |
         <a lang='ru'>Русский</a> |
-        <a lang='no'>Norsk</a>
+        <a lang='sw'>Kiswahili</a> |
+        <a lang='uk'>Українська</a>
       </small>
       <!-- small search bar does not appear on the front page -->
       {% unless page.fronttitle or page.contributetitle%}
diff --git a/_posts/en/0100-01-01-index.md b/_posts/en/0100-01-01-index.md
index c9670a8c9..be6a2419d 100644
--- a/_posts/en/0100-01-01-index.md
+++ b/_posts/en/0100-01-01-index.md
@@ -8,9 +8,9 @@ ourguides: "Our Guides"
 searchtext: "What are you looking for?"
 begspan: "New to OpenStreetMap?"
 beg: "beginner's guide"
-interspan: "More guides (currently in English)"
-interspanlink: "https://github.com/hotosm/learnosm/wiki/English-Learning-Guides"
-inter: "Intermediate, advanced, QGIS..."
+interspan: "Nepal Disaster"
+interspanlink: "http://learnosm.org/en/coordination/nepal-disaster/"
+inter: "Please click here if you are new to mapping for HOT"
 advspan: "Organizing a workshop?"
 adv: "See our trainer material"
 faq: "Common Questions"
diff --git a/_posts/en/beginner/0200-12-29-start-osm.md b/_posts/en/beginner/0200-12-29-start-osm.md
index 2242abf56..296e1aa61 100644
--- a/_posts/en/beginner/0200-12-29-start-osm.md
+++ b/_posts/en/beginner/0200-12-29-start-osm.md
@@ -193,15 +193,15 @@ Click on the link for further reading on:
 *  [To continue with the Remote, Armchair or Mapathon section of LearnOSM](/en/coordination/remote/)  
 
 
-[website]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image00_website.png
-[OpenStreetMap website with some main functions listed]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image01_osm-website-main-functions.png
-[Mouse navigation]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image02_mouse-navigation.png
-[Search]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image03_search.png
-[Layers button]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image04_layers.png
-[Transport map]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image05_transport-map.png
-[Registering an OpenStreetMap account]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image06_registering-account.png
-[Confirming your OpenStreetMap account]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image07_confirming-account.png
-[Click edit]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image08_click-edit.png
-[iD editor]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image09_id-editor.png
-[Point button]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image10_point-button.png
-[Save button]: /images/en/beginner/02_start-osm/en_beg_02_start-osm_image11_save-button.png
+[website]: /images/beginner/start-osm_website.png
+[OpenStreetMap website with some main functions listed]: /images/beginner/osm-website-main-functions.png
+[Mouse navigation]: /images/beginner/mouse-navigation.png
+[Search]: /images/beginner/search.png
+[Layers button]: /images/beginner/layers.png
+[Transport map]: /images/beginner/transport-map.png
+[Registering an OpenStreetMap account]: /images/beginner/registering-account.png
+[Confirming your OpenStreetMap account]: /images/beginner/confirming-account.png
+[Click edit]: /images/beginner/click-edit.png
+[iD editor]: /images/beginner/id-editor.png
+[Point button]: /images/beginner/point-button.png
+[Save button]: /images/beginner/save-button.png
diff --git a/_posts/en/coordination/0500-10-27-nepal.md b/_posts/en/coordination/0500-10-27-nepal.md
new file mode 100644
index 000000000..93ceee152
--- /dev/null
+++ b/_posts/en/coordination/0500-10-27-nepal.md
@@ -0,0 +1,29 @@
+---
+layout: doc
+title: Nepal Disaster
+permalink: /en/coordination/nepal-disaster
+lang: en
+category: coordination
+---
+
+#Nepal Disaster  
+
+![HotGuideLogo](http://hot.openstreetmap.org/sites/default/themes/hot/logo.png)
+
+Thank you for volunteering to help the Aid Organisations by providing mapping data for them. 
+
+Like you, we are keen to help as quickly as possible, and there is a real sense of urgency in what we do. But, the reason the Aid Organisations depend on us to provide the mapping data is because we take care to make sure that what we produce is useful and meets their needs. We need you to take care too. Although it will delay you starting to update the map we need you to understand what is required of you. Do not rush in and make a mess of it, because it takes us longer to clear up bad work than it does to create it, and it may cause a care worker to have doubts about the dependability of what we produce. 
+
+We are constantly updating our software & training guides, but it does take time. The software in the Tasking Manager will be updated soon so that only qualified people can 'validate', but at the moment we need you to understand that validating should be left for the qualified few - please keep helping and you may become one of our validators in the future. **If you select a square and the screen mentions 'Review the work' then please release the square, because that is something that needs a 'validator'.**
+
+We don't need you to read the whole of this site before you start, but we do need you to understand the basics:  
+
+1.  You need to read the Task Manager Instructions for any project you are trying to help for. They can be different, so make sure you read & understand them. There is a full description of how to use the [Tasking Manager here within LearnOSM](/en/coordination/tasking-manager/), and it includes how to get live help from an experienced mapper.  
+
+2.  Make sure you have zoomed in enough so that you can actually see what you should be tracing - [it and many other things are explained here.](/en/coordination/remote/#initial-view--josm)
+
+3.  Buildings have to be traced, and the shape of the tracing should match the shape of the building. [This section of LearnOSM](/en/coordination/remote-tracing/) explains this, and how to create roads and a road network.
+
+Thank you for reading this, and we hope you'll take the short time needed to make sure you do the important things right. We need all the help we can get, and hope that you can help us with this.
+
+Please remember, that although the earthquake is very recent, the problems will continue for a very long time. People no longer have housing, and are living in shelters at the mercy of more bad weather. Hygiene will become difficult and there is the possibility of disease and other problems related to food and water. Although you may not see the problems mentioned in the news, they will still exist, and the aid workers will need maps that reflect the current situation. Please help us now, but please remember to come back and help us again in the future. 
diff --git a/_posts/jp/0100-01-01-contribute.md b/_posts/ja/0100-01-01-contribute.md
similarity index 94%
rename from _posts/jp/0100-01-01-contribute.md
rename to _posts/ja/0100-01-01-contribute.md
index 361fa2b27..dff0b0464 100644
--- a/_posts/jp/0100-01-01-contribute.md
+++ b/_posts/ja/0100-01-01-contribute.md
@@ -1,7 +1,7 @@
 ---
 layout: contribute
-permalink: /jp/contribute/
-lang: jp
+permalink: /ja/contribute/
+lang: ja
 title: お手伝い
 contributetitle: "このガイドの改善にご協力ください！"
 startwith: "参加方法"
diff --git a/_posts/jp/0100-01-01-index.md b/_posts/ja/0100-01-01-index.md
similarity index 97%
rename from _posts/jp/0100-01-01-index.md
rename to _posts/ja/0100-01-01-index.md
index de9692526..b559b4c01 100644
--- a/_posts/jp/0100-01-01-index.md
+++ b/_posts/ja/0100-01-01-index.md
@@ -1,7 +1,7 @@
 ---
 layout: front
-permalink: /jp/
-lang: jp
+permalink: /ja/
+lang: ja
 fronttitle: "OpenStreetMapは自由な地図であり、地球上のあらゆる地域がストリート単位の精度で描かれています。マッパーと呼ばれる人々が作成し、そのコミュニティはいまも拡大を続けています。"
 frontintro: "OpenStreetMapの編集は誰でも可能です。このサイトでは、OpenStreetMapを利用する・編集するために必要な知識を、ひとつずつわかりやすく解説しています。OpenStreetMapの勉強会を開催する際に使える情報や資料の一覧は LearnOSM講習資料のページを参照してください"
 ourguides: "コンテンツ一覧"
diff --git a/_posts/jp/0100-01-01-status.md b/_posts/ja/0100-01-01-status.md
similarity index 82%
rename from _posts/jp/0100-01-01-status.md
rename to _posts/ja/0100-01-01-status.md
index 8ae308855..d778e405f 100644
--- a/_posts/jp/0100-01-01-status.md
+++ b/_posts/ja/0100-01-01-status.md
@@ -1,7 +1,7 @@
 ---
 layout: default
-permalink: /jp/status/
-lang: jp
+permalink: /ja/status/
+lang: ja
 title: 翻訳進捗状況
 nosearch: true
 ---
diff --git a/_posts/jp/beginner/0200-12-20-beginner-all-chapters.html b/_posts/ja/beginner/0200-12-20-beginner-all-chapters.html
similarity index 85%
rename from _posts/jp/beginner/0200-12-20-beginner-all-chapters.html
rename to _posts/ja/beginner/0200-12-20-beginner-all-chapters.html
index d3dc2adf4..27acfeccf 100644
--- a/_posts/jp/beginner/0200-12-20-beginner-all-chapters.html
+++ b/_posts/ja/beginner/0200-12-20-beginner-all-chapters.html
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: コンテンツを全て表示
-permalink: /jp/beginner/all-chapters/
-lang: jp
+permalink: /ja/beginner/all-chapters/
+lang: ja
 category: beginner
 nosearch: true
 ---
diff --git a/_posts/jp/beginner/0200-12-21-moving-forward.md b/_posts/ja/beginner/0200-12-21-moving-forward.md
similarity index 98%
rename from _posts/jp/beginner/0200-12-21-moving-forward.md
rename to _posts/ja/beginner/0200-12-21-moving-forward.md
index a4257b597..fd9e3f3af 100644
--- a/_posts/jp/beginner/0200-12-21-moving-forward.md
+++ b/_posts/ja/beginner/0200-12-21-moving-forward.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title:  これからの進め方
-permalink: /jp/beginner/moving-forward/
-lang: jp
+permalink: /ja/beginner/moving-forward/
+lang: ja
 category: beginner
 ---
 
diff --git a/_posts/jp/beginner/0200-12-23-editing-with-josm.md b/_posts/ja/beginner/0200-12-23-editing-with-josm.md
similarity index 99%
rename from _posts/jp/beginner/0200-12-23-editing-with-josm.md
rename to _posts/ja/beginner/0200-12-23-editing-with-josm.md
index 99ce6b024..0f416c86a 100644
--- a/_posts/jp/beginner/0200-12-23-editing-with-josm.md
+++ b/_posts/ja/beginner/0200-12-23-editing-with-josm.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: JOSMによるOpenStreetMap編集
-permalink: /jp/beginner/editing-with-josm/
-lang: jp
+permalink: /ja/beginner/editing-with-josm/
+lang: ja
 category: beginner
 ---
 
diff --git a/_posts/jp/beginner/0200-12-24-papers.md b/_posts/ja/beginner/0200-12-24-papers.md
similarity index 99%
rename from _posts/jp/beginner/0200-12-24-papers.md
rename to _posts/ja/beginner/0200-12-24-papers.md
index 4fc0ef362..78e5b685e 100644
--- a/_posts/jp/beginner/0200-12-24-papers.md
+++ b/_posts/ja/beginner/0200-12-24-papers.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Field Papers
-permalink: /jp/beginner/field-papers/
-lang: jp
+permalink: /ja/beginner/field-papers/
+lang: ja
 category: beginner
 ---
 
diff --git a/_posts/jp/beginner/0200-12-26-gps.md b/_posts/ja/beginner/0200-12-26-gps.md
similarity index 99%
rename from _posts/jp/beginner/0200-12-26-gps.md
rename to _posts/ja/beginner/0200-12-26-gps.md
index ac0950c0c..2c257e157 100644
--- a/_posts/jp/beginner/0200-12-26-gps.md
+++ b/_posts/ja/beginner/0200-12-26-gps.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: GPSを使った現地調査
-permalink: /jp/beginner/using-gps/
-lang: jp
+permalink: /ja/beginner/using-gps/
+lang: ja
 category: beginner
 ---
 
diff --git a/_posts/jp/beginner/0200-12-27-more-about-josm.md b/_posts/ja/beginner/0200-12-27-more-about-josm.md
similarity index 99%
rename from _posts/jp/beginner/0200-12-27-more-about-josm.md
rename to _posts/ja/beginner/0200-12-27-more-about-josm.md
index 3e95c3aa7..1bd27de0a 100644
--- a/_posts/jp/beginner/0200-12-27-more-about-josm.md
+++ b/_posts/ja/beginner/0200-12-27-more-about-josm.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: JOSMの操作方法
-permalink: /jp/beginner/more-about-josm/
-lang: jp
+permalink: /ja/beginner/more-about-josm/
+lang: ja
 category: beginner
 ---
 
diff --git a/_posts/jp/beginner/0200-12-28-start-josm.md b/_posts/ja/beginner/0200-12-28-start-josm.md
similarity index 99%
rename from _posts/jp/beginner/0200-12-28-start-josm.md
rename to _posts/ja/beginner/0200-12-28-start-josm.md
index ccfabdc30..102e76fce 100644
--- a/_posts/jp/beginner/0200-12-28-start-josm.md
+++ b/_posts/ja/beginner/0200-12-28-start-josm.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: JOSMの導入
-permalink: /jp/beginner/start-josm/
-lang: jp
+permalink: /ja/beginner/start-josm/
+lang: ja
 category: beginner
 published: true
 ---
diff --git a/_posts/jp/beginner/0200-12-29-start-osm.md b/_posts/ja/beginner/0200-12-29-start-osm.md
similarity index 99%
rename from _posts/jp/beginner/0200-12-29-start-osm.md
rename to _posts/ja/beginner/0200-12-29-start-osm.md
index b717c23c2..5c84b57bb 100644
--- a/_posts/jp/beginner/0200-12-29-start-osm.md
+++ b/_posts/ja/beginner/0200-12-29-start-osm.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: OpenStreetMap.org
-permalink: /jp/beginner/start-osm/
-lang: jp
+permalink: /ja/beginner/start-osm/
+lang: ja
 category: beginner
 ---
 
diff --git a/_posts/jp/beginner/0200-12-30-introduction.md b/_posts/ja/beginner/0200-12-30-introduction.md
similarity index 99%
rename from _posts/jp/beginner/0200-12-30-introduction.md
rename to _posts/ja/beginner/0200-12-30-introduction.md
index 8b10f66d0..31626fd72 100644
--- a/_posts/jp/beginner/0200-12-30-introduction.md
+++ b/_posts/ja/beginner/0200-12-30-introduction.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: OpenStreetMapイントロダクション
-permalink: /jp/beginner/introduction/
-lang: jp
+permalink: /ja/beginner/introduction/
+lang: ja
 category: beginner
 ---
 
diff --git a/_posts/jp/beginner/0200-12-31-beginner.md b/_posts/ja/beginner/0200-12-31-beginner.md
similarity index 90%
rename from _posts/jp/beginner/0200-12-31-beginner.md
rename to _posts/ja/beginner/0200-12-31-beginner.md
index 25841e0d5..11fee7df3 100644
--- a/_posts/jp/beginner/0200-12-31-beginner.md
+++ b/_posts/ja/beginner/0200-12-31-beginner.md
@@ -1,7 +1,7 @@
 ---
 layout: doc
-permalink: /jp/beginner/
-lang: jp
+permalink: /ja/beginner/
+lang: ja
 title: ビギナーズガイド
 category: beginner
 cover: yes
diff --git a/_posts/jp/coordination/0500-10-23-tasking-manager.md b/_posts/ja/coordination/0500-10-23-tasking-manager.md
similarity index 99%
rename from _posts/jp/coordination/0500-10-23-tasking-manager.md
rename to _posts/ja/coordination/0500-10-23-tasking-manager.md
index 3d2131d4c..a66d3fff2 100644
--- a/_posts/jp/coordination/0500-10-23-tasking-manager.md
+++ b/_posts/ja/coordination/0500-10-23-tasking-manager.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Tasking Manager
-permalink: /jp/coordination/tasking-manager/
-lang: jp
+permalink: /ja/coordination/tasking-manager/
+lang: ja
 category: coordination
 ---
 
diff --git a/_posts/jp/coordination/0500-10-29-review.md b/_posts/ja/coordination/0500-10-29-review.md
similarity index 99%
rename from _posts/jp/coordination/0500-10-29-review.md
rename to _posts/ja/coordination/0500-10-29-review.md
index 9dc6680bc..13560d900 100644
--- a/_posts/jp/coordination/0500-10-29-review.md
+++ b/_posts/ja/coordination/0500-10-29-review.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Reviewing OSM Data
-permalink: /jp/coordination/review/
-lang: jp
+permalink: /ja/coordination/review/
+lang: ja
 category: coordination
 ---
 
diff --git a/_posts/jp/coordination/0500-11-16-remote.md b/_posts/ja/coordination/0500-11-16-remote.md
similarity index 99%
rename from _posts/jp/coordination/0500-11-16-remote.md
rename to _posts/ja/coordination/0500-11-16-remote.md
index 3af49de42..8e0fd8d5c 100644
--- a/_posts/jp/coordination/0500-11-16-remote.md
+++ b/_posts/ja/coordination/0500-11-16-remote.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Remote, Armchair or Mapathon editing
-permalink: /jp/coordination/remote/
-lang: jp
+permalink: /ja/coordination/remote/
+lang: ja
 category: coordination
 ---
 
diff --git a/_posts/jp/coordination/0500-12-31-coordination.md b/_posts/ja/coordination/0500-12-31-coordination.md
similarity index 93%
rename from _posts/jp/coordination/0500-12-31-coordination.md
rename to _posts/ja/coordination/0500-12-31-coordination.md
index 4c3a5d46c..2bc418641 100644
--- a/_posts/jp/coordination/0500-12-31-coordination.md
+++ b/_posts/ja/coordination/0500-12-31-coordination.md
@@ -1,7 +1,7 @@
 ---
 layout: doc
-permalink: /jp/coordination/
-lang: jp
+permalink: /ja/coordination/
+lang: ja
 title: 連携作業
 category: coordination
 cover: yes
diff --git a/_posts/jp/coordination/draft0500-11-26-quality-assurance.md b/_posts/ja/coordination/draft0500-11-26-quality-assurance.md
similarity index 99%
rename from _posts/jp/coordination/draft0500-11-26-quality-assurance.md
rename to _posts/ja/coordination/draft0500-11-26-quality-assurance.md
index 351d00a8a..9907a6cae 100644
--- a/_posts/jp/coordination/draft0500-11-26-quality-assurance.md
+++ b/_posts/ja/coordination/draft0500-11-26-quality-assurance.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Quality Assurance
-permalink: /jp/coordination/quality-assurance/
-lang: jp
+permalink: /ja/coordination/quality-assurance/
+lang: ja
 category: coordination
 ---
 
diff --git a/_posts/jp/coordination/draft0500-11-28-editing_the_wiki.md b/_posts/ja/coordination/draft0500-11-28-editing_the_wiki.md
similarity index 99%
rename from _posts/jp/coordination/draft0500-11-28-editing_the_wiki.md
rename to _posts/ja/coordination/draft0500-11-28-editing_the_wiki.md
index 57aed7ad4..74b868da5 100644
--- a/_posts/jp/coordination/draft0500-11-28-editing_the_wiki.md
+++ b/_posts/ja/coordination/draft0500-11-28-editing_the_wiki.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Editing the Wiki
-permalink: /jp/coordination/editing_the_wiki/
-lang: jp
+permalink: /ja/coordination/editing_the_wiki/
+lang: ja
 category: coordination
 ---
 
diff --git a/_posts/jp/editing/0300-10-31-id-editor.md b/_posts/ja/editing/0300-10-31-id-editor.md
similarity index 99%
rename from _posts/jp/editing/0300-10-31-id-editor.md
rename to _posts/ja/editing/0300-10-31-id-editor.md
index db5c5ac47..c4c32e588 100644
--- a/_posts/jp/editing/0300-10-31-id-editor.md
+++ b/_posts/ja/editing/0300-10-31-id-editor.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: iDエディタ
-permalink: /jp/editing/id-editor/
-lang: jp
+permalink: /ja/editing/id-editor/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-11-12-josm-conflict-resolution.md b/_posts/ja/editing/0300-11-12-josm-conflict-resolution.md
similarity index 99%
rename from _posts/jp/editing/0300-11-12-josm-conflict-resolution.md
rename to _posts/ja/editing/0300-11-12-josm-conflict-resolution.md
index ad034409a..481d30923 100644
--- a/_posts/jp/editing/0300-11-12-josm-conflict-resolution.md
+++ b/_posts/ja/editing/0300-11-12-josm-conflict-resolution.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: 競合の解決
-permalink: /jp/editing/conflict-resolution/
-lang: jp
+permalink: /ja/editing/conflict-resolution/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-11-15-correcting-imagery-offset.md b/_posts/ja/editing/0300-11-15-correcting-imagery-offset.md
similarity index 99%
rename from _posts/jp/editing/0300-11-15-correcting-imagery-offset.md
rename to _posts/ja/editing/0300-11-15-correcting-imagery-offset.md
index 321236750..17565cc2f 100644
--- a/_posts/jp/editing/0300-11-15-correcting-imagery-offset.md
+++ b/_posts/ja/editing/0300-11-15-correcting-imagery-offset.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: 画像オフセット調整
-permalink: /jp/editing/correcting-imagery-offset/
-lang: jp
+permalink: /ja/editing/correcting-imagery-offset/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-11-16-aerial-imagery.md b/_posts/ja/editing/0300-11-16-aerial-imagery.md
similarity index 99%
rename from _posts/jp/editing/0300-11-16-aerial-imagery.md
rename to _posts/ja/editing/0300-11-16-aerial-imagery.md
index 9050b31ac..71817eb85 100644
--- a/_posts/jp/editing/0300-11-16-aerial-imagery.md
+++ b/_posts/ja/editing/0300-11-16-aerial-imagery.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: 航空写真・衛星写真
-permalink: /jp/editing/aerial-imagery/
-lang: jp
+permalink: /ja/editing/aerial-imagery/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-11-18-editing-techniques.md b/_posts/ja/editing/0300-11-18-editing-techniques.md
similarity index 98%
rename from _posts/jp/editing/0300-11-18-editing-techniques.md
rename to _posts/ja/editing/0300-11-18-editing-techniques.md
index 5410cc911..f9d955674 100644
--- a/_posts/jp/editing/0300-11-18-editing-techniques.md
+++ b/_posts/ja/editing/0300-11-18-editing-techniques.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: 編集テクニック
-permalink: /jp/editing/josm-editing-techniques/
-lang: jp
+permalink: /ja/editing/josm-editing-techniques/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-11-20-josm-relations.md b/_posts/ja/editing/0300-11-20-josm-relations.md
similarity index 99%
rename from _posts/jp/editing/0300-11-20-josm-relations.md
rename to _posts/ja/editing/0300-11-20-josm-relations.md
index f4c111940..98944948e 100644
--- a/_posts/jp/editing/0300-11-20-josm-relations.md
+++ b/_posts/ja/editing/0300-11-20-josm-relations.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: JOSMでのリレーション操作
-permalink: /jp/editing/josm-relations/
-lang: jp
+permalink: /ja/editing/josm-relations/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-11-26-creating-custom-presets.md b/_posts/ja/editing/0300-11-26-creating-custom-presets.md
similarity index 99%
rename from _posts/jp/editing/0300-11-26-creating-custom-presets.md
rename to _posts/ja/editing/0300-11-26-creating-custom-presets.md
index 581aacbec..cd42bcbcb 100644
--- a/_posts/jp/editing/0300-11-26-creating-custom-presets.md
+++ b/_posts/ja/editing/0300-11-26-creating-custom-presets.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: 独自プリセットの作成
-permalink: /jp/editing/creating-presets/
-lang: jp
+permalink: /ja/editing/creating-presets/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-11-27-josm-presets.md b/_posts/ja/editing/0300-11-27-josm-presets.md
similarity index 98%
rename from _posts/jp/editing/0300-11-27-josm-presets.md
rename to _posts/ja/editing/0300-11-27-josm-presets.md
index 4f91a99e7..623b96f2f 100644
--- a/_posts/jp/editing/0300-11-27-josm-presets.md
+++ b/_posts/ja/editing/0300-11-27-josm-presets.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: JOSMプリセット
-permalink: /jp/editing/josm-presets/
-lang: jp
+permalink: /ja/editing/josm-presets/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-11-28-josm-more-tools.md b/_posts/ja/editing/0300-11-28-josm-more-tools.md
similarity index 99%
rename from _posts/jp/editing/0300-11-28-josm-more-tools.md
rename to _posts/ja/editing/0300-11-28-josm-more-tools.md
index 80bf3eddd..6dc9f8652 100644
--- a/_posts/jp/editing/0300-11-28-josm-more-tools.md
+++ b/_posts/ja/editing/0300-11-28-josm-more-tools.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: その他のツール
-permalink: /jp/editing/more-tools/
-lang: jp
+permalink: /ja/editing/more-tools/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-11-29-josm-plugins.md b/_posts/ja/editing/0300-11-29-josm-plugins.md
similarity index 99%
rename from _posts/jp/editing/0300-11-29-josm-plugins.md
rename to _posts/ja/editing/0300-11-29-josm-plugins.md
index 0fea4b9ee..9f58d7cd6 100644
--- a/_posts/jp/editing/0300-11-29-josm-plugins.md
+++ b/_posts/ja/editing/0300-11-29-josm-plugins.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: JOSMプラグイン
-permalink: /jp/editing/josm-plugins/
-lang: jp
+permalink: /ja/editing/josm-plugins/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-11-30-josm-tools.md b/_posts/ja/editing/0300-11-30-josm-tools.md
similarity index 99%
rename from _posts/jp/editing/0300-11-30-josm-tools.md
rename to _posts/ja/editing/0300-11-30-josm-tools.md
index d61d6e07f..3f7de1f18 100644
--- a/_posts/jp/editing/0300-11-30-josm-tools.md
+++ b/_posts/ja/editing/0300-11-30-josm-tools.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: JOSMツール
-permalink: /jp/editing/josm-tools/
-lang: jp
+permalink: /ja/editing/josm-tools/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/editing/0300-12-31-editing.md b/_posts/ja/editing/0300-12-31-editing.md
similarity index 93%
rename from _posts/jp/editing/0300-12-31-editing.md
rename to _posts/ja/editing/0300-12-31-editing.md
index 60039c2ac..fbb368b7b 100644
--- a/_posts/jp/editing/0300-12-31-editing.md
+++ b/_posts/ja/editing/0300-12-31-editing.md
@@ -1,7 +1,7 @@
 ---
 layout: doc
-permalink: /jp/editing/
-lang: jp
+permalink: /ja/editing/
+lang: ja
 title: 詳しい編集方法
 category: editing
 cover: yes
diff --git a/_posts/jp/editing/draft-0300-11-14-josm-adding-orbview-imagery.md b/_posts/ja/editing/draft-0300-11-14-josm-adding-orbview-imagery.md
similarity index 99%
rename from _posts/jp/editing/draft-0300-11-14-josm-adding-orbview-imagery.md
rename to _posts/ja/editing/draft-0300-11-14-josm-adding-orbview-imagery.md
index 2ee6f9f67..3d4398993 100644
--- a/_posts/jp/editing/draft-0300-11-14-josm-adding-orbview-imagery.md
+++ b/_posts/ja/editing/draft-0300-11-14-josm-adding-orbview-imagery.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Getting Satellite Images into JOSM
-permalink: /jp/editing/adding-orbview-imagery-in-josm/
-lang: jp
+permalink: /ja/editing/adding-orbview-imagery-in-josm/
+lang: ja
 category: editing
 ---
 
diff --git a/_posts/jp/map-design/0700-11-29-tilemill.md b/_posts/ja/map-design/0700-11-29-tilemill.md
similarity index 99%
rename from _posts/jp/map-design/0700-11-29-tilemill.md
rename to _posts/ja/map-design/0700-11-29-tilemill.md
index fcef88378..07652c982 100644
--- a/_posts/jp/map-design/0700-11-29-tilemill.md
+++ b/_posts/ja/map-design/0700-11-29-tilemill.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: TileMillによる地図デザイン
-permalink: /jp/map-design/tilemill/
-lang: jp
+permalink: /ja/map-design/tilemill/
+lang: ja
 category: map-design
 ---
 
diff --git a/_posts/jp/map-design/0700-11-30-mapbox.md b/_posts/ja/map-design/0700-11-30-mapbox.md
similarity index 99%
rename from _posts/jp/map-design/0700-11-30-mapbox.md
rename to _posts/ja/map-design/0700-11-30-mapbox.md
index ec5f78ee9..fef9a7b57 100644
--- a/_posts/jp/map-design/0700-11-30-mapbox.md
+++ b/_posts/ja/map-design/0700-11-30-mapbox.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Mapboxウェブサイトでの地図表示
-permalink: /jp/map-design/mapbox/
-lang: jp
+permalink: /ja/map-design/mapbox/
+lang: ja
 category: map-design
 ---
 
diff --git a/_posts/jp/map-design/0700-12-31-map-design.md b/_posts/ja/map-design/0700-12-31-map-design.md
similarity index 93%
rename from _posts/jp/map-design/0700-12-31-map-design.md
rename to _posts/ja/map-design/0700-12-31-map-design.md
index cd23d6bf8..f69957aa5 100644
--- a/_posts/jp/map-design/0700-12-31-map-design.md
+++ b/_posts/ja/map-design/0700-12-31-map-design.md
@@ -1,7 +1,7 @@
 ---
 layout: doc
-permalink: /jp/map-design/
-lang: jp
+permalink: /ja/map-design/
+lang: ja
 title: 地図デザイン
 category: map-design
 cover: yes
diff --git a/_posts/jp/map-design/draft0700-11-27-wms.md b/_posts/ja/map-design/draft0700-11-27-wms.md
similarity index 99%
rename from _posts/jp/map-design/draft0700-11-27-wms.md
rename to _posts/ja/map-design/draft0700-11-27-wms.md
index f659f3bb4..9c305b044 100644
--- a/_posts/jp/map-design/draft0700-11-27-wms.md
+++ b/_posts/ja/map-design/draft0700-11-27-wms.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: WMS Service Configuration
-permalink: /jp/map-design/wms/
-lang: jp
+permalink: /ja/map-design/wms/
+lang: ja
 category: map-design
 ---
 
diff --git a/_posts/jp/map-design/draft0700-11-28-github.md b/_posts/ja/map-design/draft0700-11-28-github.md
similarity index 99%
rename from _posts/jp/map-design/draft0700-11-28-github.md
rename to _posts/ja/map-design/draft0700-11-28-github.md
index 3bd2984cf..2604280ad 100644
--- a/_posts/jp/map-design/draft0700-11-28-github.md
+++ b/_posts/ja/map-design/draft0700-11-28-github.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Using GitHub
-permalink: /jp/map-design/github/
-lang: jp
+permalink: /ja/map-design/github/
+lang: ja
 category: map-design
 ---
 
@@ -244,4 +244,4 @@ project using github..
 
 [[c]](#cmnt_ref3)Katrina Engelsted:
 Good source: http://nathanj.github.com/gitguide/tour.html
---> 
\ No newline at end of file
+--> 
diff --git a/_posts/jp/mobile-mapping/0900-12-26-gpsessentials.md b/_posts/ja/mobile-mapping/0900-12-26-gpsessentials.md
similarity index 99%
rename from _posts/jp/mobile-mapping/0900-12-26-gpsessentials.md
rename to _posts/ja/mobile-mapping/0900-12-26-gpsessentials.md
index 33294f72b..48c00537a 100644
--- a/_posts/jp/mobile-mapping/0900-12-26-gpsessentials.md
+++ b/_posts/ja/mobile-mapping/0900-12-26-gpsessentials.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: GPS Essentials
-permalink: /jp/mobile-mapping/gpsessentials/
-lang: jp
+permalink: /ja/mobile-mapping/gpsessentials/
+lang: ja
 category: mobile-mapping
 --- 
 
diff --git a/_posts/jp/mobile-mapping/0900-12-27-osmtracker.md b/_posts/ja/mobile-mapping/0900-12-27-osmtracker.md
similarity index 99%
rename from _posts/jp/mobile-mapping/0900-12-27-osmtracker.md
rename to _posts/ja/mobile-mapping/0900-12-27-osmtracker.md
index 829a7fe36..40af8c8fc 100644
--- a/_posts/jp/mobile-mapping/0900-12-27-osmtracker.md
+++ b/_posts/ja/mobile-mapping/0900-12-27-osmtracker.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: OSMTracker
-permalink: /jp/mobile-mapping/osmtracker/
-lang: jp
+permalink: /ja/mobile-mapping/osmtracker/
+lang: ja
 category: mobile-mapping
 ---
 
diff --git a/_posts/jp/mobile-mapping/0900-12-28-oruxmaps.md b/_posts/ja/mobile-mapping/0900-12-28-oruxmaps.md
similarity index 99%
rename from _posts/jp/mobile-mapping/0900-12-28-oruxmaps.md
rename to _posts/ja/mobile-mapping/0900-12-28-oruxmaps.md
index b49fb9dce..e1958ec57 100644
--- a/_posts/jp/mobile-mapping/0900-12-28-oruxmaps.md
+++ b/_posts/ja/mobile-mapping/0900-12-28-oruxmaps.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: OruxMaps
-permalink: /jp/mobile-mapping/oruxmaps/
-lang: jp
+permalink: /ja/mobile-mapping/oruxmaps/
+lang: ja
 category: mobile-mapping
 ---
 
diff --git a/_posts/jp/mobile-mapping/0900-12-29-osmand.md b/_posts/ja/mobile-mapping/0900-12-29-osmand.md
similarity index 99%
rename from _posts/jp/mobile-mapping/0900-12-29-osmand.md
rename to _posts/ja/mobile-mapping/0900-12-29-osmand.md
index f1d233a11..9ee5abefa 100644
--- a/_posts/jp/mobile-mapping/0900-12-29-osmand.md
+++ b/_posts/ja/mobile-mapping/0900-12-29-osmand.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: OSMAnd
-permalink: /jp/mobile-mapping/osmand/
-lang: jp
+permalink: /ja/mobile-mapping/osmand/
+lang: ja
 category: mobile-mapping
 ---
 
diff --git a/_posts/jp/mobile-mapping/0900-12-30-mobile_mapping.md b/_posts/ja/mobile-mapping/0900-12-30-mobile_mapping.md
similarity index 98%
rename from _posts/jp/mobile-mapping/0900-12-30-mobile_mapping.md
rename to _posts/ja/mobile-mapping/0900-12-30-mobile_mapping.md
index e22c4bafa..2a3320814 100644
--- a/_posts/jp/mobile-mapping/0900-12-30-mobile_mapping.md
+++ b/_posts/ja/mobile-mapping/0900-12-30-mobile_mapping.md
@@ -1,7 +1,7 @@
 ---
 layout: doc
-permalink: /jp/mobile-mapping/
-lang: jp
+permalink: /ja/mobile-mapping/
+lang: ja
 title: スマートフォンを使ったマッピング
 category: mobile-mapping
 cover: yes
diff --git a/_posts/jp/osm-data/0600-12-08-osmosis.md b/_posts/ja/osm-data/0600-12-08-osmosis.md
similarity index 99%
rename from _posts/jp/osm-data/0600-12-08-osmosis.md
rename to _posts/ja/osm-data/0600-12-08-osmosis.md
index 8081759bd..f9d1dc97a 100644
--- a/_posts/jp/osm-data/0600-12-08-osmosis.md
+++ b/_posts/ja/osm-data/0600-12-08-osmosis.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Manipulating Data with Osmosis
-permalink: /jp/osm-data/osmosis/
-lang: jp
+permalink: /ja/osm-data/osmosis/
+lang: ja
 category: osm-data
 ---
 
diff --git a/_posts/jp/osm-data/0600-12-09-osm2pgsql.md b/_posts/ja/osm-data/0600-12-09-osm2pgsql.md
similarity index 99%
rename from _posts/jp/osm-data/0600-12-09-osm2pgsql.md
rename to _posts/ja/osm-data/0600-12-09-osm2pgsql.md
index 85ee3db57..48302d8ca 100644
--- a/_posts/jp/osm-data/0600-12-09-osm2pgsql.md
+++ b/_posts/ja/osm-data/0600-12-09-osm2pgsql.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: osm2pgsql
-permalink: /jp/osm-data/osm2pgsql/
-lang: jp
+permalink: /ja/osm-data/osm2pgsql/
+lang: ja
 category: osm-data
 ---
 
diff --git a/_posts/jp/osm-data/0600-12-10-setting-up-postgresql.md b/_posts/ja/osm-data/0600-12-10-setting-up-postgresql.md
similarity index 99%
rename from _posts/jp/osm-data/0600-12-10-setting-up-postgresql.md
rename to _posts/ja/osm-data/0600-12-10-setting-up-postgresql.md
index 7a7f0d37e..655bd9db6 100644
--- a/_posts/jp/osm-data/0600-12-10-setting-up-postgresql.md
+++ b/_posts/ja/osm-data/0600-12-10-setting-up-postgresql.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: PostgreSQLのセットアップ
-permalink: /jp/osm-data/setting-up-postgresql/
-lang: jp
+permalink: /ja/osm-data/setting-up-postgresql/
+lang: ja
 category: osm-data
 ---
 
diff --git a/_posts/jp/osm-data/0600-12-13-osm-in-qgis.md b/_posts/ja/osm-data/0600-12-13-osm-in-qgis.md
similarity index 99%
rename from _posts/jp/osm-data/0600-12-13-osm-in-qgis.md
rename to _posts/ja/osm-data/0600-12-13-osm-in-qgis.md
index f226a3b22..bcfeaa63e 100644
--- a/_posts/jp/osm-data/0600-12-13-osm-in-qgis.md
+++ b/_posts/ja/osm-data/0600-12-13-osm-in-qgis.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: QGISでのOSMデータ利用
-permalink: /jp/osm-data/osm-in-qgis/
-lang: jp
+permalink: /ja/osm-data/osm-in-qgis/
+lang: ja
 category: osm-data
 ---
 
@@ -112,4 +112,4 @@ SQLiteへのデータインポート
 [export full]: /images/jp/osm-data/osm-in-qgis/export_full.png
 [cairo polygons]: /images/jp/osm-data/osm-in-qgis/cairo_polygons.png
 [open attribute table]: /images/jp/osm-data/osm-in-qgis/open_attribute_table.png
-[attribute table]: /images/jp/osm-data/osm-in-qgis/attribute_table.png
\ No newline at end of file
+[attribute table]: /images/jp/osm-data/osm-in-qgis/attribute_table.png
diff --git a/_posts/jp/osm-data/0600-12-15-getting-data.md b/_posts/ja/osm-data/0600-12-15-getting-data.md
similarity index 98%
rename from _posts/jp/osm-data/0600-12-15-getting-data.md
rename to _posts/ja/osm-data/0600-12-15-getting-data.md
index 753bb286e..f46546b85 100644
--- a/_posts/jp/osm-data/0600-12-15-getting-data.md
+++ b/_posts/ja/osm-data/0600-12-15-getting-data.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: OSMデータの取得
-permalink: /jp/osm-data/getting-data/
-lang: jp
+permalink: /ja/osm-data/getting-data/
+lang: ja
 category: osm-data
 ---
 
diff --git a/_posts/jp/osm-data/0600-12-20-file-formats.md b/_posts/ja/osm-data/0600-12-20-file-formats.md
similarity index 99%
rename from _posts/jp/osm-data/0600-12-20-file-formats.md
rename to _posts/ja/osm-data/0600-12-20-file-formats.md
index 870250798..5c60d6117 100644
--- a/_posts/jp/osm-data/0600-12-20-file-formats.md
+++ b/_posts/ja/osm-data/0600-12-20-file-formats.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: File Formats
-permalink: /jp/osm-data/file-formats/
-lang: jp
+permalink: /ja/osm-data/file-formats/
+lang: ja
 category: osm-data
 ---
 
diff --git a/_posts/jp/osm-data/0600-12-30-data-overview.md b/_posts/ja/osm-data/0600-12-30-data-overview.md
similarity index 99%
rename from _posts/jp/osm-data/0600-12-30-data-overview.md
rename to _posts/ja/osm-data/0600-12-30-data-overview.md
index 21a19ceb0..d22147230 100644
--- a/_posts/jp/osm-data/0600-12-30-data-overview.md
+++ b/_posts/ja/osm-data/0600-12-30-data-overview.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: OSMデータの概要
-permalink: /jp/osm-data/data-overview/
-lang: jp
+permalink: /ja/osm-data/data-overview/
+lang: ja
 category: osm-data
 ---
 
@@ -61,4 +61,4 @@ have selected.
 In fact, when you download data in JOSM, you are **extracting** the data from a specific
 area of the world. The data is then sent to you in **.osm** format, which you can then
 edit in JOSM. If you download data in JOSM and then save it, you will see that the file
-type is **.osm**. We'll talk more about this in the next chapter.
\ No newline at end of file
+type is **.osm**. We'll talk more about this in the next chapter.
diff --git a/_posts/jp/osm-data/0600-12-31-osm-data.md b/_posts/ja/osm-data/0600-12-31-osm-data.md
similarity index 95%
rename from _posts/jp/osm-data/0600-12-31-osm-data.md
rename to _posts/ja/osm-data/0600-12-31-osm-data.md
index 5d89006aa..8d3985f53 100644
--- a/_posts/jp/osm-data/0600-12-31-osm-data.md
+++ b/_posts/ja/osm-data/0600-12-31-osm-data.md
@@ -1,7 +1,7 @@
 ---
 layout: doc
-permalink: /jp/osm-data/
-lang: jp
+permalink: /ja/osm-data/
+lang: ja
 title: OSMデータ
 category: osm-data
 cover: yes
@@ -22,4 +22,4 @@ We'll cover:
 -	Manipulating OSM files with Osmosis
 -	The OverPass API
 
--->
\ No newline at end of file
+-->
diff --git a/_posts/jp/osm-data/draft0600-12-04-overpass-api.md b/_posts/ja/osm-data/draft0600-12-04-overpass-api.md
similarity index 95%
rename from _posts/jp/osm-data/draft0600-12-04-overpass-api.md
rename to _posts/ja/osm-data/draft0600-12-04-overpass-api.md
index f92aeb7f4..688cdf53b 100644
--- a/_posts/jp/osm-data/draft0600-12-04-overpass-api.md
+++ b/_posts/ja/osm-data/draft0600-12-04-overpass-api.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: OverPass API
-permalink: /jp/osm-data/overpass-api/
-lang: jp
+permalink: /ja/osm-data/overpass-api/
+lang: ja
 category: osm-data
 ---
 
diff --git a/_posts/jp/osm-data/draft0600-12-12-converting-to-shapefile.md b/_posts/ja/osm-data/draft0600-12-12-converting-to-shapefile.md
similarity index 93%
rename from _posts/jp/osm-data/draft0600-12-12-converting-to-shapefile.md
rename to _posts/ja/osm-data/draft0600-12-12-converting-to-shapefile.md
index 98d32832b..d14aeab85 100644
--- a/_posts/jp/osm-data/draft0600-12-12-converting-to-shapefile.md
+++ b/_posts/ja/osm-data/draft0600-12-12-converting-to-shapefile.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Converting to Shapefile
-permalink: /jp/osm-data/converting-to-shapefile/
-lang: jp
+permalink: /ja/osm-data/converting-to-shapefile/
+lang: ja
 category: osm-data
 ---
 
diff --git a/_posts/jp/surveying/draft-0400-11-30-gps-etrex20.md b/_posts/ja/surveying/draft-0400-11-30-gps-etrex20.md
similarity index 73%
rename from _posts/jp/surveying/draft-0400-11-30-gps-etrex20.md
rename to _posts/ja/surveying/draft-0400-11-30-gps-etrex20.md
index 7fadf5cd3..adeb712fb 100644
--- a/_posts/jp/surveying/draft-0400-11-30-gps-etrex20.md
+++ b/_posts/ja/surveying/draft-0400-11-30-gps-etrex20.md
@@ -1,7 +1,7 @@
 ---
 layout: doc
-permalink: /jp/surveying/gps-etrex20
-lang: jp
+permalink: /ja/surveying/gps-etrex20
+lang: ja
 title: Surveying
 category: surveying
 cover: yes
@@ -12,4 +12,4 @@ nosearch: true
 Using the eTrex 20
 ==================
 
-https://docs.google.com/document/d/16F7ZGAjryutA5TBPLulhTASFBiXX19ZZ-40EuUcddEw/edit
\ No newline at end of file
+https://docs.google.com/document/d/16F7ZGAjryutA5TBPLulhTASFBiXX19ZZ-40EuUcddEw/edit
diff --git a/_posts/jp/surveying/draft0400-12-31-surveying.md b/_posts/ja/surveying/draft0400-12-31-surveying.md
similarity index 84%
rename from _posts/jp/surveying/draft0400-12-31-surveying.md
rename to _posts/ja/surveying/draft0400-12-31-surveying.md
index 997a85c7d..b55bd25b9 100644
--- a/_posts/jp/surveying/draft0400-12-31-surveying.md
+++ b/_posts/ja/surveying/draft0400-12-31-surveying.md
@@ -1,7 +1,7 @@
 ---
 layout: doc
-permalink: /jp/surveying/
-lang: jp
+permalink: /ja/surveying/
+lang: ja
 title: Surveying
 category: surveying
 cover: yes
@@ -16,4 +16,4 @@ For many people going out and collecting information to add to the map is
 the most fun part of OpenStreetMap.
 
 In this section we provide more tutorials that will help you learn how
-to survey better.
\ No newline at end of file
+to survey better.
diff --git a/_posts/jp/sys_admin/draft0800-12-25-sds.md b/_posts/ja/sys_admin/draft0800-12-25-sds.md
similarity index 99%
rename from _posts/jp/sys_admin/draft0800-12-25-sds.md
rename to _posts/ja/sys_admin/draft0800-12-25-sds.md
index e3d1d01b5..ee5ed9951 100644
--- a/_posts/jp/sys_admin/draft0800-12-25-sds.md
+++ b/_posts/ja/sys_admin/draft0800-12-25-sds.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: Private Data Storage Configuration
-permalink: /jp/advanced/sds/
-lang: jp
+permalink: /ja/advanced/sds/
+lang: ja
 category: sys-admin
 ---
 
@@ -437,4 +437,4 @@ store access.
 This is the general layout of the private data store. When you
 configure your organization’s own data store you will have access to the
 administration pages and therefore be able to create users.
---> 
\ No newline at end of file
+--> 
diff --git a/_posts/jp/sys_admin/draft0800-12-30-postgis.md b/_posts/ja/sys_admin/draft0800-12-30-postgis.md
similarity index 99%
rename from _posts/jp/sys_admin/draft0800-12-30-postgis.md
rename to _posts/ja/sys_admin/draft0800-12-30-postgis.md
index 191e5bfcd..7a28a70f0 100644
--- a/_posts/jp/sys_admin/draft0800-12-30-postgis.md
+++ b/_posts/ja/sys_admin/draft0800-12-30-postgis.md
@@ -1,8 +1,8 @@
 ---
 layout: doc
 title: PostGIS Configuration
-permalink: /jp/advanced/postgis-cofiguration/
-lang: jp
+permalink: /ja/advanced/postgis-cofiguration/
+lang: ja
 category: sys-admin
 ---
 
@@ -614,4 +614,4 @@ horribly out of date. The PPA listed on switch2osm.org should be used
 
 The Windows version is from 2010, does not support PDF and uses 32-bit
 node IDs which are estimated to break in early 2013.
---> 
\ No newline at end of file
+--> 
diff --git a/_posts/jp/sys_admin/draft0800-12-31-sys-admin.md b/_posts/ja/sys_admin/draft0800-12-31-sys-admin.md
similarity index 71%
rename from _posts/jp/sys_admin/draft0800-12-31-sys-admin.md
rename to _posts/ja/sys_admin/draft0800-12-31-sys-admin.md
index 111e826b2..d7812b607 100644
--- a/_posts/jp/sys_admin/draft0800-12-31-sys-admin.md
+++ b/_posts/ja/sys_admin/draft0800-12-31-sys-admin.md
@@ -1,7 +1,7 @@
 ---
 layout: doc
-permalink: /jp/sys-admin/
-lang: jp
+permalink: /ja/sys-admin/
+lang: ja
 title: System Administration
 category: sys-admin
 cover: yes
@@ -13,4 +13,4 @@ System Administration
 =====================
 
 This section of learnOSM contains some advanced tutorials on
-setting up and operating various OSM systems.
\ No newline at end of file
+setting up and operating various OSM systems.
diff --git a/_posts/no/0100-01-01-contribute.md b/_posts/no/0100-01-01-contribute.md
new file mode 100644
index 000000000..31cd714ee
--- /dev/null
+++ b/_posts/no/0100-01-01-contribute.md
@@ -0,0 +1,14 @@
+---
+layout: contribute
+permalink: /no/contribute/
+lang: no
+title: Contribute
+contributetitle: "Help improve our guides"
+startwith: "Ready to get started?"
+startA: "Send us feedback"
+startB: "Create a translation"
+startC: "Improve Language"
+startD: "Report issues and contribute"
+nosearch: true
+---
+This guide is created and maintained by the [OpenStreetMap](http://www.openstreetmap.org/) and [Humanitarian OpenStreetMap](http://hotosm.org/) community. You can help us improve this guide by simply sending your feedback or by contributing directly to it via [Github](http://github.com/hotosm/learnosm).
diff --git a/_posts/no/0100-01-01-index.md b/_posts/no/0100-01-01-index.md
new file mode 100644
index 000000000..870825007
--- /dev/null
+++ b/_posts/no/0100-01-01-index.md
@@ -0,0 +1,22 @@
+---
+layout: front
+permalink: /no/
+lang: no
+fronttitle: "OpenStreetMap is a free street level map of the world, created by an ever growing community of mappers."
+frontintro: "Anyone can edit OpenStreetMap. Here you can learn how LearnOSM provides easy to understand, step-by-step guides for you to get started with contributing to OpenStreetMap and using OpenStreetMap and using OpenStreetMap data. If you are interested in running an OpenStreetMap workshop, check out the LearnOSM trainer resources."
+ourguides: "Our Guides"
+searchtext: "What are you looking for?"
+begspan: "New to OpenStreetMap?"
+beg: "beginner's guide"
+interspan: "More guides (currently in English)"
+interspanlink: "https://github.com/hotosm/learnosm/wiki/English-Learning-Guides"
+inter: "Intermediate, advanced, QGIS..."
+advspan: "Organizing a workshop?"
+adv: "See our trainer material"
+faq: "Common Questions"
+faqA: "What is OpenStreetMap?"
+faqB: "Who created LearnOSM?"
+faqC: "How can I get started mapping?"
+faqD: "Where can I find additional help?"
+nosearch: true
+---
diff --git a/_posts/no/0100-01-01-status.md b/_posts/no/0100-01-01-status.md
new file mode 100644
index 000000000..da22522f4
--- /dev/null
+++ b/_posts/no/0100-01-01-status.md
@@ -0,0 +1,11 @@
+---
+layout: default
+permalink: /no/status/
+lang: no
+title: Translation Status
+nosearch: true
+---
+
+## Translation Status - All Languages
+
+- [Spanish]({{site.baseurl}}/es/status/)
diff --git a/_posts/sw/0100-01-01-contribute.md b/_posts/sw/0100-01-01-contribute.md
new file mode 100644
index 000000000..8b1704f70
--- /dev/null
+++ b/_posts/sw/0100-01-01-contribute.md
@@ -0,0 +1,14 @@
+---
+layout: contribute
+permalink: /sw/contribute/
+lang: sw
+title: Contribute
+contributetitle: "Help improve our guides"
+startwith: "Ready to get started?"
+startA: "Send us feedback"
+startB: "Create a translation"
+startC: "Improve Language"
+startD: "Report issues and contribute"
+nosearch: true
+---
+This guide is created and maintained by the [OpenStreetMap](http://www.openstreetmap.org/) and [Humanitarian OpenStreetMap](http://hotosm.org/) community. You can help us improve this guide by simply sending your feedback or by contributing directly to it via [Github](http://github.com/hotosm/learnosm).
diff --git a/_posts/sw/0100-01-01-index.md b/_posts/sw/0100-01-01-index.md
new file mode 100644
index 000000000..b057ff13a
--- /dev/null
+++ b/_posts/sw/0100-01-01-index.md
@@ -0,0 +1,22 @@
+---
+layout: front
+permalink: /sw/
+lang: sw
+fronttitle: "OpenStreetMap is a free street level map of the world, created by an ever growing community of mappers."
+frontintro: "Anyone can edit OpenStreetMap. Here you can learn how LearnOSM provides easy to understand, step-by-step guides for you to get started with contributing to OpenStreetMap and using OpenStreetMap and using OpenStreetMap data. If you are interested in running an OpenStreetMap workshop, check out the LearnOSM trainer resources."
+ourguides: "Our Guides"
+searchtext: "What are you looking for?"
+begspan: "New to OpenStreetMap?"
+beg: "beginner's guide"
+interspan: "Nepal Disaster"
+interspanlink: "http://learnosm.org/en/coordination/nepal-disaster/"
+inter: "Please click here if you are new to mapping for HOT"
+advspan: "Organizing a workshop?"
+adv: "See our trainer material"
+faq: "Common Questions"
+faqA: "What is OpenStreetMap?"
+faqB: "Who created LearnOSM?"
+faqC: "How can I get started mapping?"
+faqD: "Where can I find additional help?"
+nosearch: true
+---
diff --git a/_posts/sw/0100-01-01-status.md b/_posts/sw/0100-01-01-status.md
new file mode 100644
index 000000000..8422c5eba
--- /dev/null
+++ b/_posts/sw/0100-01-01-status.md
@@ -0,0 +1,11 @@
+---
+layout: default
+permalink: /sw/status/
+lang: sw
+title: Translation Status
+nosearch: true
+---
+
+## Translation Status - All Languages
+
+- [Spanish]({{site.baseurl}}/es/status/)
diff --git a/_posts/sw/0200-12-30-introduction.md b/_posts/sw/0200-12-30-introduction.md
deleted file mode 100644
index cdee3dc59..000000000
--- a/_posts/sw/0200-12-30-introduction.md
+++ /dev/null
@@ -1,89 +0,0 @@
----
-layout: doc
-title: Introduction
-permalink: /sw/beginner/introduction/
-lang: sw
-category: beginner
----
-
-This section of LearnOSM is in the process of being translated. If you would like to assist with translating this site, please see [CONTRIBUTING.md](https://github.com/hotosm/learnosm/blob/gh-pages/CONTRIBUTING.md). 
-
-Introduction
-============
-
-Information is powerful. With good information and the right
-understanding, individuals and communities are better able to improve
-their lives and make good decisions about the future. There are many
-people and organizations who make decisions that affect our lives. Good
-information allows these NGOs, governments and citizens to make better
-decisions, and hopefully make our lives better. Maps are a good way
-to convey information. 
-
-![A village in Indonesia][]
-
-Maps are visual symbols of our world. They can often 
-demonstrate an idea better than words. This in turn can help us
-answer important questions. Where is the closest school or hospital? Who
-has the least access to these facilities? Where is poverty the most
-problematic? Questions like these can often best be expressed with maps,
-and maps can help find solutions to these questions. 
-
-As an exercise, get a pen and paper and draw a map of your town or village. What are the
-most important things to include on the map? What is the most important
-information? Spend a few minutes making your map, and when you’re
-finished, think about why the information you included is important, and
-who it might be important to.
-
-![Example of a hand-drawn map][]
-
-If your town is like most, you may have drawn some lines to represent
-roads, possibly a river or stream. Perhaps you added important buildings
-such as schools and offices, fields, or boundaries. Whatever you drew,
-you probably used symbols – a line to symbolize a road, a square to
-symbolize a building, and so on. Your map is a representation of what is
-on the ground.
-
-![Examples of symbols][]
-
-Your map is informative. You might use a map like this to explain to
-someone where different places are, where problems are in your
-community, or merely to help someone find their way around. The use of
-your map is limited though. There is only one copy of the map and the
-way you drew it may make sense to you, but perhaps not to someone else
-who would have drawn their own map in a different way. Because your map
-is merely on paper, it is difficult to get that information to others.
-This is why making your map on a computer, in such a way that anyone can
-access it, can be much more valuable. 
-
-![Mapping on Computer][]
-
-OpenStreetMap is a tool for creating and sharing map information. 
-Anyone can contribute to OSM, and thousands of people add to the project 
-every day. Users draw maps on computers, rather than paper, but as we 
-will see in this guide, drawing a map on a computer is not all that 
-different from drawing on paper. We still draw lines to represent roads,
-fields, and anything else, and we still represent schools and hospitals 
-with symbols. The important thing is that OSM maps are saved on the 
-internet, and anyone can access them at any time, totally free.
-
-![Digital maps with OpenStreetMap][]
-
-We hope that you will find OpenStreetMap useful and interesting in your
-work. By following this guide, you should be able to quickly start
-making digital maps with OpenStreetMap.
-
-Moving Forward
---------------
-
-Click on the link for further reading on:  
-
-*  [Getting started on OpenStreetMap.org](/en/beginner/start-osm/) 
-*  [Getting started with the iD editor](/en/editing/id-editor/)   
-*  [Getting started with the JOSM editor](/en/beginner/start-josm/)  
-
-
-[A village in Indonesia]: /images/beginner/village-in-indonesia.png
-[Example of a hand-drawn map]: /images/beginner/hand-drawn-map.png
-[Examples of symbols]: /images/beginner/examples-of-symbols.png
-[Mapping on Computer]: /images/beginner/mapping-on-computer.png
-[Digital maps with OpenStreetMap]: /images/beginner/digital-maps-with-osm.png
diff --git a/_posts/sw/beginner/0200-12-29-start-osm.md b/_posts/sw/beginner/0200-12-29-start-osm.md
new file mode 100644
index 000000000..fa4142efc
--- /dev/null
+++ b/_posts/sw/beginner/0200-12-29-start-osm.md
@@ -0,0 +1,207 @@
+---
+layout: doc
+title: OpenStreetMap.org
+permalink: /sw/beginner/start-osm/
+lang: sw
+category: beginner
+---
+
+Getting started on OpenStreetMap.org
+====================================
+
+In this section we will learn step by step how to navigate the
+OpenStreetMap website, view maps, and sign up for a user
+account. After you have your own username and password, you will be able
+to contribute your first points to the map.
+
+![website][]
+
+Visit the OpenStreetMap Website
+-------------------------------
+
+-   Before you begin, be sure your computer is connected to the internet.
+    (If you are reading this online, then you must be connected!)
+-   Open your web browser. Common browsers are Firefox, Chrome, Opera, or Internet
+    Explorer. If it is already open then you can create a new tab.
+-   In the address bar at the top of the window, enter the following and press Enter:
+    [www.openstreetmap.org](http://www.openstreetmap.org/)
+-   When the page has finished loading, you should see something like
+    this:
+
+    ![OpenStreetMap website with some main functions listed][]
+
+Navigate the Map
+----------------
+
+-   The main thing you should see is the map. Move the map by clicking
+    on it with your left mouse button, holding the button down, and
+    dragging your mouse around (see figure below).
+
+    ![Mouse navigation][]
+
+-   If you have a mouse with a scroll-wheel, zoom in and out on the map
+    by turning the wheel. If you don’t have a scroll-wheel, use the +
+    and – buttons on the upper right corner of the map. (see figure
+    below)
+-   To search for a place, left-click in the box labelled “Search” on
+    the left side of the page (see figure above). Type in the name of
+    your town or village and press Enter. A window should appear to the
+    left of the map with the results of your search. Click on the
+    location that looks like the one you want. The map will
+    automatically move to the location you chose.
+
+    ![Search][]
+   
+
+View Different Map Styles
+------------------------
+
+OpenStreetMap contains geographic data from all over the world. Although
+it is a single database, the data can be interpreted and styled in
+different ways. To see this in action, let's look at various map "styles"
+available on the OSM website.
+
+-   Click on the Layers button on the right side of the map window.
+
+    ![Layers button][]
+
+-   Click on the different style options for the map. Notice how the map
+    changes with each one. The transport map, for example, emphasizes
+    transportation routes on the map while the cycle map emphasizes cycling
+    routes. All of the data to make this possible is contained in the OSM
+    database.
+
+    ![Transport map][]
+
+Create an OpenStreetMap Account
+-------------------------------
+
+-   Now that you have seen what the main website looks like, you can
+    register for a username and password and make your first additions
+    to the map.
+-   On the OpenStreetMap website, click “sign up” in the top
+    right corner of the page.
+-   You should see a new page that looks like this:
+
+    ![Registering an OpenStreetMap account][]
+
+-   There are five boxes on this page that you need to fill in to
+    register an account with OSM.
+-   Enter your email address in the first two boxes. You should enter
+    the same email address in both boxes. Later, you will need to open
+    your email to confirm your account with OpenStreetMap.
+-   In the third box, enter the username that you would like to have.
+    You will not be able to choose a username that someone else has
+    chosen before, so it should be creative. If you try to enter
+    something simple, like your first name, it is likely that someone
+    has already claimed that name.
+-   Enter a new password in the fourth and fifth boxes. You should enter
+    the same password in both boxes. It does not need to be the same as
+    the password for your email.
+-   You may want to write down your OSM username and password. You will
+    need it to log in later.
+-   After you have completed all the boxes, click "Sign Up" at the
+    bottom of the page.
+-   If there are any problems, an error message may pop up. Check to
+    make sure that your email is the same in the first two boxes, and
+    your password is the same in the bottom two boxes. If the third box
+    is highlighted red, it means that someone else has already chosen
+    your username, and you should try a different name.
+-   Open a separate window or tab in your internet browser, and navigate
+    to your email.  Common email sites are [mail.yahoo.com](http://mail.yahoo.com)
+    and [www.gmail.com](http://www.gmail.com).
+-   Enter your email address and your email password to open your email.
+    Note that this is __not__ the same as your OpenStreetMap username and
+    password.
+-   If everything was successful with your registration, you should see
+    an email from OpenStreetMap in your inbox. Open the email. It should
+    look like the image below. Click on the link that is identified
+    below:
+
+    ![Confirming your OpenStreetMap account][]
+
+-   A new tab or window will open. If everything went well, you should
+    have an OSM account!
+-   On the OpenStreetMap page, click “log in” in the top right corner.
+    Enter your OpenStreetMap username and password and press Enter. You
+    should now be logged in. You should see your username in the upper
+    right corner of the page.
+
+Adding Your First Points
+------------------------
+
+-   Now that you are logged in with your username on the OpenStreetMap
+    website, you can use the iD editor to add your first point to
+    the map.
+-   Move the map to a place that you know very well, such as your town
+    or neighborhood. A good idea is to ensure your home (or your neighbour's home) and workplace are drawn and given the correct address. 
+-   Zoom in to a place where you would like to add a point to the map (perhaps a restaurant or grocery store near you isn't yet mapped).
+-   Just above the map on the left, there is a tab named “Edit” with a small
+    triangle besides it. Click the small triangle. You should see a menu
+    drop down.
+-   Click “Edit with iD (in-browser editor)”.
+
+    ![Click edit][]
+
+-   The online editor, named iD, should open. It will look something like this.
+
+    ![iD editor][]
+
+-   You can add a point to the map by clicking on the button named "Point" at
+    the top the window. Then click on the map where you would like to add a new
+    point.
+
+    ![Point button][]    
+
+-   Select from the menu on the left what type of location it is that you are
+    adding to the map. You can then fill in the appropriate form with the location's
+    name and other information.
+-   To save your changes, click the "Save" button at the top. Since this is your
+    first edit, you may prefer to play around with the editor. Don't save your changes
+    unless you are sure they are correct.
+
+    ![Save button][]    
+
+-   If you do click Save, you will be asked to provide a description of your changes.
+    Then you can click "Save" once more, and your additions will be saved to the
+    OSM database!
+
+<!-- link to iD editor chapter when ready -->
+
+The iD editor is a fantastic way to easily edit OpenStreetMap. However, in the next chapter
+we will be looking at JOSM, a standalone application that offers many more features. Feel free
+to continue playing with iD. Once you have more experience contributing to OSM, you can choose
+which editor you like using the best.
+
+Summary
+-------
+
+Congratulations! If all went well you now have an OpenStreetMap username
+and password, you know how to navigate the OSM website, and you have
+your first understanding of how to add points to the map.
+
+In the next chapter, we will install a desktop editor for OpenStreetMap,
+called JOSM, and learn better how to draw digital maps.
+
+Moving Forward
+--------------
+
+Click on the link for further reading on:  
+
+*  [Getting started with the iD editor](/en/editing/id-editor/)   
+*  [Getting started with the JOSM editor](/en/beginner/start-josm/) 
+*  [To continue with the Remote, Armchair or Mapathon section of LearnOSM](/en/coordination/remote/)  
+
+
+[website]: /images/beginner/start-osm_website.png
+[OpenStreetMap website with some main functions listed]: /images/beginner/osm-website-main-functions.png
+[Mouse navigation]: /images/beginner/mouse-navigation.png
+[Search]: /images/beginner/search.png
+[Layers button]: /images/beginner/layers.png
+[Transport map]: /images/beginner/transport-map.png
+[Registering an OpenStreetMap account]: /images/beginner/registering-account.png
+[Confirming your OpenStreetMap account]: /images/beginner/confirming-account.png
+[Click edit]: /images/beginner/click-edit.png
+[iD editor]: /images/beginner/id-editor.png
+[Point button]: /images/beginner/point-button.png
+[Save button]: /images/beginner/save-button.png
diff --git a/_posts/sw/beginner/0200-12-30-introduction.md b/_posts/sw/beginner/0200-12-30-introduction.md
new file mode 100644
index 000000000..9dedb4c4e
--- /dev/null
+++ b/_posts/sw/beginner/0200-12-30-introduction.md
@@ -0,0 +1,51 @@
+---
+layout: doc
+title: Introduction
+permalink: /sw/beginner/introduction/
+lang: sw
+category: beginner
+---
+
+Utangulizi
+============
+
+Taarifa zina nguvu. Kwa taarifa nzuri na uelewa wa kweli, watu na jamii wanaweza kuboresha maisha yao na kufanya maamuzi mazuri ya baadae. Kuna watu wengi na mashirika yanayofanya maamuzi yanayoathiri  maisha yetu. Taarifa nzuri zinawezesha mashirika binafsi, serikali na raia kufanya maamuzi mazuri na  matumaini ya kuboresha maisha yetu. Ramani ni njia nzuri ya kusambaza habari.
+
+![A village in Indonesia][]
+
+Ramani ni picha ya dunia yetu yenye maelezo lukuki. Inaweza elezea wazo flani vizuri kuliko maneno. Hii kwa upande wetu inaweza kusaidia kujibu maswali muhimu. Ni shule au hospitali gani ipo karibu? Nani aliye karibu na huduma hizo? Wapi umasikini ni tatizo zaidi? Maswali kama haya yanaweza elezewa vizuri kwa kutumia ramani, vilevile ramani zinaweza tusaidia kutafuta ufumbuzi juu ya matatizo hayo.
+
+Kama zoezi, chukua kalamu na karatasi harafu chora ramani ya kijiji au mji wako. Ni vitu gani vya muhimu kuweka katika ramani? Je, tarifa ya muhimu zaidi ni hipi? Tumia dakika chache kutengeneza ramani yako, ukimaliza, fikiria kwanini tarifa ambazo umeweka za muhimu, na nani zinaweza kusaidia.
+
+![Example of a hand-drawn map][]
+
+Kama mji wako ni kama mingine, utakuwa na michoro ya vitu kama barabara, mito  au mifereji. Pia unaweza kuweka majengo muhimu kama shule, ofisi, viwanja vya michezo na mipaka. Chochote uchoracho utakuwa na alama kama ya boksi kuonesha jengo na vinginevyo. Ramani yako ni picha ya mambo yaliyoko ardhini au hapo mtaani.
+
+![Examples of symbols][]
+
+Ramani yako inatoa taarifa. Unaweza kutumia ramani kumuelezea mtu mwingine wapi sehemu fulani zinapatikana, mbali na hiyo pia ramani inaonyesha wapi matatizo ya jamii yalipo, pia ramani inasaidia kutafuta njia za kupitia. Lakini ikumbukwe kwamba matumizi ya ramani ina mipaka. Kuna nakala moja ya ramani na jinsi unavyoitengeneza ndivyo inaleta maana kwako, lakini sio kama mtu fulani alivyotengeneza ramani kwa namna yake. Kwa sababu ramani ni ndogo kwenye karatasi, kwa hiyo ni vigumu kupata taarifa kwa wengine. Ndio maana tunatengenezea ramani kwenye kompyuta ili mtu yeyote aweze kupata taarifa zilizo sahihi.
+
+
+![Mapping on Computer][]
+
+OpenStreetMap ni kifaa cha kutengenezea na kushirikishana taarifa za ramani. Mtu yeyote anaweza kuchangia kwenye OpenStreetMap, na maelfu ya watu wanaongezeka kwenye mradi kila siku. Watumiaji huchora ramani kwenye kompyuta, na sio karatasi, lakini kama tutakavyoona kwenye muongozo huu, kuchora ramani kwenye kompyuta sio tofauti sana na kuchora ramani kwenye karatasi. Tunaendelea kuchora mistari kuwakilisha barabara, viwanja, na vitu vyote, na tunaendelea kuwakilisha shule na hospitali kwa kutumia alama. Kitu cha muhimu ni kwamba OSM huhifadhiwa kwenye mtandao wa intaneti, na mtu yeyote anaweza kuipata muda wowote, na bure.
+
+![Digital maps with OpenStreetMap][]
+
+Tunatarajia kwamba utaona OpenStreetMap ni muhimu na ya kuvutia katika kazi zako. Kwa kufuata muongozo huu, utaweza kwa haraka kutengeneza ramani za kidigitali kwa kutumia OpenStreetMap.
+
+Kusonga Mbele
+--------------
+
+Click on the link for further reading on:  
+
+*  [Getting started on OpenStreetMap.org](/en/beginner/start-osm/) 
+*  [Getting started with the iD editor](/en/editing/id-editor/)   
+*  [Getting started with the JOSM editor](/en/beginner/start-josm/)  
+
+
+[A village in Indonesia]: /images/beginner/village-in-indonesia.png
+[Example of a hand-drawn map]: /images/beginner/hand-drawn-map.png
+[Examples of symbols]: /images/beginner/examples-of-symbols.png
+[Mapping on Computer]: /images/beginner/mapping-on-computer.png
+[Digital maps with OpenStreetMap]: /images/beginner/digital-maps-with-osm.png
diff --git a/_posts/sw/0200-12-31-beginner.md b/_posts/sw/beginner/0200-12-31-beginner.md
similarity index 100%
rename from _posts/sw/0200-12-31-beginner.md
rename to _posts/sw/beginner/0200-12-31-beginner.md
diff --git a/all-translation.json b/all-translation.json
index 6a23ac294..f375c7b75 100644
--- a/all-translation.json
+++ b/all-translation.json
@@ -81,10 +81,10 @@
 	   "url":""}
 	]
 },{
-	"lang":"jp",
+	"lang":"ja",
 	"chapters":[
 	  {% for post in site.posts %}
-	  {% if {{post.lang}} == 'jp' %}
+	  {% if {{post.lang}} == 'ja' %}
 	  {% unless post.nosearch %}
 	      {% include post.json %},
 	  {% endunless %}
@@ -145,5 +145,31 @@
 	  {"label":"",
 	   "url":""}
 	]
+},{
+	"lang":"no",
+		"chapters":[
+	  {% for post in site.posts %}
+	  {% if {{post.lang}} == 'no' %}
+	  {% unless post.nosearch %}
+	      {% include post.json %},
+	  {% endunless %}
+	  {% endif %}
+	  {% endfor %}
+	  {"label":"",
+	   "url":""}
+	]
+},{
+	"lang":"sw",
+		"chapters":[
+	  {% for post in site.posts %}
+	  {% if {{post.lang}} == 'sw' %}
+	  {% unless post.nosearch %}
+	      {% include post.json %},
+	  {% endunless %}
+	  {% endif %}
+	  {% endfor %}
+	  {"label":"",
+	   "url":""}
+	]
 }
 ]
diff --git a/images/beginner/click-edit.png b/images/beginner/click-edit.png
new file mode 100644
index 000000000..777e2b5b1
Binary files /dev/null and b/images/beginner/click-edit.png differ
diff --git a/images/beginner/confirming-account.png b/images/beginner/confirming-account.png
new file mode 100644
index 000000000..f38c3e0e7
Binary files /dev/null and b/images/beginner/confirming-account.png differ
diff --git a/images/beginner/id-editor.png b/images/beginner/id-editor.png
new file mode 100644
index 000000000..35b874df1
Binary files /dev/null and b/images/beginner/id-editor.png differ
diff --git a/images/beginner/layers.png b/images/beginner/layers.png
new file mode 100644
index 000000000..38b761e66
Binary files /dev/null and b/images/beginner/layers.png differ
diff --git a/images/beginner/mouse-navigation.png b/images/beginner/mouse-navigation.png
new file mode 100644
index 000000000..5ec2882cf
Binary files /dev/null and b/images/beginner/mouse-navigation.png differ
diff --git a/images/beginner/osm-website-main-functions.png b/images/beginner/osm-website-main-functions.png
new file mode 100644
index 000000000..0a5c9deda
Binary files /dev/null and b/images/beginner/osm-website-main-functions.png differ
diff --git a/images/beginner/point-button.png b/images/beginner/point-button.png
new file mode 100644
index 000000000..0a36b0221
Binary files /dev/null and b/images/beginner/point-button.png differ
diff --git a/images/beginner/registering-account.png b/images/beginner/registering-account.png
new file mode 100644
index 000000000..c4b474c1b
Binary files /dev/null and b/images/beginner/registering-account.png differ
diff --git a/images/beginner/save-button.png b/images/beginner/save-button.png
new file mode 100644
index 000000000..320cd8055
Binary files /dev/null and b/images/beginner/save-button.png differ
diff --git a/images/beginner/search.png b/images/beginner/search.png
new file mode 100644
index 000000000..cd5bd9af3
Binary files /dev/null and b/images/beginner/search.png differ
diff --git a/images/beginner/start-osm_website.png b/images/beginner/start-osm_website.png
new file mode 100644
index 000000000..2d17ec627
Binary files /dev/null and b/images/beginner/start-osm_website.png differ
diff --git a/images/beginner/transport-map.png b/images/beginner/transport-map.png
new file mode 100644
index 000000000..d786d2bb5
Binary files /dev/null and b/images/beginner/transport-map.png differ