Add user id to api trace output

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7635c483dd94534f647a174f68b69fcb8ea6dca8..ec845dc7c412426cae4875c7ee7d56fe84f30619 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -212,7 +212,7 @@ en:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft
+      microsoft: Microsoft

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -228,6 +228,7 @@ en:
         reopened_at_by_html: "Reactivated %{when} by %{user}"
       rss:
         title: "OpenStreetMap Notes"
         reopened_at_by_html: "Reactivated %{when} by %{user}"
       rss:
         title: "OpenStreetMap Notes"

+        description_all: "A list of reported, commented on or closed notes"

         description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
         description_item: "An rss feed for note %{id}"
         opened: "new note (near %{place})"
         description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
         description_item: "An rss feed for note %{id}"
         opened: "new note (near %{place})"


@@ -1785,7 +1786,7 @@ en:
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account

-        windowslive:
+        microsoft:

           title: Login with Microsoft
           alt: Login with a Microsoft Account
         github:
           title: Login with Microsoft
           alt: Login with a Microsoft Account
         github:


@@ -2696,6 +2697,7 @@ en:
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"

+      uid: "User id:"

       ct status: "Contributor terms:"
       ct undecided: Undecided
       ct declined: Declined
       ct status: "Contributor terms:"
       ct undecided: Undecided
       ct declined: Declined