Merge 16110:16487 from trunk.

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

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 64b20ec2cad02dac34049d38edab2a26b3554aee..5f1cb67872cad1801df6d2c9802c8ba40c6ec5f7 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,12 +98,11 @@ 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: "मिटा दिया गया है"

-      view_larger_map: "नक्शे के व्यापक दृष्टिकोण"

     node_details:
       coordinates: "निर्देशांक:"
       part_of: "इन रास्तो का हिस्सा:"
     node_details:
       coordinates: "निर्देशांक:"
       part_of: "इन रास्तो का हिस्सा:"


@@ -133,8 +132,6 @@ hi:
     relation_history:
       relation_history: "संबंध का इतिहास"
       relation_history_title: "इस संबंध का इतिहास: {{relation_name}}"
     relation_history:
       relation_history: "संबंध का इतिहास"
       relation_history_title: "इस संबंध का इतिहास: {{relation_name}}"

-    relation_member:
-      as: "जैसे"

     relation:
       relation: "संबंध"
       relation_title: "संबंध: {{relation_name}}"
     relation:
       relation: "संबंध"
       relation_title: "संबंध: {{relation_name}}"


@@ -318,8 +315,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}}"


@@ -502,7 +497,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"


@@ -552,7 +546,7 @@ hi:
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"

-      viewing_trace: "Viewing trace {{name}}"
+      heading: "Viewing trace {{name}}"

       trace_not_found: "Trace not found!"
     trace_paging_nav:
       showing: "Showing page"
       trace_not_found: "Trace not found!"
     trace_paging_nav:
       showing: "Showing page"


@@ -609,7 +603,7 @@ hi:
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
       fill_form: "Fill in the form and we'll send you a quick email to activate your account."
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
       fill_form: "Fill in the form and we'll send you a quick email to activate your account."

-      license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'

       email address: "Email Address: "
       confirm email address: "Confirm Email Address: "
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       email address: "Email Address: "
       confirm email address: "Confirm Email Address: "
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'