Merge 16817:16819 from trunk.

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

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 33f937b5f14a72381cb4eb594bfbce6e720e1135..b81c666f5f504b18d7d64942de854541900c3cf2 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -77,7 +77,7 @@ hi:
   browse:
     changeset:
       title: "Changeset"
   browse:
     changeset:
       title: "Changeset"

-      changeset: "Changeset:"
+      changeset: "Changeset: {{id}}"

       download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"


@@ -98,8 +98,8 @@ hi:
       version: "संस्करण:"
       in_changeset: "इस changeset का अंग:"
     containing_relation:
       version: "संस्करण:"
       in_changeset: "इस changeset का अंग:"
     containing_relation:

-      relation: "संबंध {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "संबंध {{relation_name}}"
+      entry_role: "संबंध {{relation_name}} (as {{relation_role}})"

     map:
       loading: "Loading..."
       deleted: "मिटा दिया गया है"
     map:
       loading: "Loading..."
       deleted: "मिटा दिया गया है"


@@ -209,7 +209,6 @@ hi:
       show_area_box: "show area box"
       big_area: "(बड़ा क्षेत्र)"
       view_changeset_details: "इस changeset के विवरण देखे"
       show_area_box: "show area box"
       big_area: "(बड़ा क्षेत्र)"
       view_changeset_details: "इस changeset के विवरण देखे"

-      more: "और दिखाए"

     changesets:
       id: "आईडी"
       saved_at: "समय जब सुरक्षित किया गया"
     changesets:
       id: "आईडी"
       saved_at: "समय जब सुरक्षित किया गया"


@@ -315,8 +314,6 @@ hi:
       view_larger_map: "View Larger Map"
   geocoder:
     results:
       view_larger_map: "View Larger Map"
   geocoder:
     results:

-      results: "Results"
-      type_from_source: "{{type}} from {{source_link}}"

       no_results: "No results found"
   layouts:
     welcome_user: "Welcome, {{user_link}}"
       no_results: "No results found"
   layouts:
     welcome_user: "Welcome, {{user_link}}"


@@ -499,7 +496,6 @@ hi:
       search: Search
       where_am_i: "Where am I?"
       submit_text: "Go"
       search: Search
       where_am_i: "Where am I?"
       submit_text: "Go"

-      searching: "Searching..."

       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:
       map_key: "Map key"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:
       map_key: "Map key"