Merge branch 'master' into feature/add-communities-page

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index c29c3be4e90c94cb679359611d5d3a60838f14f4..47de3c43139097238f1fe14a7ba9660fb409508a 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -11,6 +11,7 @@
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry

+# Author: Danieldegroot2

 # Author: E THP
 # Author: EdLoach
 # Author: Eduard Popov
 # Author: E THP
 # Author: EdLoach
 # Author: Eduard Popov


@@ -506,7 +507,6 @@ en-GB:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap
     comments:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap
     comments:

-      has_commented_on: '%{display_name} has commented on the following diary entries'

       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment


@@ -705,7 +705,6 @@ en-GB:
           landing_site: Emergency Landing Site
           phone: Emergency Phone
           water_tank: Emergency Water Tank
           landing_site: Emergency Landing Site
           phone: Emergency Phone
           water_tank: Emergency Water Tank

-          "yes": Emergency

         highway:
           abandoned: Abandoned Highway
           bridleway: Bridleway
         highway:
           abandoned: Abandoned Highway
           bridleway: Bridleway


@@ -2046,6 +2045,9 @@ en-GB:
       flash: Updated the client information successfully
     destroy:
       flash: Destroyed the client application registration
       flash: Updated the client information successfully
     destroy:
       flash: Destroyed the client application registration

+  oauth2_applications:
+    new:
+      title: Register a new application

   users:
     new:
       title: Sign Up
   users:
     new:
       title: Sign Up