Merge a final translation from i18n branch.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7b6b07ba219d5d3e173f183fc0ee01172a714b1a..7f8320cba374be7dbc18621089b4da36a81a2628 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -245,6 +245,9 @@ en:
       hi: "Hi {{to_user}},"
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
       footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
+    friend_notification:
+      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
+      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
     signup_confirm_plain:
       greeting: "Hi there!"
       hopefully_you: "Someone (hopefully you) would like to create an account over at"
@@ -400,7 +403,7 @@ en:
       edit: "edit"
       edit_map: "Edit Map"
       public: "PUBLIC"
-      pritate: "PRIVATE"
+      private: "PRIVATE"
       by: "by"
       in: "in"
   user: