undo a wording change

src/allmydata/test/test_abbreviate.py

@@ -33,7 +33,7 @@ class Abbreviate(unittest.TestCase):
     def test_abbrev_time_future_5_minutes(self):
         diff = timedelta(minutes=-5)
         s = abbreviate.abbreviate_time(diff)
-        self.assertEqual('5 minutes from now', s)
+        self.assertEqual('5 minutes in the future', s)
 
     def test_abbrev_time_hours(self):
         diff = timedelta(hours=4)

src/allmydata/util/abbreviate.py

@@ -40,7 +40,7 @@ def abbreviate_time(s):
         if s >= 0.0:
             postfix = ' ago'
         else:
-            postfix = ' from now'
+            postfix = ' in the future'
             s = -s
     def _plural(count, unit):
         count = int(count)