Move the api trace methods into a separate controller under the api namespace

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 434b88c13277985dec0cd24458ab40d1a16d8579..d83ea717af013d7c69eb688954056cf4581a1bea 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -232,12 +232,13 @@ en-GB:
       reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
       hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
       reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
       hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>

+      report: Report this note

     query:
       title: Query Features
       introduction: Click on the map to find nearby features.
       nearby: Nearby features
       enclosing: Enclosing features
     query:
       title: Query Features
       introduction: Click on the map to find nearby features.
       nearby: Nearby features
       enclosing: Enclosing features

-  changeset:
+  changesets:

     changeset_paging_nav:
       showing_page: Page %{page}
       next: Next »
     changeset_paging_nav:
       showing_page: Page %{page}
       next: Next »


@@ -266,14 +267,14 @@ en-GB:
       load_more: Load more
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
       load_more: Load more
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.

-    rss:
-      title_all: OpenStreetMap changeset discussion
-      title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
+  changeset_comments:
+    comment:

       comment: 'New comment on changeset #%{changeset_id} by %{author}'
       comment: 'New comment on changeset #%{changeset_id} by %{author}'

-      commented_at_html: Updated %{when} ago

       commented_at_by_html: Updated %{when} ago by %{user}
       commented_at_by_html: Updated %{when} ago by %{user}

-      full: Full discussion
-  diary_entry:
+    index:
+      title_all: OpenStreetMap changeset discussion
+      title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
+  diary_entries:

     new:
       title: New Diary Entry
       publish_button: Publish
     new:
       title: New Diary Entry
       publish_button: Publish


@@ -1669,8 +1670,6 @@ en-GB:
     require_cookies:
       cookies_needed: You appear to have cookies disabled - please enable cookies
         in your browser before continuing.
     require_cookies:
       cookies_needed: You appear to have cookies disabled - please enable cookies
         in your browser before continuing.

-    require_moderator:
-      not_a_moderator: You need to be a moderator to perform that action.

     setup_user_auth:
       blocked_zero_hour: You have an urgent message on the OpenStreetMap web site.
         You need to read the message before you will be able to save your edits.
     setup_user_auth:
       blocked_zero_hour: You have an urgent message on the OpenStreetMap web site.
         You need to read the message before you will be able to save your edits.


@@ -2078,8 +2077,6 @@ en-GB:
       button: Unfriend
       success: '%{name} was removed from your friends.'
       not_a_friend: '%{name} is not one of your friends.'
       button: Unfriend
       success: '%{name} was removed from your friends.'
       not_a_friend: '%{name} is not one of your friends.'

-    filter:
-      not_an_administrator: You need to be an administrator to perform that action.

     index:
       title: Users
       heading: Users
     index:
       title: Users
       heading: Users


@@ -2119,8 +2116,6 @@ en-GB:
         with your ID in your user settings.
   user_role:
     filter:
         with your ID in your user settings.
   user_role:
     filter:

-      not_an_administrator: Only administrators can perform user role management,
-        and you are not an administrator.

       not_a_role: The string `%{role}' is not a valid role.
       already_has_role: The user already has role %{role}.
       doesnt_have_role: The user does not have role %{role}.
       not_a_role: The string `%{role}' is not a valid role.
       already_has_role: The user already has role %{role}.
       doesnt_have_role: The user does not have role %{role}.


@@ -2363,13 +2358,10 @@ en-GB:
     directions:
       ascend: Ascend
       engines:
     directions:
       ascend: Ascend
       engines:

+        fossgis_osrm_car: Car (OSRM)

         graphhopper_bicycle: Bicycle (GraphHopper)
         graphhopper_car: Car (GraphHopper)
         graphhopper_foot: Foot (GraphHopper)
         graphhopper_bicycle: Bicycle (GraphHopper)
         graphhopper_car: Car (GraphHopper)
         graphhopper_foot: Foot (GraphHopper)

-        mapquest_bicycle: Bicycle (MapQuest)
-        mapquest_car: Car (MapQuest)
-        mapquest_foot: Foot (MapQuest)
-        osrm_car: Car (OSRM)

       descend: Descend
       directions: Directions
       distance: Distance
       descend: Descend
       directions: Directions
       distance: Distance