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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 5c9b4eebe1573c828f9fe9f5681efbd9c906925a..7156890121adba33eb2f0c2e79eed8d6d1b451c9 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1688,8 +1688,6 @@ en-GB:
       identifiable: IDENTIFIABLE
       private: PRIVATE
       trackable: TRACKABLE
       identifiable: IDENTIFIABLE
       private: PRIVATE
       trackable: TRACKABLE

-      by: by
-      in: in

     index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}
     index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}


@@ -1882,9 +1880,6 @@ en-GB:
     index:
       title: Users
       heading: Users
     index:
       title: Users
       heading: Users

-      showing:
-        one: Page %{page} (%{first_item} of %{items})
-        other: Page %{page} (%{first_item}-%{last_item} of %{items})

       summary_html: '%{name} created from %{ip_address} on %{date}'
       summary_no_ip_html: '%{name} created on %{date}'
       confirm: Confirm Selected Users
       summary_html: '%{name} created from %{ip_address} on %{date}'
       summary_no_ip_html: '%{name} created on %{date}'
       confirm: Confirm Selected Users


@@ -2010,9 +2005,6 @@ en-GB:
       reason: Reason for block
       status: Status
       revoker_name: Revoked by
       reason: Reason for block
       status: Status
       revoker_name: Revoked by

-      showing_page: Page %{page}
-      next: Next »
-      previous: « Previous

   notes:
     index:
       title: Notes submitted or commented on by %{user}
   notes:
     index:
       title: Notes submitted or commented on by %{user}