Back out the changeset RSS stuff from the head for now.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c2aaf469a9a8875da1a771b2e2c114ecf69a8849..dbcaa65e50a3cd1dc877d883dd29ce4d2810a3ef 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -149,19 +149,16 @@ en:
       zoom_or_select: "Zoom in or select an area of the map to view"
       drag_a_box: "Drag a box on the map to select an area"
       manually_select: "Manually select a different area"
-      loaded_an_area: "You have loaded an area which contains"
-      browsers: "features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 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: "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 100 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."
       load_data: "Load Data"
-      unable_to_load: "Unable to load: Bounding box size of"
-      must_be_smaller: "is too large (must be smaller than 0.25)"
+      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..."
       show_history: "Show History"
       wait: "Wait..."
-      history_for: "History for"
+      history_for_feature: "History for {{feature}}"
       details: "Details"
       private_user: "private user"
-      edited_by: "Edited by"
-      at_timestamp: "at"
+      edited_by_user_at_timestamp: "Edited by {{user}} at {{timestamp}}"
       object_list:
         heading: "Object list"
         back: "Display object list"
@@ -169,17 +166,17 @@ en:
           node: "Node"
           way: "Way"
           # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "Retrieve this are from the API"
+        api: "Retrieve this area from the API"
         details: "Details"
         selected:
           type:
-            node: "Node"
-            way: "Way"
+            node: "Node {{id}}"
+            way: "Way {{id}}"
             # There's no 'relation' type because it isn't represented in OpenLayers
         history:
           type:
-            node: "Node"
-            way: "Way"
+            node: "Node {{id}}"
+            way: "Way {{id}}"
             # There's no 'relation' type because it isn't represented in OpenLayers
     tag_details:
       tags: "Tags:"
@@ -351,8 +348,10 @@ en:
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating
     help_wiki: "Help & Wiki"
+    help_wiki_url: "http://wiki.openstreetmap.org"
     news_blog: "News blog"
     shop: Shop
+    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
   notifier:
@@ -386,8 +385,10 @@ en:
       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
       the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
+      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
       # next four translations are in pairs : please word wrap appropriately
       user_wiki_1: "It is recommended that you create a user wiki page, which includes"
       user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
@@ -541,6 +542,7 @@ en:
       public: "Public?"
       upload_button: "Upload"
       help: "Help"
+      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:
       see_just_your_traces: "See just your traces, or upload a trace"
       see_all_traces: "See all traces"