Fix note formatting issues

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 808234cead846fc6e40ad35b4c68cdd9defc8aff..2a546abce81524b783078fd462a07d50eef64134 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -130,9 +130,15 @@ en:
       created_at: "Created"
       closed_at: "Closed"
       belongs_to: "Author"
-      has_nodes: "Nodes (%{count})"
-      has_ways: "Ways (%{count})"
-      has_relations: "Relations (%{count})"
+      node: "Nodes (%{count})"
+      node_paginated: "Nodes (%{x}-%{y} of %{count})"
+      way: "Ways (%{count})"
+      way_paginated: "Ways (%{x}-%{y} of %{count})"
+      relation: "Relations (%{count})"
+      relation_paginated: "Relations (%{x}-%{y} of %{count})"
+      no_comment: "(no comment)"
+      ago: "%{ago} ago"
+      by: "by"
     common_details:
       edited: "Edited"
       deleted: "Deleted"
@@ -186,9 +192,6 @@ en:
         way: way
         relation: relation
         changeset: changeset
-    paging_nav:
-      showing_page: "page"
-      of: "of"
     redacted:
       redaction: "Redaction %{id}"
       message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
@@ -225,7 +228,7 @@ en:
       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"
-      loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      loaded_an_area_with_num_features: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?"
       load_data: "Load Data"
       unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})"
       loading: "Loading..."
@@ -288,6 +291,15 @@ en:
       at_by_html: "%{when} ago by %{user}"
       description: "Description"
       comments: "Comments"
+      anonymous: "anonymous"
+      open_by: "Created by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      open_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      closed_by_anonymous: "Resolved by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"
@@ -296,7 +308,7 @@ en:
     changeset:
       still_editing: "(still editing)"
       anonymous: "Anonymous"
-      no_comment: "(none)"
+      no_comment: "(no comment)"
       no_edits: "(no edits)"
       show_area_box: "show area box"
       big_area: "(big)"
@@ -392,6 +404,7 @@ en:
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   export:
+    title: "Export"
     start:
       area_to_export: "Area to Export"
       manually_select: "Manually select a different area"
@@ -979,8 +992,6 @@ en:
     log_in_tooltip: Log in with an existing account
     sign_up: Sign Up
     sign_up_tooltip: Create an account for editing
-    view: View
-    view_tooltip: View the map
     edit: Edit
     history: History
     export: Export
@@ -1015,7 +1026,7 @@ en:
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation
-
+    learn_more: "Learn More"
   license_page:
     foreign:
       title: About this translation
@@ -1218,26 +1229,7 @@ en:
       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>)
+    partners_title: Partners
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -2169,6 +2161,7 @@ en:
         overlays: Enable overlays for troubleshooting the map
         title: "Layers"
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
+      donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map