Monkey patch in an upstream fix for I18n::Backend::Fallbacks

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e41048d0fb0259da4112c6ad6601dc8abbc5a078..955f4a97c142b5ffe68167262fe29c5be5dd7926 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -103,11 +103,11 @@ en:
     navigation:
       paging:
         user:
     navigation:
       paging:
         user:

-          prev: "« %{id}"
-          next: "%{id} »"
+          prev: "« %{id}"
+          next: "%{id} »"

         all:
         all:

-          prev: "« %{id}"
-          next: "%{id} »"
+          prev: "« %{id}"
+          next: "%{id} »"

       user:
         name_changeset_tooltip: "View edits by %{user}"
         prev_changeset_tooltip: "Previous edit by %{user}"
       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"
         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:"
     node_details:
       coordinates: "Coordinates:"
       part_of: "Part of:"


@@ -280,8 +285,8 @@ en:
   changeset:
     changeset_paging_nav:
       showing_page: "Showing page %{page}"
   changeset:
     changeset_paging_nav:
       showing_page: "Showing page %{page}"

-      next: "Next »"
-      previous: "« Previous"
+      next: "Next »"
+      previous: "« Previous"

     changeset:
       id: "#%{id}"
       still_editing: "(still editing)"
     changeset:
       id: "#%{id}"
       still_editing: "(still editing)"


@@ -302,16 +307,19 @@ en:
       title_user: "Changesets by %{user}"
       title_bbox: "Changesets within %{bbox}"
       title_user_bbox: "Changesets by %{user} within %{bbox}"
       title_user: "Changesets by %{user}"
       title_bbox: "Changesets within %{bbox}"
       title_user_bbox: "Changesets by %{user} within %{bbox}"

+      title_friend: "Changesets by your friends"

 
       heading: "Changesets"
       heading_user: "Changesets"
       heading_bbox: "Changesets"
       heading_user_bbox: "Changesets"
 
       heading: "Changesets"
       heading_user: "Changesets"
       heading_bbox: "Changesets"
       heading_user_bbox: "Changesets"

+      heading_friend: "Changesets"

 
       description: "Recent changes"
       description_user: "Changesets by %{user}"
       description_bbox: "Changesets within %{bbox}"
       description_user_bbox: "Changesets by %{user} within %{bbox}"
 
       description: "Recent changes"
       description_user: "Changesets by %{user}"
       description_bbox: "Changesets within %{bbox}"
       description_user_bbox: "Changesets by %{user} within %{bbox}"

+      description_friend: "Changesets by your friends"

     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:


@@ -931,9 +939,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."
     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."
     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 +958,7 @@ en:
     wiki_title: Wiki site for the project
     documentation: Documentation
     documentation_title: Documentation for the project
     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
     community_blogs: "Community Blogs"
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation


@@ -1372,11 +1381,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:
       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"
       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"
       visibility_help: "what does this mean?"
       visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       upload_button: "Upload"


@@ -1410,8 +1419,8 @@ en:
       visibility: "Visibility:"
     trace_paging_nav:
       showing_page: "Showing page %{page}"
       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"
     trace:
       pending: "PENDING"
       count_points: "%{count} points"


@@ -1450,7 +1459,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:
       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."
       allow_to: "Allow the client application to:"
       allow_read_prefs:  "read your user preferences."
       allow_write_prefs: "modify your user preferences."


@@ -1604,7 +1613,7 @@ en:
             using your username and password and then associate the account
             with your OpenID in your user settings.
           </li>
             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!"
       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!"


@@ -1648,6 +1657,10 @@ en:
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"

+      ct status: "Contributor terms:"
+      ct undecided: Undecided
+      ct declined: Declined
+      ct accepted: Accepted %{ago} ago

       latest edit: "Latest edit %{ago}:"
       email address: "Email address:"
       created from: "Created from:"
       latest edit: "Latest edit %{ago}:"
       email address: "Email address:"
       created from: "Created from:"


@@ -1682,6 +1695,7 @@ en:
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"

+      friends_changesets: "Browse all changesets by friends"

     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"


@@ -1901,7 +1915,8 @@ en:
         mapnik: Mapnik
         osmarender: Osmarender
         cycle_map: Cycle Map
         mapnik: Mapnik
         osmarender: Osmarender
         cycle_map: Cycle Map

-        noname: NoName
+        transport_map: Transport Map
+        mapquest: MapQuest Open

       overlays:
         maplint: Maplint
     site:
       overlays:
         maplint: Maplint
     site: