Simplified common details

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3afa70365f31ea3cf3e7fb3f6dade421b13b9797..808234cead846fc6e40ad35b4c68cdd9defc8aff 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -97,7 +97,7 @@ en:
   browse:
     changeset:
       title: "Changeset"
   browse:
     changeset:
       title: "Changeset"

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

       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:


@@ -127,30 +127,19 @@ en:
         prev_note_tooltip: "Previous note"
         next_note_tooltip: "Next note"
     changeset_details:
         prev_note_tooltip: "Previous note"
         next_note_tooltip: "Next note"
     changeset_details:

-      created_at: "Created at:"
-      closed_at: "Closed at:"
-      belongs_to: "Belongs to:"
-      bounding_box: "Bounding box:"
-      no_bounding_box: "No bounding box has been stored for this changeset."
-      show_area_box: "Show Area Box"
-      box: "box"
-      has_nodes:
-        one: "Has the following %{count} node:"
-        other: "Has the following %{count} nodes:"
-      has_ways:
-        one:  "Has the following %{count} way:"
-        other: "Has the following %{count} ways:"
-      has_relations:
-        one:  "Has the following %{count} relation:"
-        other: "Has the following %{count} relations:"
+      created_at: "Created"
+      closed_at: "Closed"
+      belongs_to: "Author"
+      has_nodes: "Nodes (%{count})"
+      has_ways: "Ways (%{count})"
+      has_relations: "Relations (%{count})"

     common_details:
     common_details:

-      edited_at: "Edited at:"
-      edited_by: "Edited by:"
-      deleted_at: "Deleted at:"
-      deleted_by: "Deleted by:"
-      version: "Version:"
-      in_changeset: "In changeset:"
-      changeset_comment: "Comment:"
+      edited: "Edited"
+      deleted: "Deleted"
+      by: "by"
+      version: "Version"
+      in_changeset: "Changeset"
+      changeset_comment: "Comment"

     containing_relation:
       entry: "Relation %{relation_name}"
       entry_role: "Relation %{relation_name} (as %{relation_role})"
     containing_relation:
       entry: "Relation %{relation_name}"
       entry_role: "Relation %{relation_name} (as %{relation_role})"


@@ -266,7 +255,7 @@ en:
             way: "Way %{id}"
             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
             way: "Way %{id}"
             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:

-      tags: "Tags:"
+      tags: "Tags"

       wiki_link:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"
       wiki_link:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"


@@ -292,13 +281,13 @@ en:
       title: "Note"
       open_title: "Unresolved note: %{note_name}"
       closed_title: "Resolved note: %{note_name}"
       title: "Note"
       open_title: "Unresolved note: %{note_name}"
       closed_title: "Resolved note: %{note_name}"

-      opened: "Opened:"
-      last_modified: "Last modified:"
-      closed: "Closed:"
+      opened: "Opened"
+      last_modified: "Last modified"
+      closed: "Closed"

       at_html: "%{when} ago"
       at_by_html: "%{when} ago by %{user}"
       at_html: "%{when} ago"
       at_by_html: "%{when} ago by %{user}"

-      description: "Description:"
-      comments: "Comments:"
+      description: "Description"
+      comments: "Comments"

   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"
   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"


@@ -321,24 +310,11 @@ en:
     list:
       title: "Changesets"
       title_user: "Changesets by %{user}"
     list:
       title: "Changesets"
       title_user: "Changesets by %{user}"

-      title_bbox: "Changesets within %{bbox}"
-      title_user_bbox: "Changesets by %{user} within %{bbox}"

       title_friend: "Changesets by your friends"
       title_nearby: "Changesets by nearby users"
       title_friend: "Changesets by your friends"
       title_nearby: "Changesets by nearby users"

-      heading: "Changesets"
-      heading_user: "Changesets"
-      heading_bbox: "Changesets"
-      heading_user_bbox: "Changesets"
-      heading_friend: "Changesets"
-      heading_nearby: "Changesets"
-      description: "Browse recent contributions to the map"
-      description_user: "Changesets by %{user}"
-      description_bbox: "Changesets within %{bbox}"
-      description_user_bbox: "Changesets by %{user} within %{bbox}"
-      description_friend: "Changesets by your friends"
-      description_nearby: "Changesets by nearby users"
-      empty_user_html: "It looks you haven't made any edits yet. To get started, check out the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide</a>."
-      empty_anon_html: "No edits made yet."
+      empty: "No changesets in this area."
+      no_more: "No more changesets in this area."
+      load_more: "Load more"

     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:


@@ -1007,6 +983,7 @@ en:
     view_tooltip: View the map
     edit: Edit
     history: History
     view_tooltip: View the map
     edit: Edit
     history: History

+    export: Export

     data: Data
     export_data: Export Data
     gps_traces: GPS Traces
     data: Data
     export_data: Export Data
     gps_traces: GPS Traces


@@ -1214,6 +1191,53 @@ en:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
       description: Browse the wiki for in-depth OSM documentation.
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
       description: Browse the wiki for in-depth OSM documentation.

+  about_page:
+    next: Next
+    copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
+    used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
+    lede_text: |
+      OSM is built by a community of local mappers that keeps data about
+      roads, cafés, subway stations, and much more up to date every day.
+    local_knowledge_title: Local Knowledge
+    local_knowledge_html: |
+      OpenStreetMap emphasizes local knowledge. Contributors use
+      aerial imagery, GPS devices, and low-tech field maps to verify that OSM
+      is up to date and accurate.
+    community_driven_title: Community Driven
+    community_driven_html: |
+      From the engineers that tune OSM's servers to the Humanitarian OSM Team
+      that maps disaster-affected areas, OSM's community is diverse,
+      passionate, and growing every day. To learn more about the community,
+      see the <a href='%{diary_path}'>user diaries</a>,
+      <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
+      the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
+    open_data_title: Open Data
+    open_data_html: |
+      OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
+      as long as you credit OpenStreetMap and its contributors. If you alter or
+      build upon the data in certain ways, you may distribute the result only
+      under the same licence. See the <a href='%{copyright_path}'>Copyright and
+      License page</a> for details.
+    photo_caption_0_html: |
+      <a href='https://twitter.com/mikel'>@mikel</a> working on
+      <a href='http://mapkibera.org/'>Map Kibera</a>, a project to map the
+      largest slum in Nairobi, Kenya.
+      <a href='http://www.flickr.com/photos/watato/4564778295'>&copy; watato
+      2010</a>
+    photo_caption_1_html: |
+      <a href='https://twitter.com/lxbarth'>@lxbarth</a> and
+      <a href='https://twitter.com/limareis'>@limareis</a> survey Brasilia with
+      walking papers.
+      <a href='http://www.flickr.com/photos/mapbox/7104560119'>&copy; mapbox
+      2012</a>
+    photo_caption_2_html: |
+      @TODO caption (<a href='http://www.flickr.com/photos/oddwick/4775001075'>source</a>)
+    photo_caption_3_html: |
+      @TODO caption (<a href='http://www.flickr.com/photos/28698126@N02/3012439281'>source</a>)
+    photo_caption_4_html: |
+      @TODO caption (<a href='http://www.flickr.com/photos/louis_liu/4875155429/'>source</a>)
+    photo_caption_5_html: |
+      @TODO caption (<a href='http://www.flickr.com/photos/kachkaev/5793019627'>source</a>)

   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"


@@ -1387,6 +1411,8 @@ en:
       close: Close
     search:
       search: Search
       close: Close
     search:
       search: Search

+      where_am_i: "Where am I?"
+      where_am_i_title: Describe the current location using the search engine

       submit_text: "Go"
     key:
       table:
       submit_text: "Go"
     key:
       table:


@@ -2146,8 +2172,6 @@ en:
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map

-      history_tooltip: View edits for this area
-      history_disabled_tooltip: Zoom in to view edits for this area

       createnote_tooltip: Add a note to the map
       createnote_disabled_tooltip: Zoom in to add a note to the map
     notes:
       createnote_tooltip: Add a note to the map
       createnote_disabled_tooltip: Zoom in to add a note to the map
     notes: