Update bundle

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index cb17445fe3d7f70744d6b37db3a57f835023459f..9c0eb2c4942ac38568ee500d086a063622bc9318 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -452,6 +452,18 @@ en-GB:
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments

+  friendships:
+    make_friend:
+      heading: Add %{user} as a friend?
+      button: Add as friend
+      success: '%{name} is now your friend!'
+      failed: Sorry, failed to add %{name} as a friend.
+      already_a_friend: You are already friends with %{name}.
+    remove_friend:
+      heading: Unfriend %{user}?
+      button: Unfriend
+      success: '%{name} was removed from your friends.'
+      not_a_friend: '%{name} is not one of your friends.'

   geocoder:
     search:
       title:
   geocoder:
     search:
       title:


@@ -1110,7 +1122,7 @@ en-GB:
         subject %{subject}:'
       footer_html: You can also read the message at %{readurl} and you can reply at
         %{replyurl}
         subject %{subject}:'
       footer_html: You can also read the message at %{readurl} and you can reply at
         %{replyurl}

-    friend_notification:
+    friendship_notification:

       hi: Hi %{to_user},
       subject: '[OpenStreetMap] %{user} added you as a friend'
       had_added_you: '%{user} has added you as a friend on OpenStreetMap.'
       hi: Hi %{to_user},
       subject: '[OpenStreetMap] %{user} added you as a friend'
       had_added_you: '%{user} has added you as a friend on OpenStreetMap.'


@@ -2225,17 +2237,6 @@ en-GB:
       flash success: Home location saved successfully
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.
       flash success: Home location saved successfully
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.

-    make_friend:
-      heading: Add %{user} as a friend?
-      button: Add as friend
-      success: '%{name} is now your friend!'
-      failed: Sorry, failed to add %{name} as a friend.
-      already_a_friend: You are already friends with %{name}.
-    remove_friend:
-      heading: Unfriend %{user}?
-      button: Unfriend
-      success: '%{name} was removed from your friends.'
-      not_a_friend: '%{name} is not one of your friends.'

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