Rename friend to friendship in notifier

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b633c35ceaf32c794fd524622e87d6ae162f400a..cb17445fe3d7f70744d6b37db3a57f835023459f 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -20,8 +20,10 @@
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25

+# Author: Michel Bakni

 # Author: Mvolz
 # Author: Sampablokuper
 # Author: Mvolz
 # Author: Sampablokuper

+# Author: Samwilson

 # Author: Shirayuki
 # Author: Smsm1
 # Author: TomH
 # Author: Shirayuki
 # Author: Smsm1
 # Author: TomH


@@ -1310,10 +1312,7 @@ en-GB:
         subject \nto our <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">Terms
         of Use</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
         Use Policies</a> and our <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
         subject \nto our <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">Terms
         of Use</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
         Use Policies</a> and our <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy

-        Policy</a>\n<br> \nPlease <a href='https://osmfoundation.org/Contact'>contact
-        the OSMF</a> \nif you have licensing, copyright or other legal questions.\n<br>\nOpenStreetMap,
-        the magnifying glass logo and State of the Map are <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">registered
-        trademarks of the OSMF</a>."
+        Policy</a>."

       partners_title: Partners
     copyright:
       foreign:
       partners_title: Partners
     copyright:
       foreign:


@@ -2439,7 +2438,6 @@ en-GB:
         out: Zoom Out
       locate:
         title: Show My Location
         out: Zoom Out
       locate:
         title: Show My Location

-        popup: You are within {distance} {unit} of this point

       base:
         standard: Standard
         cycle_map: Cycle Map
       base:
         standard: Standard
         cycle_map: Cycle Map