Switch to using the rails-i18n-updater gem instead of the rails-i18n plugin

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e41048d0fb0259da4112c6ad6601dc8abbc5a078..0d7e3d44487861693e41013c5a95e37a71de4044 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -103,11 +103,11 @@ en:
     navigation:
       paging:
         user:
-          prev: "« %{id}"
-          next: "%{id} »"
+          prev: "« %{id}"
+          next: "%{id} »"
         all:
-          prev: "« %{id}"
-          next: "%{id} »"
+          prev: "« %{id}"
+          next: "%{id} »"
       user:
         name_changeset_tooltip: "View edits by %{user}"
         prev_changeset_tooltip: "Previous edit by %{user}"
@@ -157,6 +157,11 @@ en:
         node: "View node on larger map"
         way: "View way on larger map"
         relation: "View relation on larger map"
+      edit:
+        area: "Edit area"
+        node: "Edit node"
+        way: "Edit way"
+        relation: "Edit relation"
     node_details:
       coordinates: "Coordinates:"
       part_of: "Part of:"
@@ -280,8 +285,8 @@ en:
   changeset:
     changeset_paging_nav:
       showing_page: "Showing page %{page}"
-      next: "Next »"
-      previous: "« Previous"
+      next: "Next »"
+      previous: "« Previous"
     changeset:
       id: "#%{id}"
       still_editing: "(still editing)"
@@ -931,9 +936,10 @@ en:
     tag_line: The Free Wiki World Map
     intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
     intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
-    intro_3: "OpenStreetMap's hosting is kindly supported by the %{ucl} and %{bytemark}. Other supporters of the project are listed in the %{partners}."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
+    intro_3: "OpenStreetMap's hosting is kindly supported by %{ucl}, %{ic} and %{bytemark}. Other supporters of the project are listed in the %{partners}."
+    intro_3_ucl: "the UCL VR Centre"
+    intro_3_ic: "Imperial College London"
+    intro_3_bytemark: "Bytemark Hosting"
     intro_3_partners: "wiki"
     intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
@@ -949,7 +955,7 @@ en:
     wiki_title: Wiki site for the project
     documentation: Documentation
     documentation_title: Documentation for the project
-    copyright: "Copyright & License"
+    copyright: "Copyright & License"
     community_blogs: "Community Blogs"
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
@@ -1372,11 +1378,11 @@ en:
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
     trace_form:
-      upload_gpx: "Upload GPX File"
-      description: "Description"
-      tags: "Tags"
+      upload_gpx: "Upload GPX File:"
+      description: "Description:"
+      tags: "Tags:"
       tags_help: "comma delimited"
-      visibility: "Visibility"
+      visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       upload_button: "Upload"
@@ -1410,8 +1416,8 @@ en:
       visibility: "Visibility:"
     trace_paging_nav:
       showing_page: "Showing page %{page}"
-      next: "Next »"
-      previous: "« Previous"
+      next: "Next »"
+      previous: "« Previous"
     trace:
       pending: "PENDING"
       count_points: "%{count} points"
@@ -1450,7 +1456,7 @@ en:
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:
     oauthorize:
-      request_access: "The application %{app_name} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
+      request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
       allow_to: "Allow the client application to:"
       allow_read_prefs:  "read your user preferences."
       allow_write_prefs: "modify your user preferences."
@@ -1604,7 +1610,7 @@ en:
             using your username and password and then associate the account
             with your OpenID in your user settings.
           </li>
-        </ul> 
+        </ul>
       continue: Continue
       flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
       terms accepted: "Thanks for accepting the new contributor terms!"