Wait for the page to finish loading before trying to add any data

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 962551b41cade06a61f818483ffef9df4526e20b..64690965d066860504aca76e88b8fdcfe8b77fd6 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -313,7 +313,7 @@ en:
       save_button: "Save"
       marker_text: Diary entry location
     view:
-      title: "Users' diaries | {{user}}"
+      title: "{{user}}'s diary | {{title}}"
       user_title: "{{user}}'s diary"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment: "{{login_link}} to leave a comment"
@@ -362,6 +362,9 @@ en:
       embeddable_html: "Embeddable HTML"
       licence: "Licence"
       export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
+      too_large:
+        heading: "Area Too Large"
+        body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area."
       options: "Options"
       format: "Format"
       scale: "Scale"
@@ -1449,6 +1452,8 @@ en:
     account:
       title: "Edit account"
       my settings: My settings
+      current email address: "Current Email Address:"
+      new email address: "New Email Address:"
       email never displayed publicly: "(never displayed publicly)"
       public editing:
         heading: "Public editing:"