Merge pull request #6 from hotosm/gh-pages

rebase
hotosm · May 15, 2015 · 456ac20 · 456ac20
2 parents 4032809 + b33d744
commit 456ac20
Show file tree

Hide file tree

Showing 85 changed files with 556 additions and 237 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 → _posts/ja/0100-01-01-contribute.md b/_posts/jp/0100-01-01-contribute.md → _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 → _posts/ja/0100-01-01-index.md b/_posts/jp/0100-01-01-index.md → _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 → _posts/ja/0100-01-01-status.md b/_posts/jp/0100-01-01-status.md → _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/...ner/0200-12-20-beginner-all-chapters.html → ...ner/0200-12-20-beginner-all-chapters.html b/...ner/0200-12-20-beginner-all-chapters.html → ...ner/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/.../jp/beginner/0200-12-21-moving-forward.md → .../ja/beginner/0200-12-21-moving-forward.md b/.../jp/beginner/0200-12-21-moving-forward.md → .../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/.../beginner/0200-12-23-editing-with-josm.md → .../beginner/0200-12-23-editing-with-josm.md b/.../beginner/0200-12-23-editing-with-josm.md → .../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 → _posts/ja/beginner/0200-12-24-papers.md b/_posts/jp/beginner/0200-12-24-papers.md → _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 → _posts/ja/beginner/0200-12-26-gps.md b/_posts/jp/beginner/0200-12-26-gps.md → _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/...jp/beginner/0200-12-27-more-about-josm.md → ...ja/beginner/0200-12-27-more-about-josm.md b/...jp/beginner/0200-12-27-more-about-josm.md → ...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 → _posts/ja/beginner/0200-12-28-start-josm.md b/_posts/jp/beginner/0200-12-28-start-josm.md → _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 → _posts/ja/beginner/0200-12-29-start-osm.md b/_posts/jp/beginner/0200-12-29-start-osm.md → _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/...ts/jp/beginner/0200-12-30-introduction.md → ...ts/ja/beginner/0200-12-30-introduction.md b/...ts/jp/beginner/0200-12-30-introduction.md → ...ts/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 → _posts/ja/beginner/0200-12-31-beginner.md b/_posts/jp/beginner/0200-12-31-beginner.md → _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/...oordination/0500-10-23-tasking-manager.md → ...oordination/0500-10-23-tasking-manager.md b/...oordination/0500-10-23-tasking-manager.md → ...oordination/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 → _posts/ja/coordination/0500-10-29-review.md b/_posts/jp/coordination/0500-10-29-review.md → _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 → _posts/ja/coordination/0500-11-16-remote.md b/_posts/jp/coordination/0500-11-16-remote.md → _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/...p/coordination/0500-12-31-coordination.md → ...a/coordination/0500-12-31-coordination.md b/...p/coordination/0500-12-31-coordination.md → ...a/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/...tion/draft0500-11-26-quality-assurance.md → ...tion/draft0500-11-26-quality-assurance.md b/...tion/draft0500-11-26-quality-assurance.md → ...tion/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/...ation/draft0500-11-28-editing_the_wiki.md → ...ation/draft0500-11-28-editing_the_wiki.md b/...ation/draft0500-11-28-editing_the_wiki.md → ...ation/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 → _posts/ja/editing/0300-10-31-id-editor.md b/_posts/jp/editing/0300-10-31-id-editor.md → _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/...ng/0300-11-12-josm-conflict-resolution.md → ...ng/0300-11-12-josm-conflict-resolution.md b/...ng/0300-11-12-josm-conflict-resolution.md → ...ng/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/...g/0300-11-15-correcting-imagery-offset.md → ...g/0300-11-15-correcting-imagery-offset.md b/...g/0300-11-15-correcting-imagery-offset.md → ...g/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/...s/jp/editing/0300-11-16-aerial-imagery.md → ...s/ja/editing/0300-11-16-aerial-imagery.md b/...s/jp/editing/0300-11-16-aerial-imagery.md → ...s/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/.../editing/0300-11-18-editing-techniques.md → .../editing/0300-11-18-editing-techniques.md b/.../editing/0300-11-18-editing-techniques.md → .../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/...s/jp/editing/0300-11-20-josm-relations.md → ...s/ja/editing/0300-11-20-josm-relations.md b/...s/jp/editing/0300-11-20-josm-relations.md → ...s/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/...ing/0300-11-26-creating-custom-presets.md → ...ing/0300-11-26-creating-custom-presets.md b/...ing/0300-11-26-creating-custom-presets.md → ...ing/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 → _posts/ja/editing/0300-11-27-josm-presets.md b/_posts/jp/editing/0300-11-27-josm-presets.md → _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
 ---