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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 8bb77465b2eb299ad577133fe8ab166e568dfd28..c3eca7447d930f9244741fb60785b9e18ce0a2f5 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:


@@ -969,7 +973,6 @@ en-GB:
     partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
     partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting
     partners_partners: partners

-    partners_url: http://wiki.openstreetmap.org/wiki/Partners

     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance work is carried out.
     osm_read_only: The OpenStreetMap database is currently in read-only mode while
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance work is carried out.
     osm_read_only: The OpenStreetMap database is currently in read-only mode while


@@ -1552,7 +1555,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: