Translate the new reset password procedure introduced in [16817] and

[rails.git] / config / locales / ja.yml

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2864de141c0678f1bc25958b19dc0601c212ef5a..72b4328b4b799368fdc3c7dfe4c2e10358d87e37 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -79,7 +79,7 @@ ja:
   browse:
     changeset:
       title: "変更セット"
   browse:
     changeset:
       title: "変更セット"

-      changeset: "変更セット:"
+      changeset: "変更セット: {{id}}"

       download: "ダウンロード{{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "変更セットXML"
       osmchangexml: "osm変更XML"
       download: "ダウンロード{{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "変更セットXML"
       osmchangexml: "osm変更XML"


@@ -210,7 +210,6 @@ ja:
       show_area_box: "領域境界を表示"
       big_area: "（大）"
       view_changeset_details: "変更セットの詳細表示"
       show_area_box: "領域境界を表示"
       big_area: "（大）"
       view_changeset_details: "変更セットの詳細表示"

-      more: "詳細"

     changesets:
       id: "ID"
       saved_at: "保存日時"
     changesets:
       id: "ID"
       saved_at: "保存日時"


@@ -318,9 +317,15 @@ ja:
       add_marker: "マーカーを地図に追加する"
       view_larger_map: "大きな地図を表示..."
   geocoder:
       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:

-      results: "結果"
-      type_from_source: "{{source_link}}からの{{type}}"

       no_results: "見つかりませんでした。"
   layouts:
     project_name:
       no_results: "見つかりませんでした。"
   layouts:
     project_name:


@@ -471,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."
       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: "受信箱"
   message:
     inbox:
       title: "受信箱"


@@ -560,7 +557,6 @@ ja:
       search: "検索"
       where_am_i: "いまどこ?"
       submit_text: "行く"
       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:
       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: