Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index d4dcbf88645c31378d64d745203a500cc8a670a9..d30dc8e77db8c86643490ecc4c733049e0eae835 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -20,6 +20,7 @@
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25
+# Author: Michel Bakni
 # Author: Mvolz
 # Author: Sampablokuper
 # Author: Samwilson
@@ -451,6 +452,18 @@ en-GB:
       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:
@@ -1109,7 +1122,7 @@ en-GB:
         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.'
@@ -1338,7 +1351,7 @@ en-GB:
           build upon our data, you may distribute the result only under the same licence.
           The full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
           code</a> explains your rights and responsibilities.
-        intro_3_html: |-
+        intro_3_1_html: |-
           The cartography in our map tiles, and our documentation, are
           licenced under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
@@ -1346,7 +1359,7 @@ en-GB:
         credit_1_html: |-
           We require that you use the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_html: |-
+        credit_2_1_html: |-
           You must also make it clear that the data is available under the Open
           Database Licence, and if using our map tiles, that the cartography is
           licenced as CC BY-SA. You may do this by linking to
@@ -1357,7 +1370,7 @@ en-GB:
           direct your readers to openstreetmap.org (perhaps by expanding
           'OpenStreetMap' to this full address), to opendatacommons.org, and
           if relevant, to creativecommons.org.
-        credit_3_html: |-
+        credit_4_html: |-
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         attribution_example:
@@ -2224,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.
-    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