Merge remote-tracking branch 'upstream/pull/2225'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 575c361bb142447125bbca0c5d0cf485d6bcb4c5..516dad37abe2b65386d7316e7f541e7a56487a33 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,11 @@ en:
     formats:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"
     formats:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"

+  helpers:
+    submit:
+      diary_entry:
+        create: "Publish"
+        update: "Update"

   activerecord:
     errors:
       messages:
   activerecord:
     errors:
       messages:


@@ -282,7 +287,14 @@ en:
   diary_entries:
     new:
       title: New Diary Entry
   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"
     index:
       title: "Users' diaries"
       title_friends: "Friends' diaries"


@@ -296,15 +308,7 @@ en:
       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:
       older_entries: Older Entries
       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"
+      title: Edit Diary Entry

       marker_text: Diary entry location
     show:
       title: "%{user}'s diary | %{title}"
       marker_text: Diary entry location
     show:
       title: "%{user}'s diary | %{title}"


@@ -2317,14 +2321,27 @@ en:
       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."
       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."
     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"
+        days:
+          one: "1 day"
+          other: "%{count} days"
+        weeks:
+          one: "1 week"
+          other: "%{count} weeks"
+        months:
+          one: "1 month"
+          other: "%{count} months"
+        years:
+          one: "1 year"
+          other: "%{count} years"

     blocks_on:
       title: "Blocks on %{name}"
       heading: "List of blocks on %{name}"
     blocks_on:
       title: "Blocks on %{name}"
       heading: "List of blocks on %{name}"