Merge remote-tracking branch 'openstreetmap/pull/1426'

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index c4ea03585badb6bef6bfe2b93125827373bd46f0..4b0ccd15e359eddab9f55b352d5eba17a1f7ffaa 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -8,12 +8,16 @@
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
 # Author: E THP
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
 # Author: E THP

+# Author: EdLoach
+# Author: Eduard Popov
+# Author: IknowJoseph

 # Author: Jagwar
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25
 # Author: Sampablokuper
 # Author: Shirayuki
 # Author: Jagwar
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25
 # Author: Sampablokuper
 # Author: Shirayuki

+# Author: ديفيد

 ---
 en-GB:
   html:
 ---
 en-GB:
   html:


@@ -1480,6 +1484,9 @@ en-GB:
           track: Track
           bridleway: Bridleway
           cycleway: Cycleway
           track: Track
           bridleway: Bridleway
           cycleway: Cycleway

+          cycleway_national: National cycleway
+          cycleway_regional: Regional cycleway
+          cycleway_local: Local cycleway

           footway: Footway
           rail: Railway
           subway: Subway
           footway: Footway
           rail: Railway
           subway: Subway


@@ -1532,6 +1539,9 @@ en-GB:
           private: Private access
           destination: Destination access
           construction: Roads under construction
           private: Private access
           destination: Destination access
           construction: Roads under construction

+          bicycle_shop: Bicycle shop
+          bicycle_parking: Bicycle parking
+          toilets: Toilets

     richtext_area:
       edit: Edit
       preview: Preview
     richtext_area:
       edit: Edit
       preview: Preview


@@ -1546,7 +1556,7 @@ en-GB:
       second: Second item
       link: Link
       text: Text
       second: Second item
       link: Link
       text: Text

-      image: شکیل
+      image: Image

       alt: Alt text
       url: URL
   trace:
       alt: Alt text
       url: URL
   trace:


@@ -2014,6 +2024,8 @@ en-GB:
         gravatar: Use Gravatar
         link: http://wiki.openstreetmap.org/wiki/Gravatar
         link text: what is this?
         gravatar: Use Gravatar
         link: http://wiki.openstreetmap.org/wiki/Gravatar
         link text: what is this?

+        disabled: Gravatar has been disabled.
+        enabled: Display of your Gravatar has been enabled.

       new image: Add an image
       keep image: Keep the current image
       delete image: Remove the current image
       new image: Add an image
       keep image: Keep the current image
       delete image: Remove the current image