X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/874fddf49945443e5af47812fa3a30e96375ce9c..6db326aa1f084a062a3b658876bc01bf650f5702:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 706e04778..f3a86040a 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1,6 +1,7 @@
# Messages for British English (British English)
# Exported from translatewiki.net
# Export driver: phpyaml
+# Author: Abijeet Patro
# Author: Andibing
# Author: Bpfhjquevaps
# Author: Bruce89
@@ -28,6 +29,10 @@ en-GB:
formats:
friendly: '%e %B %Y at %H:%M'
blog: '%e %B %Y'
+ helpers:
+ submit:
+ diary_entry:
+ create: Publish
activerecord:
models:
acl: Access Control List
@@ -300,7 +305,14 @@ en-GB:
diary_entries:
new:
title: New Diary Entry
- publish_button: Publish
+ form:
+ subject: 'Subject:'
+ body: 'Body:'
+ language: 'Language:'
+ location: 'Location:'
+ latitude: 'Latitude:'
+ longitude: 'Longitude:'
+ use_map_link: use map
index:
title: Users' diaries
title_friends: Friends' diaries
@@ -315,14 +327,6 @@ en-GB:
newer_entries: Newer Entries
edit:
title: Edit diary entry
- subject: 'Subject:'
- body: 'Body:'
- language: 'Language:'
- location: 'Location:'
- latitude: 'Latitude:'
- longitude: 'Longitude:'
- use_map_link: use map
- save_button: Save
marker_text: Diary entry location
show:
title: '%{user}''s diary | %{title}'
@@ -1904,15 +1908,12 @@ en-GB:
terms:
title: Contributor terms
heading: Contributor terms
- read and accept: Please read the agreement and press the agree button to confirm
- that you accept the terms of this agreement for your existing and future contributions.
consider_pd: In addition to the above agreement, I consider my contributions
to be in the Public Domain
consider_pd_why: what's this?
consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
guidance: 'Information to help understand these terms: a human
readable summary and some informal translations'
- agree: Agree
declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
decline: Decline
you need to accept or decline: Please read and then either accept or decline
@@ -2216,14 +2217,15 @@ en-GB:
confirm: Are you sure you wish to revoke this block?
revoke: Revoke!
flash: This block has been revoked.
- period:
- one: 1 hour
- other: '%{count} hours'
helper:
time_future: Ends in %{time}.
until_login: Active until the user logs in.
time_future_and_until_login: Ends in %{time} and after the user has logged in.
time_past: Ended %{time} ago.
+ block_duration:
+ hours:
+ one: 1 hour
+ other: '%{count} hours'
blocks_on:
title: Blocks on %{name}
heading: List of blocks on %{name}
@@ -2266,7 +2268,7 @@ en-GB:
mine:
title: Notes submitted or commented on by %{user}
heading: '%{user}''s notes'
- subheading: Notes submitted or commented on by %{user}
+ subheading_html: Notes submitted or commented on by %{user}
id: Id
creator: Creator
description: Description