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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9af2dd5661528f033f9c63e74a65aa27ca7e361a..9af89978ef5d917975a2047fa2bd4ea101ee600d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2541,8 +2541,8 @@ en:
       identifiable: "IDENTIFIABLE"
       private: "PRIVATE"
       trackable: "TRACKABLE"
-      by: "by"
-      in: "in"
+      details_with_tags_html: "%{time_ago} by %{user} in %{tags}"
+      details_without_tags_html: "%{time_ago} by %{user}"
     index:
       public_traces: "Public GPS Traces"
       my_gps_traces: "My GPS Traces"