X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f1bb6df967f5b195fffe0ad4553ae515d20ae3e4..63b399c9b22b7f2a8dfc14fe68bc6579fccb3bf9:/config/locales/ja.yml

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 3914d06a9..e5e2fbdfe 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -79,7 +79,7 @@ ja:
   browse:
     changeset:
       title: "変更セット"
-      changeset: "変更セット:"
+      changeset: "変更セット: {{id}}"
       download: "ダウンロード{{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "変更セットXML"
       osmchangexml: "osm変更XML"
@@ -100,8 +100,8 @@ ja:
       version: "バージョン:"
       in_changeset: "変更セット:"
     containing_relation:
-      relation: "関連 {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "関連 {{relation_name}}"
+      entry_role: "関連 {{relation_name}} (as {{relation_role}})"
     map:
       loading: "ロード中..."
       deleted: "削除済み"
@@ -134,8 +134,6 @@ ja:
     relation_history:
       relation_history: "関連の履歴"
       relation_history_title: "関連の履歴: {{relation_name}}"
-    relation_member:
-      as: "as"
     relation:
       relation: "関連"
       relation_title: "関連: {{relation_name}}"
@@ -212,7 +210,6 @@ ja:
       show_area_box: "領域境界を表示"
       big_area: "（大）"
       view_changeset_details: "変更セットの詳細表示"
-      more: "詳細"
     changesets:
       id: "ID"
       saved_at: "保存日時"
@@ -320,9 +317,15 @@ ja:
       add_marker: "マーカーを地図に追加する"
       view_larger_map: "大きな地図を表示..."
   geocoder:
+    search:
+      title:
+        latlon: '<a href="http://openstreetmap.org/">Internal</a>からの結果'
+        us_postcode: '<a href="http://geocoder.us/">Geocoder.us</a>からの結果'
+        uk_postcode: '<a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>からの結果'
+        ca_postcode: '<a href="http://geocoder.ca/">Geocoder.CA</a>からの結果'
+        osm_namefinder: '<a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>からの結果'
+        geonames: '<a href="http://www.geonames.org/">GeoNames</a>からの結果'
     results:
-      results: "結果"
-      type_from_source: "{{source_link}}からの{{type}}"
       no_results: "見つかりませんでした。"
   layouts:
     project_name:
@@ -447,7 +450,7 @@ ja:
       video_to_openstreetmap: "introductory video to OpenStreetMap"
       more_videos: "There are {{more_videos_link}}."
       more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</p> or  <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
+      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
       wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
       user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
       current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
@@ -473,14 +476,6 @@ ja:
       greeting: "Hi,"
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
-    reset_password:
-      subject: "[OpenStreetMap] Password reset"
-    reset_password_plain:
-      greeting: "Hi,"
-      reset: "Your password has been reset to {{new_password}}"
-    reset_password_html:
-      greeting: "Hi,"
-      reset: "Your password has been reset to {{new_password}}"
   message:
     inbox:
       title: "受信箱"
@@ -562,7 +557,6 @@ ja:
       search: "検索"
       where_am_i: "いまどこ?"
       submit_text: "行く"
-      searching: "検索中..."
       search_help: "例: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>他の例...</a>"
       #いずれ、wiki.openstreetmap.org/wiki/Ja:Searchを作成すること
     key: