Remove link_to_if since it's in a clause with the same condition

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2a51a1e9609971eb15f4b401540bf634c30fb176..2ea39365aab466d7b143aa5ee0a51aed361bc44a 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -21,6 +21,7 @@
 # Author: Jlrb+
 # Author: Kosovastar
 # Author: Macofe
+# Author: Maro21
 # Author: Meno25
 # Author: Michel Bakni
 # Author: Mvolz
@@ -109,7 +110,7 @@ en-GB:
       client_application:
         name: Name (Required)
         url: Main Application URL (Required)
-        callback_url: Callback URL
+        callback_url: 'Callback URL:'
         support_url: Support URL
         allow_read_prefs: read their user preferences
         allow_write_prefs: modify their user preferences
@@ -422,13 +423,8 @@ en-GB:
     new:
       title: New Diary Entry
     form:
-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Language:'
       location: 'Location:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: use map
+      use_map_link: Use map
     index:
       title: Users' diaries
       title_friends: Friends' diaries
@@ -657,12 +653,17 @@ en-GB:
         building:
           apartment: Apartment
           apartments: Apartments
+          bungalow: Bungalow
           cabin: Cabin
+          chapel: Chapel
+          church: Church
           college: College Building
           commercial: Commercial Building
           construction: Building under Construction
           garage: Garage
           garages: Garages
+          hospital: Hospital
+          hotel: Hotel
           house: House
           industrial: Industrial Building
           roof: Roof