From: translatewiki.net <l10n-bot@translatewiki.net>
Date: Thu, 27 Jun 2019 16:37:17 +0000 (+0200)
Subject: Localisation updates from https://translatewiki.net.
X-Git-Tag: live~2504
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c1c277186ef0c519bed5b07e1b67ab8681010f15

Localisation updates from https://translatewiki.net.
---

diff --git a/config/locales/af.yml b/config/locales/af.yml
index e9bf32fa1..03b4a9d57 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -328,7 +328,6 @@ af:
       post: Plasing
       when: Wanneer
       comment: Kommentaar
-      ago: '%{ago} gelede'
       newer_comments: Jongste Kommentaar
       older_comments: Ouer Kommentaar
   geocoder:
@@ -1207,7 +1206,6 @@ af:
     trace:
       pending: HANGEND
       count_points: '%{count} punte'
-      ago: '%{time_in_words_ago} gelede'
       more: meer
       trace_details: Wys Besonderhede van die Spoor
       view_map: Wys kaart
@@ -1366,7 +1364,6 @@ af:
       remove as friend: Verwyder as vriend
       add as friend: Voeg by as vriend
       mapper since: 'Karteerder sedert:'
-      ago: (%{time_in_words_ago} gelede)
       email address: 'E-posadres:'
       created from: 'Geskep vanaf:'
       status: 'Status:'
@@ -1527,8 +1524,6 @@ af:
     show:
       title: '%{block_on} word deur %{block_by} versper'
       heading: '%{block_on} word deur %{block_by} versper'
-      time_future: Tyd oor %{time} verstreke.
-      time_past: Tyd is %{time} gelede verstreke
       status: Status
       show: Wys
       edit: Redigeer
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 5ac7501ec..495c79cea 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -1007,7 +1007,6 @@ aln:
     trace:
       pending: NË PRITJE
       count_points: '%{count} pikët'
-      ago: '%{time_in_words_ago} përpara'
       more: ma shumë
       trace_details: Kshyri detalet e të dhanave
       view_map: Kshyre Hartën
@@ -1195,7 +1194,6 @@ aln:
       remove as friend: heke si shok
       add as friend: shtoje si shoq
       mapper since: 'Hartues qe prej:'
-      ago: (para %{time_in_words_ago})
       email address: 'Email Adresa:'
       created from: 'U krijue prej:'
       status: 'Statuti:'
@@ -1425,8 +1423,6 @@ aln:
     show:
       title: '%{block_on} bllokuar nga %{block_by}'
       heading: '%{block_on} bllokuar nga %{block_by}'
-      time_future: Përfundon në %{time}
-      time_past: Përfundoi %{time} më parë
       status: Statusi
       show: Tregoj
       edit: Redaktoj
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 453f23176..a41ad16c1 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -192,14 +192,14 @@ ar:
   api:
     notes:
       comment:
-        opened_at_html: تم الإنشاء قبل %{when}
-        opened_at_by_html: تم الإنشاء قبل %{when} مِن قِبَل %{user}
-        commented_at_html: تم التحديث قبل %{when}
-        commented_at_by_html: تم التحديث قبل %{when} مِن قِبَل %{user}
-        closed_at_html: تم الحل قبل %{when}
-        closed_at_by_html: تم الحل قبل %{when} مِن قِبَل %{user}
-        reopened_at_html: تم التنشيط قبل %{when}
-        reopened_at_by_html: تم التنشيط قبل %{when} مِن قِبَل %{user}
+        opened_at_html: تم الإنشاء %{when}
+        opened_at_by_html: تم الإنشاء %{when} مِن قِبَل %{user}
+        commented_at_html: تم التحديث %{when}
+        commented_at_by_html: تم التحديث %{when} مِن قِبَل %{user}
+        closed_at_html: تم الحل %{when}
+        closed_at_by_html: تم الحل %{when} مِن قِبَل %{user}
+        reopened_at_html: تم التنشيط %{when}
+        reopened_at_by_html: تم التنشيط %{when} مِن قِبَل %{user}
       rss:
         title: ملاحظات خريطة الشارع المفتوحة
         description_area: قائمة بالملاحظات أو التقارير أو التعليق عليها أو إغلاقها
@@ -215,12 +215,12 @@ ar:
   browse:
     created: تم الإنشاء
     closed: تم الإغلاق
-    created_html: تم الإغلاق قبل <abbr title='%{title}'>%{time}</abbr>
-    closed_html: تم الإغلاق قبل <abbr title='%{title}'>%{time}</abbr>
-    created_by_html: تم الإنشاء قبل <abbr title='%{title}'>%{time}</abbr> على يد %{user}
-    deleted_by_html: تم الحذف قبل <abbr title='%{title}'>%{time}</abbr> على يد %{user}
-    edited_by_html: تم التعديل قبل <abbr title='%{title}'>%{time}</abbr> على يد %{user}
-    closed_by_html: تم الإغلاق قبل <abbr title='%{title}'>%{time}</abbr> على يد %{user}
+    created_html: تم الإغلاق <abbr title='%{title}'>%{time}</abbr>
+    closed_html: تم الإغلاق <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: تم الإنشاء <abbr title='%{title}'>%{time}</abbr> على يد %{user}
+    deleted_by_html: تم الحذف <abbr title='%{title}'>%{time}</abbr> على يد %{user}
+    edited_by_html: تم التعديل <abbr title='%{title}'>%{time}</abbr> على يد %{user}
+    closed_by_html: تم الإغلاق <abbr title='%{title}'>%{time}</abbr> على يد %{user}
     version: الإصدار
     in_changeset: مجموعة التغييرات
     anonymous: مجهول
@@ -240,9 +240,8 @@ ar:
       relation: الصلات (%{count})
       relation_paginated: الصلات (%{x}-%{y} من %{count})
       comment: التعليقات (%{count})
-      hidden_commented_by: تعليق مخفي من %{user} <abbr title='%{exact_time}'>%{when}
-        مضت</abbr>
-      commented_by: تعليق من %{user} <abbr title='%{exact_time}'>%{when} مضت</abbr>
+      hidden_commented_by: تعليق مخفي من %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: تعليق من %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: حزمة التغييرات XML
       osmchangexml: osmChange XML
       feed:
@@ -319,19 +318,17 @@ ar:
       open_title: 'ملاحظة لم يتم حلها: %{note_name}'
       closed_title: 'ملاحظات محلولة: %{note_name}'
       hidden_title: 'ملاحظة مخفيّة #%{note_name}'
-      open_by: أنشأه المستخدم %{user} قبل <abbr title='%{exact_time}'>%{when}</abbr>
-      open_by_anonymous: أنشأه مستخدم مجهول قبل  <abbr title='%{exact_time}'>%{when}
+      open_by: أنشأه المستخدم %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: أنشأه مستخدم مجهول <abbr title='%{exact_time}'>%{when} </abbr>
+      commented_by: تعليق من %{user} <abbr title='%{exact_time}'>%{when} </abbr>
+      commented_by_anonymous: تعليق من مجهول <abbr title='%{exact_time}'>%{when} </abbr>
+      closed_by: تم الحل بواسطة %{user} <abbr title='%{exact_time}'>%{when} </abbr>
+      closed_by_anonymous: تم الحل بواسطة مجهول <abbr title='%{exact_time}'>%{when}
         </abbr>
-      commented_by: تعليق من %{user} قبل <abbr title='%{exact_time}'>%{when} </abbr>
-      commented_by_anonymous: تعليق من مجهول قبل <abbr title='%{exact_time}'>%{when}
+      reopened_by: أعاد تنشيطه %{user}<abbr title='%{exact_time}'>%{when} </abbr>
+      reopened_by_anonymous: أعاد تنشيطه مجهول <abbr title='%{exact_time}'>%{when}
         </abbr>
-      closed_by: تم الحل بواسطة %{user} قبل <abbr title='%{exact_time}'>%{when} </abbr>
-      closed_by_anonymous: تم الحل بواسطة مجهول قبل <abbr title='%{exact_time}'>%{when}
-        </abbr>
-      reopened_by: أعاد تنشيطه %{user} قبل <abbr title='%{exact_time}'>%{when} </abbr>
-      reopened_by_anonymous: أعاد تنشيطه مجهول قبل <abbr title='%{exact_time}'>%{when}
-        </abbr>
-      hidden_by: أخفاه %{user} قبل <abbr title='%{exact_time}'>%{when} =</abbr>
+      hidden_by: أخفاه %{user} <abbr title='%{exact_time}'>%{when} =</abbr>
       report: أبلغ عن هذه الملاحظة
     query:
       title: ميزات الاستفهام
@@ -370,7 +367,7 @@ ar:
   changeset_comments:
     comment:
       comment: 'تعليق جديد على مجموعة التغيير #%{changeset_id} بواسطة %{author}'
-      commented_at_by_html: تم التحديث قبل %{when} بواسطة %{user}
+      commented_at_by_html: تم التحديث %{when} بواسطة %{user}
     comments:
       comment: 'تعليق جديد على مجموعة التغيير #%{changeset_id} بواسطة %{author}'
     index:
@@ -454,7 +451,6 @@ ar:
       post: إرسال
       when: متى
       comment: التعليق
-      ago: منذ %{ago}
       newer_comments: التعليقات الأحدث
       older_comments: التعليقات الأقدم
   geocoder:
@@ -1069,9 +1065,8 @@ ar:
       status: الحالة
       reports: بلاغات
       last_updated: آخر تحديث
-      last_updated_time_html: منذ <abbr title='%{title}'>%{time}</abbr>
-      last_updated_time_user_html: منذ <abbr title='%{title}'>%{time} </abbr> بواسطة
-        %{user}
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time} </abbr> بواسطة %{user}
       link_to_reports: عرض البلاغات
       reports_count:
         one: 1 بلاغ
@@ -1911,7 +1906,6 @@ ar:
     trace:
       pending: في الانتظار
       count_points: '%{count} نقطة'
-      ago: منذ %{time_in_words_ago}
       more: المزيد
       trace_details: اعرض تفاصيل الأثر
       view_map: اعرض الخريطة
@@ -2213,12 +2207,10 @@ ar:
       remove as friend: إلغاء الصداقة
       add as friend: أضف كصديق
       mapper since: 'مُخطط منذ:'
-      ago: منذ %{time_in_words_ago}
       ct status: 'شروط المساهم:'
       ct undecided: متردد
       ct declined: مرفوض
-      ct accepted: مقبول منذ %{ago}
-      latest edit: 'آخر تغيير %{ago}:'
+      latest edit: 'آخر تغيير (%{ago})::'
       email address: 'عنوان البريد الإلكتروني:'
       created from: 'أُنشِئ من:'
       status: 'الحالة:'
@@ -2466,7 +2458,7 @@ ar:
       title: إبطال العرقلة على %{block_on}
       heading: إبطال العرقلة على %{block_on} بواسطة %{block_by}
       time_future: هذه العرقلة ستنتهي في %{time}.
-      past: هذه العرقلة انتهت منذ %{time} ولا يمكن إبطالها الآن.
+      past: هذه العرقلة انتهت %{time} ولا يمكن إبطالها الآن.
       confirm: هل أنت متأكد أنك ترغب في إبطال هذه العرقلة ؟
       revoke: ابطل!
       flash: تم إبطال هذه العرقلة.
@@ -2474,7 +2466,7 @@ ar:
       time_future: ينتهي في %{time}.
       until_login: نشط حتى يقوم المستخدم بتسجيل الدخول.
       time_future_and_until_login: ينتهي في %{time} وبعد تسجيل دخول المستخدم.
-      time_past: انتهى منذ %{time}.
+      time_past: انتهى %{time}.
       block_duration:
         hours:
           few: '%{count} ساعات'
@@ -2504,10 +2496,7 @@ ar:
     show:
       title: '%{block_on} عُرقل بواسطة %{block_by}'
       heading: '%{block_on} عُرقل بواسطة %{block_by}'
-      time_future: ينتهي في %{time}
-      time_past: انتهى منذ %{time}
       created: تم الإنشاء
-      ago: قبل %{time}
       status: الحالة
       show: اعرض
       edit: تعديل
@@ -2541,9 +2530,6 @@ ar:
       description: الوصف
       created_at: أنشأ في
       last_changed: أحدث تغيير
-      ago_html: |2-
-
-        %{when} مضى
   javascripts:
     close: أغلق
     share:
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index b7aca2ca2..b9190caab 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -833,7 +833,6 @@ arz:
     trace:
       pending: فى الانتظار
       count_points: '%{count} نقطة'
-      ago: منذ %{time_in_words_ago}
       more: المزيد
       trace_details: اعرض تفاصيل الأثر
       view_map: اعرض الخريطة
@@ -997,7 +996,6 @@ arz:
       remove as friend: أزل كصديق
       add as friend: أضف كصديق
       mapper since: 'مُخطط منذ:'
-      ago: (منذ %{time_in_words_ago})
       email address: 'عنوان البريد الإلكتروني:'
       created from: 'أُنشىء من:'
       description: الوصف
@@ -1179,8 +1177,6 @@ arz:
     show:
       title: '%{block_on} عُرقل بواسطه %{block_by}'
       heading: '%{block_on} عُرقل بواسطه %{block_by}'
-      time_future: ينتهى فى %{time}
-      time_past: انتهى منذ %{time}
       status: الحالة
       show: اعرض
       edit: عدّل
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 901523188..59f744a06 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -384,7 +384,6 @@ ast:
       post: Publicar
       when: Cuándo
       comment: Comentariu
-      ago: hai %{ago}
       newer_comments: Comentarios más nuevos
       older_comments: Comentarios anteriores
   geocoder:
@@ -1849,7 +1848,6 @@ ast:
     trace:
       pending: PENDIENTE
       count_points: '%{count} puntos'
-      ago: hai %{time_in_words_ago}
       more: más
       trace_details: Amosar detalles de la traza
       view_map: Ver el Mapa
@@ -2149,12 +2147,10 @@ ast:
       remove as friend: Desaniciar como amigu
       add as friend: Amestar como amigu
       mapper since: 'Mapeador dende:'
-      ago: (hai %{time_in_words_ago})
       ct status: 'Términos de collaboración:'
       ct undecided: Indecisu
       ct declined: Refugada
-      ct accepted: Aceutada hai %{ago}
-      latest edit: 'Cabera edición %{ago}:'
+      latest edit: 'Cabera edición (%{ago}):'
       email address: 'Direición de corréu electrónicu:'
       created from: 'Creáu dende:'
       status: 'Estáu:'
@@ -2445,10 +2441,7 @@ ast:
     show:
       title: '%{block_on} bloquiáu por %{block_by}'
       heading: '%{block_on} bloquiáu por %{block_by}'
-      time_future: Fina en %{time}
-      time_past: Finó hai %{time}
       created: Creáu
-      ago: hai %{time}
       status: Estáu
       show: Amosar
       edit: Editar
@@ -2482,7 +2475,6 @@ ast:
       description: Descripción
       created_at: Creada el
       last_changed: Cambéu postreru
-      ago_html: hai %{when}
   javascripts:
     close: Zarrar
     share:
diff --git a/config/locales/az.yml b/config/locales/az.yml
index ed7b1c69a..19f7a2862 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -282,7 +282,6 @@ az:
       post: Post
       when: Nə vaxt
       comment: Şərh
-      ago: '%{ago} əvvəl'
       newer_comments: Yeni şərhlər
       older_comments: Köhnə Şərhlər
   geocoder:
@@ -1091,7 +1090,6 @@ az:
       diary: gündəlik
       remove as friend: dostluqdan silinmiş
       add as friend: dostluğa əlavə edilmiş
-      ct accepted: '%{ago} əvvəl qəbul edilib'
       latest edit: 'Son redaktə %{ago}:'
       email address: 'E-poçt ünvanı:'
       status: 'Status:'
@@ -1173,7 +1171,6 @@ az:
       title: '%{name} tərəfindən blok edilib'
     show:
       title: '%{block_on}, %{block_by} tərəfindən blok edilib'
-      time_past: '%{time} əvvəl sona çatıb'
       status: Status
       show: 'Göstər:'
       revoke: Ləğv et!
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index bf585b2e5..826670aaf 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1115,7 +1115,6 @@ be-Tarask:
     trace:
       pending: ЧАКАЕ
       count_points: '%{count} пунктаў'
-      ago: '%{time_in_words_ago} таму'
       more: болей
       trace_details: Паказаць падрабязнасьці трэку
       view_map: Прагляд мапы
@@ -1334,11 +1333,9 @@ be-Tarask:
       remove as friend: Выдаліць зь сяброў
       add as friend: Дадаць у сябры
       mapper since: 'Стварае мапы з:'
-      ago: (%{time_in_words_ago} таму)
       ct status: 'Умовы супрацоўніцтва:'
       ct undecided: Нявырашана
       ct declined: Адхіленыя
-      ct accepted: Прынятыя %{ago} таму
       latest edit: 'Апошняе рэдагаваньне %{ago}:'
       email address: 'Адрас электроннай пошты:'
       created from: 'Створана з:'
@@ -1593,8 +1590,6 @@ be-Tarask:
     show:
       title: '%{block_on} заблякаваны %{block_by}'
       heading: '%{block_on} заблякаваны %{block_by}'
-      time_future: Канчаецца ў %{time}
-      time_past: Скончылася %{time} таму
       status: Статус
       show: Паказаць
       edit: Рэдагаваць
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 07c180296..31463a4f9 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -387,7 +387,6 @@ be:
       post: Апублікаваць
       when: Калі
       comment: Каментар
-      ago: '%{ago} таму'
       newer_comments: Навейшыя каментары
       older_comments: Старэйшыя каментары
   geocoder:
@@ -1858,7 +1857,6 @@ be:
     trace:
       pending: У ЧАРЗЕ
       count_points: '%{count} пунктаў'
-      ago: '%{time_in_words_ago} таму'
       more: яшчэ
       trace_details: Прагледзець уласцівасці следу
       view_map: Прагледзець карту
@@ -2156,11 +2154,9 @@ be:
       remove as friend: Выдаліць з сяброў
       add as friend: Пасябраваць
       mapper since: 'Малюе карту з:'
-      ago: (%{time_in_words_ago} таму)
       ct status: 'Умовы ўдзелу:'
       ct undecided: Нявырашана
       ct declined: Адхіленыя
-      ct accepted: Прынята %{ago} таму
       latest edit: 'Апошняе рэдагаванне %{ago}:'
       email address: 'Адрас электроннай пошты:'
       created from: 'Створана з:'
@@ -2449,10 +2445,7 @@ be:
     show:
       title: '%{block_on} заблакіраваны %{block_by}'
       heading: '%{block_on} заблакіраваны %{block_by}'
-      time_future: Заканчваецца праз %{time}
-      time_past: Скончылася %{time} таму
       created: Створаны
-      ago: '%{time} таму'
       status: Статус
       show: Паказаць
       edit: Рэдагаваць
@@ -2487,7 +2480,6 @@ be:
       description: Апісанне
       created_at: Створаны ў
       last_changed: Апошнія змены
-      ago_html: '%{when} таму'
   javascripts:
     close: Закрыць
     share:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index fd83eece7..c1d40bf43 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -287,7 +287,6 @@ bg:
       post: Публикация
       when: Кога
       comment: Коментар
-      ago: преди %{ago}
       newer_comments: По-нови коментари
       older_comments: По-стари коментари
   geocoder:
@@ -1255,7 +1254,6 @@ bg:
       confirm: Потвърждаване
   user_blocks:
     show:
-      ago: преди %{time}
       edit: Редактиране
     block:
       edit: Редактиране
@@ -1268,7 +1266,6 @@ bg:
   notes:
     mine:
       creator: Автор
-      ago_html: преди %{when}
   javascripts:
     close: Затваряне
     share:
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index fe1d8467b..bf2943dfa 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -361,7 +361,6 @@ bn:
       post: পোস্ট
       when: কখন
       comment: মন্তব্য
-      ago: '%{ago} আগে'
       newer_comments: নতুন মন্তব্য
       older_comments: পুরাতন মন্তব্য
   geocoder:
@@ -1284,7 +1283,6 @@ bn:
     trace:
       pending: অমিমাংসিত
       count_points: '%{count} পয়েন্ট'
-      ago: '%{time_in_words_ago} পূর্বে'
       more: আরও
       trace_details: অনুসরণের বিস্তারিত দেখুন
       view_map: মানচিত্র দেখুন
@@ -1481,7 +1479,6 @@ bn:
   user_blocks:
     show:
       created: তৈরি হয়েছে
-      ago: '%{time} আগে'
       status: স্থিতি
       show: দেখাও
       edit: সম্পাদনা
diff --git a/config/locales/br.yml b/config/locales/br.yml
index b0fe8cfd3..f10cc754f 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -391,7 +391,6 @@ br:
       post: Postañ
       when: Peur
       comment: Addispleg
-      ago: '%{ago} zo'
       newer_comments: Evezhiadennoù neveso'h
       older_comments: Evezhiadennoù koshañ
   geocoder:
@@ -1866,7 +1865,6 @@ br:
     trace:
       pending: WAR C'HORTOZ
       count_points: '%{count} poent'
-      ago: '%{time_in_words_ago} zo'
       more: muioc'h
       trace_details: Gwelet munudoù ar roud
       view_map: Gwelet ar gartenn
@@ -2167,11 +2165,9 @@ br:
       remove as friend: Lemel eus ar vignoned
       add as friend: Ouzhpennañ d'ar vignoned
       mapper since: 'Kartennour abaoe :'
-      ago: (%{time_in_words_ago} zo)
       ct status: 'Diferadennoù ar c''henlabourer :'
       ct undecided: En entremar
       ct declined: Nac'het
-      ct accepted: Degemeret %{ago} zo
       latest edit: 'Kemm ziwezhañ %{ago} :'
       email address: 'Chomlec''h postel :'
       created from: 'Krouet diwar :'
@@ -2463,10 +2459,7 @@ br:
     show:
       title: '%{block_on} stanket gant %{block_by}'
       heading: '%{block_on} stanket gant %{block_by}'
-      time_future: Echuiñ a ray a-benn %{time}
-      time_past: Echuet %{time} zo
       created: Krouet
-      ago: '%{time}zo'
       status: Statud
       show: Diskouez
       edit: Aozañ
@@ -2500,7 +2493,6 @@ br:
       description: Deskrivadur
       created_at: Krouet e
       last_changed: Kemm diwezhañ
-      ago_html: '%{when} zo'
   javascripts:
     close: Serriñ
     share:
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index e51168ae7..f42ba84f8 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -308,7 +308,6 @@ bs:
       post: Post
       when: Kada
       comment: Komentar
-      ago: '%{ago} prije'
       newer_comments: Noviji komentari
       older_comments: Stariji komentari
   geocoder:
@@ -1335,7 +1334,6 @@ bs:
     trace:
       pending: NA ČEKANJU
       count_points: '%{count} tačaka'
-      ago: prije %{time_in_words_ago}
       more: više
       trace_details: Pogledati detalje trase
       view_map: Pogledati kartu
@@ -1567,11 +1565,9 @@ bs:
       remove as friend: ukloniti kao prijatelja
       add as friend: dodati prijatelja
       mapper since: 'Maper od:'
-      ago: (%{time_in_words_ago} prije)
       ct status: 'Uslovi za doprinosioce:'
       ct undecided: Neodlučen
       ct declined: Odbijeno
-      ct accepted: Prihvaćeno prije %{ago}
       latest edit: 'Najnovija izmjena %{ago}:'
       email address: 'Adresa e-pošte:'
       created from: 'Napravljeno iz:'
@@ -1820,10 +1816,7 @@ bs:
     show:
       title: '%{block_on} blokiran od strane %{block_by}'
       heading: '%{block_on} blokiran od strane %{block_by}'
-      time_future: Završava u %{time}
-      time_past: Završeno prije %{time}
       created: Napravljeno
-      ago: '%{time} prije'
       status: Stanje
       show: Pokazati
       edit: Urediti
@@ -1854,7 +1847,6 @@ bs:
       description: Opis
       created_at: 'Napravljeno:'
       last_changed: Posljednja izmjena
-      ago_html: prije %{when}
   javascripts:
     close: Zatvori
     share:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 7b10a4f11..59e55da28 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -406,7 +406,6 @@ ca:
       post: Publica
       when: Quan
       comment: Comentari
-      ago: fa %{ago}
       newer_comments: Comentaris recents
       older_comments: Comentaris antics
   geocoder:
@@ -1745,7 +1744,6 @@ ca:
     trace:
       pending: PENDENT
       count_points: '%{count} punts'
-      ago: fa %{time_in_words_ago}
       more: més
       trace_details: Mostra els detalls de la traça
       view_map: Visualitza el mapa
@@ -2034,11 +2032,9 @@ ca:
       remove as friend: Deixa l'amistat
       add as friend: Afegeix com a amic
       mapper since: 'Cartografiant des de:'
-      ago: (fa %{time_in_words_ago})
       ct status: 'Termes del col·laborador:'
       ct undecided: No decidit
       ct declined: Declinats
-      ct accepted: Acceptada fa %{ago}
       latest edit: 'Última edició %{ago}:'
       email address: 'Adreça de correu:'
       created from: 'Creat a partir de:'
@@ -2315,6 +2311,18 @@ ca:
         hours:
           one: 1 hora
           other: '%{count} hores'
+        days:
+          one: 1 dia
+          other: '%{count} dies'
+        weeks:
+          one: 1 setmana
+          other: '%{count} setmanes'
+        months:
+          one: 1 mes
+          other: '%{count} mesos'
+        years:
+          one: 1 any
+          other: '%{count} anys'
     blocks_on:
       title: Blocs en %{name}
       heading: Llista de quadres a %{name}
@@ -2326,10 +2334,7 @@ ca:
     show:
       title: '%{block_on} blocat per %{block_by}'
       heading: '%{block_on} blocat per %{block_by}'
-      time_future: Finalitza en %{time}
-      time_past: Va acabar fa %{time}
       created: Creat
-      ago: fa %{time}
       status: Estat
       show: Mostra
       edit: Edició
@@ -2363,7 +2368,6 @@ ca:
       description: Descripció
       created_at: Creat a
       last_changed: Últim canvi
-      ago_html: fa %{when}
   javascripts:
     close: Tanca
     share:
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index b734cf467..499790362 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -360,7 +360,6 @@ ce:
       post: Пост
       when: Маца
       comment: Коммент
-      ago: '%{ago} юха'
       newer_comments: Керла комменташ
       older_comments: Шира комменташ
   geocoder:
@@ -837,7 +836,6 @@ ce:
       start_coordinates: 'Координати юьхь:'
       visibility: 'Гуш хилар:'
     trace:
-      ago: '%{time_in_words_ago} юха'
       in: цу
   oauth_clients:
     index:
@@ -907,11 +905,9 @@ ce:
       remove as friend: ДӀаваккха доттагӀийн юкъара
       add as friend: ДоттагӀийн юкъатоха
       mapper since: 'ДӀавазвелла:'
-      ago: (%{time_in_words_ago} юха)
       ct status: 'Дакъалацарна хьоьлаш:'
       ct undecided: Билгала цайина
       ct declined: Юхатоьхна
-      ct accepted: ТӀеэцна %{ago} хьалха
       latest edit: 'ТӀеххьара нисдар %{ago}:'
       email address: 'Email адрес:'
       created from: 'Кхоьллина:'
@@ -973,7 +969,6 @@ ce:
           other: '%{count} сахьт'
     show:
       created: Кхоьллина
-      ago: '%{time} хьалха'
       status: Хьал
       show: Гайта
       edit: Хийца
@@ -1003,7 +998,6 @@ ce:
       description: Цуьнах лаьцна
       created_at: Кхоьллина
       last_changed: Хийцина
-      ago_html: '%{when} хьалха'
   javascripts:
     close: ДӀачӀагӀа
     share:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 0671a87e3..e324578c1 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -419,7 +419,6 @@ cs:
       post: Záznam
       when: Kdy
       comment: Komentář
-      ago: před %{ago}
       newer_comments: Novější komentáře
       older_comments: Starší komentáře
   geocoder:
@@ -1864,7 +1863,6 @@ cs:
     trace:
       pending: ZPRACOVÁVÁ SE
       count_points: '%{count} bodů'
-      ago: před %{time_in_words_ago}
       more: více
       trace_details: Zobrazit podrobnosti stopy
       view_map: Zobrazit mapu
@@ -2158,11 +2156,9 @@ cs:
       remove as friend: Odebrat z přátel
       add as friend: Přidat do přátel
       mapper since: 'Účastník projektu od:'
-      ago: (před %{time_in_words_ago})
       ct status: 'Podmínky pro přispěvatele:'
       ct undecided: Nerozhodnuto
       ct declined: Odmítnuty
-      ct accepted: Přijaty před %{ago}
       latest edit: 'Poslední editace %{ago}:'
       email address: 'E-mailová adresa:'
       created from: 'Vytvořeno od:'
@@ -2445,10 +2441,7 @@ cs:
     show:
       title: '%{block_on} zablokován uživatelem %{block_by}'
       heading: '%{block_on} zablokován uživatelem %{block_by}'
-      time_future: Končí za %{time}.
-      time_past: Ukončeno před %{time}
       created: Vytvořen
-      ago: před %{time}
       status: Stav
       show: Zobrazit
       edit: Upravit
@@ -2482,7 +2475,6 @@ cs:
       description: Popis
       created_at: Vytvořeno
       last_changed: Poslední změna
-      ago_html: před %{when}
   javascripts:
     close: Zavřít
     share:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 05b208b55..96374947e 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -349,7 +349,6 @@ cy:
       post: Post
       when: Pa bryd
       comment: Sylw
-      ago: '%{ago} yn ôl'
       newer_comments: Sylwadau mwy diweddar
       older_comments: Hen Sylwadau
   geocoder:
@@ -1287,7 +1286,6 @@ cy:
       showing_page: Tudalen %{page}
     trace:
       count_points: '%{count} pwynt'
-      ago: '%{time_in_words_ago} yn ôl'
       more: mwy
       view_map: Gweld Map
       edit: golygu
@@ -1428,11 +1426,9 @@ cy:
       remove as friend: Peidio bod yn ffrind
       add as friend: Ychwanegu Cyfaill
       mapper since: 'Yn fapiwr ers:'
-      ago: (%{time_in_words_ago} yn ôl)
       ct status: 'Telerau cyfrannwr:'
       ct undecided: Heb Benderfynu
       ct declined: Wedi Gwrthod
-      ct accepted: Derbynwyd %{ago} yn ôl%
       email address: 'Cyfeiriad ebost:'
       created from: 'Creuwyd o:'
       status: 'Statws:'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 685d3734b..c3de169ca 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -412,7 +412,6 @@ da:
       post: Indsend
       when: Hvornår
       comment: Kommentar
-      ago: '%{ago} siden'
       newer_comments: Nyere kommentarer
       older_comments: Ældre kommentarer
   geocoder:
@@ -1894,7 +1893,6 @@ da:
     trace:
       pending: VENTENDE
       count_points: '%{count} punkter'
-      ago: '%{time_in_words_ago} siden'
       more: detaljer
       trace_details: Vis spordetaljer
       view_map: Vis kort
@@ -2203,11 +2201,9 @@ da:
       remove as friend: Fjern som ven
       add as friend: Tilføj som ven
       mapper since: 'Kortlægger siden:'
-      ago: (%{time_in_words_ago} siden)
       ct status: 'Vilkår for bidragsydere:'
       ct undecided: Uafklaret
       ct declined: Afslået
-      ct accepted: Accepteret for %{ago} siden
       latest edit: 'Seneste ændring %{ago}:'
       email address: 'E-mailadresse:'
       created from: 'Oprettet fra:'
@@ -2506,10 +2502,7 @@ da:
     show:
       title: '%{block_on} blokeret af %{block_by}'
       heading: '%{block_on} blokeret af %{block_by}'
-      time_future: Slutter om %{time}
-      time_past: Sluttede %{time} siden
       created: Oprettet
-      ago: '%{time} siden'
       status: Status
       show: Vis
       edit: Redigér
@@ -2543,7 +2536,6 @@ da:
       description: Beskrivelse
       created_at: Oprettet den
       last_changed: Sidst ændret
-      ago_html: '%{when} siden'
   javascripts:
     close: Luk
     share:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index bf321a0e8..da23002fa 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -456,7 +456,6 @@ de:
       post: Blogeintrag
       when: Zeitpunkt
       comment: Kommentar
-      ago: vor %{ago}
       newer_comments: Neuere Kommentare
       older_comments: Ältere Kommentare
   geocoder:
@@ -1960,7 +1959,6 @@ de:
     trace:
       pending: WARTEND
       count_points: '%{count} Punkte'
-      ago: vor %{time_in_words_ago}
       more: Details
       trace_details: Details des Tracks anzeigen
       view_map: Karte anzeigen
@@ -2281,11 +2279,9 @@ de:
       remove as friend: Freund entfernen
       add as friend: Freund hinzufügen
       mapper since: 'Mapper seit:'
-      ago: (%{time_in_words_ago} her)
       ct status: 'Bedingungen für Mitwirkende:'
       ct undecided: Unentschlossen
       ct declined: Abgelehnt
-      ct accepted: '%{ago} akzeptiert'
       latest edit: 'Letzte Änderung %{ago}:'
       email address: 'E-Mail-Adresse:'
       created from: 'erstellt aus:'
@@ -2583,10 +2579,7 @@ de:
     show:
       title: '%{block_on} gesperrt durch  %{block_by}'
       heading: '%{block_on} gesperrt durch %{block_by}'
-      time_future: Endet in %{time}
-      time_past: Geendet vor %{time}
       created: Erstellt
-      ago: vor %{time}
       status: Status
       show: anzeigen
       edit: Bearbeiten
@@ -2621,7 +2614,6 @@ de:
       description: Hinweis
       created_at: Erstellt am
       last_changed: Zuletzt geändert
-      ago_html: vor %{when}
   javascripts:
     close: Schließen
     share:
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 636df3fdb..b1dfd6e36 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -265,7 +265,6 @@ diq:
       post: Bırışe
       when: Key
       comment: Mışewre
-      ago: Verdê %{ago}
       newer_comments: Tewr Vatışê Newey
       older_comments: Vatışo Tewr Kehan
   geocoder:
@@ -864,7 +863,6 @@ diq:
     trace:
       pending: PAWEDEYO
       count_points: '%{count} puan'
-      ago: '%{time_in_words_ago} veror'
       more: dehana vêşi
       trace_details: Teferruatanê rêça bıvin
       view_map: Xeriti Bımocnê
@@ -955,10 +953,8 @@ diq:
       remove as friend: Embazan ra vec
       add as friend: Embazi cı ke
       mapper since: 'Demê herdnigarwaniye:'
-      ago: (%{time_in_words_ago} ver)
       ct undecided: Darıdeyo
       ct declined: Red kerd
-      ct accepted: Verdê %{ago} qebul ke
       latest edit: 'vurnayışê peyênê %{ago}:'
       email address: 'Adresa e-postey:'
       created from: 'Vıraşten ra:'
@@ -1081,8 +1077,6 @@ diq:
     show:
       title: Karber %{block_by} karber %{block_on} ke bloqe
       heading: Karber %{block_by} karber %{block_on} ke bloqe
-      time_future: '%{time} dı bıqediyo'
-      time_past: Verdê %{time} qedya
       status: Weziyet
       show: Bımocne
       edit: Bıvurne
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index da2aaa8bc..4e86e9672 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -349,7 +349,6 @@ dsb:
       post: Powěsć
       when: Cas
       comment: Komentar
-      ago: pśed %{ago}
       newer_comments: Nowše komentary
       older_comments: Starše komentary
   geocoder:
@@ -1479,7 +1478,6 @@ dsb:
     trace:
       pending: Njedocynjony
       count_points: '%{count} dypkow'
-      ago: pśed %{time_in_words_ago}
       more: wěcej
       trace_details: Drobnostki slěda pokazaś
       view_map: Kórtu pokazaś
@@ -1728,11 +1726,9 @@ dsb:
       remove as friend: Ako pśijaśela wótpóraś
       add as friend: Pśijaśela pśidaś
       mapper since: 'Kartěrowaŕ wót:'
-      ago: (pśed %{time_in_words_ago})
       ct status: 'Wuměnjenja za sobustatkujucych:'
       ct undecided: Njerozsuźony
       ct declined: Wótpokazany
-      ct accepted: Pśed %{ago} akceptěrowany
       latest edit: 'Nejnowša změna %{ago}:'
       email address: 'E-mailowa adresa:'
       created from: 'Napórany z:'
@@ -1992,8 +1988,6 @@ dsb:
     show:
       title: '%{block_on} zablokěrowany wót %{block_by}'
       heading: '%{block_on} jo se zablokěrował wót %{block_by}'
-      time_future: Kóńcy se %{time}
-      time_past: Jo se pśed %{time} skóńcyło
       status: Status
       show: Pokazaś
       edit: Wobźěłaś
@@ -2027,7 +2021,6 @@ dsb:
       description: Wopis
       created_at: Napórany
       last_changed: Slědny raz změnjony
-      ago_html: pśed %{when}
   javascripts:
     close: Zacyniś
     share:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 80111bc12..365b5fc11 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -414,7 +414,6 @@ el:
       post: Καταχώριση
       when: Πότε
       comment: Σχόλιο
-      ago: πριν από %{ago}
       newer_comments: Νεότερα Σχόλια
       older_comments: Παλαιότερα Σχόλια
   geocoder:
@@ -1898,7 +1897,6 @@ el:
     trace:
       pending: ΕΚΚΡΕΜΕΙ
       count_points: '%{count} σημεία'
-      ago: '%{time_in_words_ago} πριν'
       more: περισσότερα
       trace_details: Προβολή Λεπτομερειών Ίχνους
       view_map: Προβολή Χάρτη
@@ -2203,11 +2201,9 @@ el:
       remove as friend: Αφαίρεση Φίλου
       add as friend: Προσθήκη Φίλου
       mapper since: 'Χαρτογράφος από:'
-      ago: (%{time_in_words_ago} πριν)
       ct status: 'Όροι συνεισφοράς:'
       ct undecided: Αναποφάσιστος
       ct declined: Απόρριψη
-      ct accepted: Αποδοχή %{ago} πριν
       latest edit: 'Τελευταία επεξεργασία %{ago}:'
       email address: 'Διεύθυνση Ηλ. Ταχυδρομείου:'
       created from: 'Δημιουργήθηκε από:'
@@ -2508,10 +2504,7 @@ el:
     show:
       title: Ο %{block_on} έχει φραχτεί από τον %{block_by}
       heading: Ο %{block_on} έχει φραχτεί από τον %{block_by}
-      time_future: Τελειώνει σε %{time}
-      time_past: Τελείωσε %{time} πριν
       created: Δημιουργήθηκε
-      ago: πρίν από %{time}
       status: Κατάσταση
       show: Εμφάνιση
       edit: Επεξεργασία
@@ -2545,7 +2538,6 @@ el:
       description: Περιγραφή
       created_at: Δημιουργήθηκε στις
       last_changed: Τελευταία αλλαγή
-      ago_html: '%{when} πριν'
   javascripts:
     close: Κλείσιμο
     share:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2feac5deb..1827558cc 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -389,7 +389,6 @@ en-GB:
       post: Post
       when: When
       comment: Comment
-      ago: '%{ago} ago'
       newer_comments: Newer Comments
       older_comments: Older Comments
   geocoder:
@@ -1666,7 +1665,6 @@ en-GB:
     trace:
       pending: PENDING
       count_points: '%{count} points'
-      ago: '%{time_in_words_ago} ago'
       more: more
       trace_details: View Trace Details
       view_map: View Map
@@ -1960,11 +1958,9 @@ en-GB:
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: 'Mapper since:'
-      ago: (%{time_in_words_ago} ago)
       ct status: 'Contributor terms:'
       ct undecided: Undecided
       ct declined: Declined
-      ct accepted: Accepted %{ago} ago
       latest edit: 'Latest edit %{ago}:'
       email address: 'Email address:'
       created from: 'Created from:'
@@ -2245,10 +2241,7 @@ en-GB:
     show:
       title: '%{block_on} blocked by %{block_by}'
       heading: '%{block_on} blocked by %{block_by}'
-      time_future: Ends in %{time}
-      time_past: Ended %{time} ago
       created: Created
-      ago: '%{time} ago'
       status: Status
       show: Show
       edit: Edit
@@ -2282,7 +2275,6 @@ en-GB:
       description: Description
       created_at: Created at
       last_changed: Last changed
-      ago_html: '%{when} ago'
   javascripts:
     close: Close
     share:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 520ed9b26..561ec520c 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -440,7 +440,6 @@ eo:
       post: Afiŝi
       when: Kiam
       comment: Komenti
-      ago: antaÅ­ %{ago}
       newer_comments: Pli novaj komentoj
       older_comments: Pli malnovaj komentoj
   geocoder:
@@ -1886,7 +1885,6 @@ eo:
     trace:
       pending: OKAZONTA
       count_points: '%{count} punktoj'
-      ago: AntaÅ­  %{time_in_words_ago}
       more: pli
       trace_details: Vidi detalojn de spuro
       view_map: Vidi mapon
@@ -2193,11 +2191,9 @@ eo:
       remove as friend: Eksamikigi
       add as friend: Aldoni kiel amikon
       mapper since: 'Mapigisto ekde:'
-      ago: (antaÅ­ %{time_in_words_ago})
       ct status: 'Interkonsento pri kontribuado:'
       ct undecided: ne decidita
       ct declined: malakceptita
-      ct accepted: akceptita antaÅ­ %{ago}
       latest edit: Lasta redakto %{ago}
       email address: 'Retpoŝtadreso:'
       created from: 'Kreita de:'
@@ -2490,10 +2486,7 @@ eo:
     show:
       title: '%{block_on} blokita de %{block_by}'
       heading: '%{block_on} blokita de %{block_by}'
-      time_future: Finiĝas %{time}
-      time_past: Finiĝis antaŭ %{time}
       created: Kreita
-      ago: antaÅ­ %{time}
       status: Stato
       show: Montri
       edit: Redakti
@@ -2527,7 +2520,6 @@ eo:
       description: Priskribo
       created_at: Kreita je
       last_changed: Laste ŝanĝita
-      ago_html: antaÅ­ %{when}
   javascripts:
     close: Fermi
     share:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 7f8c43c45..4b3f88268 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -159,6 +159,45 @@ es:
         description: Descripción
         languages: Idiomas
         pass_crypt: Contraseña
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: hace cerca de 1 hora
+        other: hace cerca de %{count} horas
+      about_x_months:
+        one: hace cerca de 1 mes
+        other: hace cerca de %{count} meses
+      about_x_years:
+        one: hace cerca de 1 año
+        other: hace cerca de %{count} años
+      almost_x_years:
+        one: hace casi 1 año
+        other: hace casi %{count} años
+      half_a_minute: hace medio minuto
+      less_than_x_seconds:
+        one: hace menos de 1 segundo
+        other: hace menos de %{count} segundos
+      less_than_x_minutes:
+        one: hace menos de 1 minuto
+        other: hace menos de %{count} minutos
+      over_x_years:
+        one: hace más de 1 año
+        other: hace más de %{count} años
+      x_seconds:
+        one: hace 1 segundo
+        other: hace %{count} segundos
+      x_minutes:
+        one: hace 1 minuto
+        other: hace %{count} minutos
+      x_days:
+        one: ayer
+        other: hace %{count} días
+      x_months:
+        one: hace 1 mes
+        other: hace %{count} meses
+      x_years:
+        one: hace 1 año
+        other: hace %{count} años
   printable_name:
     with_name_html: '%{name} (%{id})'
   editor:
@@ -443,7 +482,6 @@ es:
       post: Publicación
       when: Cuando
       comment: Comentario
-      ago: hace %{ago}
       newer_comments: Comentarios más recientes
       older_comments: Comentarios más antiguos
   geocoder:
@@ -1920,7 +1958,6 @@ es:
     trace:
       pending: PENDIENTE
       count_points: '%{count} puntos'
-      ago: hace %{time_in_words_ago}
       more: más
       trace_details: Ver detalles de la traza
       view_map: Ver mapa
@@ -2224,11 +2261,9 @@ es:
       remove as friend: Eliminar como amigo
       add as friend: Añadir como amigo
       mapper since: 'Mapeando desde:'
-      ago: (hace %{time_in_words_ago})
       ct status: 'Términos del colaborador:'
       ct undecided: Indeciso
       ct declined: Rechazado
-      ct accepted: Aceptado hace %{ago}
       latest edit: 'Última edición %{ago}:'
       email address: 'Dirección de correo electrónico:'
       created from: 'Creado a partir de:'
@@ -2537,10 +2572,7 @@ es:
     show:
       title: '%{block_on} bloqueado por %{block_by}'
       heading: '%{block_on} bloqueado por %{block_by}'
-      time_future: Finaliza en %{time}
-      time_past: Finalizado hace %{time}
       created: Creado
-      ago: hace %{time}
       status: Estado
       show: Mostrar
       edit: Editar
@@ -2575,7 +2607,6 @@ es:
       description: Descripción
       created_at: Creado el
       last_changed: Última modificación
-      ago_html: hace %{when}
   javascripts:
     close: Cerrar
     share:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 8340e8218..12af47826 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -377,7 +377,6 @@ et:
       post: Postitus
       when: Millal
       comment: Kommentaar
-      ago: '%{ago} tagasi'
       newer_comments: Uuemad kommentaarid
       older_comments: Vanemad kommentaarid
   geocoder:
@@ -1569,7 +1568,6 @@ et:
     trace:
       pending: OOTEL
       count_points: '%{count} punkti'
-      ago: '%{time_in_words_ago} tagasi'
       more: rohkem
       trace_details: Vaata raja üksikasju
       view_map: Vaata kaarti
@@ -1832,11 +1830,9 @@ et:
       remove as friend: eemalda sõprade hulgast
       add as friend: Lisa sõbraks
       mapper since: 'Kaardistaja alates:'
-      ago: (%{time_in_words_ago} tagasi)
       ct status: 'Kaastöötingimused:'
       ct undecided: Otsustamata
       ct declined: Tagasi lükatud
-      ct accepted: Vastu võetud %{ago}  tagasi
       latest edit: 'Viimane muudatus %{ago}:'
       email address: 'E-posti aadress:'
       created from: 'Loodud:'
@@ -2117,10 +2113,7 @@ et:
     show:
       title: 'Blokeeritud: %{block_on} (blokeerinud %{block_by})'
       heading: 'Blokeeritud: %{block_on} (blokeerinud %{block_by})'
-      time_future: Lõpeb %{time}
-      time_past: Lõppes %{time} tagasi
       created: Loodud
-      ago: '%{time} tagasi'
       status: Olek
       show: Näita
       edit: Redigeeri
@@ -2154,7 +2147,6 @@ et:
       description: Kirjeldus
       created_at: Loodud
       last_changed: Viimati muudetud
-      ago_html: '%{when} tagasi'
   javascripts:
     close: Sulge
     share:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index f61c45d69..1f680045d 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -403,7 +403,6 @@ eu:
       post: Argitaratu
       when: Noiz
       comment: Iruzkina
-      ago: Duela %{ago}
       newer_comments: Iruzkin berriagoak
       older_comments: Iruzkin zaharragoak
   geocoder:
@@ -1863,7 +1862,6 @@ eu:
     trace:
       pending: PRIBATUA
       count_points: '%{count} puntu'
-      ago: duela %{time_in_words_ago}
       more: gehiago
       trace_details: Ikusi Aztarna Xehetasunak
       view_map: Mapa ikusi
@@ -2163,11 +2161,9 @@ eu:
       remove as friend: Lagun bezala kendu
       add as friend: Lagun bezala gehitu
       mapper since: 'Noiztik mapatzaile:'
-      ago: (duela %{time_in_words_ago})
       ct status: 'Kolaboratzaile terminoak:'
       ct undecided: Erabakigabea
       ct declined: Ez da onartu
-      ct accepted: Duela %{ago} onartua
       latest edit: 'Azken aldaketa %{ago}:'
       email address: 'Eposta helbidea:'
       created from: 'Hemendik sortua:'
@@ -2456,10 +2452,7 @@ eu:
     show:
       title: '%{block_on} %{block_by}k blokeatu du'
       heading: '%{block_on} %{block_by}k blokeatu du'
-      time_future: '%{time}n bukatzen du'
-      time_past: Duela %{time} bukatua
       created: Sortua
-      ago: duela %{time}
       status: Egoera
       show: Erakutsi
       edit: Aldatu
@@ -2493,7 +2486,6 @@ eu:
       description: Deskribapena
       created_at: 'Non sortua:'
       last_changed: Azkenik aldaketua
-      ago_html: Duela %{when}
   javascripts:
     close: Itxi
     share:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 461fe9188..74710c712 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -415,7 +415,6 @@ fa:
       post: روزنوشت
       when: زمان
       comment: نظر
-      ago: '%{ago} قبل'
       newer_comments: نظرات جدیدتر
       older_comments: نظرات قدیمی‌تر
   geocoder:
@@ -1855,7 +1854,6 @@ fa:
     trace:
       pending: در انتظار
       count_points: ‏%{count} نقطه
-      ago: '%{time_in_words_ago} پیش'
       more: بیشتر
       trace_details: مشاهده جزئیات رد
       view_map: نمایش نقشه
@@ -2156,11 +2154,9 @@ fa:
       remove as friend: لغو دوستی
       add as friend: افزودن دوست
       mapper since: 'آغاز نقشه‌کشی از:'
-      ago: (%{time_in_words_ago} پیش)
       ct status: 'شرایط مشارکت‌کننده:'
       ct undecided: بلاتکلیف
       ct declined: رد شده
-      ct accepted: '%{ago} پیش پذیرفته شد'
       latest edit: 'آخرین ویرایش %{ago}:'
       email address: 'نشانی ایمیل:'
       created from: 'ایجادشده از:'
@@ -2441,10 +2437,7 @@ fa:
     show:
       title: '%{block_on} توسط %{block_by} مسدود شده'
       heading: '%{block_on} توسط %{block_by} مسدود شده'
-      time_future: '%{time} دیگر پایان می‌یابد'
-      time_past: '%{time} پیش پایان یافت'
       created: زمان ایجاد
-      ago: '%{time} پیش'
       status: وضعیت
       show: نمایش
       edit: ویرایش
@@ -2478,7 +2471,6 @@ fa:
       description: شرح
       created_at: ایجاد شده در
       last_changed: آخرین تغییر
-      ago_html: '%{when} پیش'
   javascripts:
     close: بستن
     share:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 020bc5373..23c5cc8d7 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -420,7 +420,6 @@ fi:
       post: Kommentti
       when: Päiväys
       comment: Kommentti
-      ago: '%{ago} sitten'
       newer_comments: Uudemmat kommentit
       older_comments: Vanhemmat kommentit
   geocoder:
@@ -1883,7 +1882,6 @@ fi:
       count_points:
         one: '%{count} piste'
         other: '%{count} pistettä'
-      ago: '%{time_in_words_ago} sitten'
       more: tiedot
       trace_details: Näytä jäljen tiedot
       view_map: Selaa karttaa
@@ -2181,11 +2179,9 @@ fi:
       remove as friend: Poista kavereista
       add as friend: Lisää kaveriksi
       mapper since: 'Rekisteröitymispäivämäärä:'
-      ago: (%{time_in_words_ago} sitten)
       ct status: 'Osallistumisehdot:'
       ct undecided: Ei valittu
       ct declined: Hylätty
-      ct accepted: Hyväksytty %{ago} sitten
       latest edit: 'Viimeisin muutos %{ago}:'
       email address: 'Sähköpostiosoite:'
       created from: 'Tekijä:'
@@ -2479,10 +2475,7 @@ fi:
     show:
       title: '%{block_on} estetty käyttäjän %{block_by} toimesta'
       heading: '%{block_on} estetty käyttäjän %{block_by} toimesta'
-      time_future: Päättymiseen aikaa %{time}
-      time_past: Loppui %{time} sitten
       created: Luotu
-      ago: '%{time} sitten'
       status: Tila
       show: Näytä
       edit: Muokkaa
@@ -2516,7 +2509,6 @@ fi:
       description: Kuvaus
       created_at: Luotu
       last_changed: Viimeksi muutettu
-      ago_html: '%{when} sitten'
   javascripts:
     close: Sulje
     share:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 69bdab4d4..956337693 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -463,7 +463,6 @@ fr:
       post: Article
       when: Quand
       comment: Commentaire
-      ago: il y a %{ago}
       newer_comments: Commentaires plus récents
       older_comments: Commentaires plus anciens
   geocoder:
@@ -1956,7 +1955,6 @@ fr:
     trace:
       pending: EN ATTENTE
       count_points: '%{count} points'
-      ago: il y a %{time_in_words_ago}
       more: plus
       trace_details: Voir les détails de la trace
       view_map: Voir la carte
@@ -2278,11 +2276,9 @@ fr:
       remove as friend: Supprimer en tant qu’ami
       add as friend: Ajouter en tant qu’ami
       mapper since: 'Cartographe depuis :'
-      ago: (il y a %{time_in_words_ago})
       ct status: 'Conditions du contributeur:'
       ct undecided: Indécis
       ct declined: Refusé
-      ct accepted: Accepté il y a %{ago}
       latest edit: 'Dernière modification %{ago} :'
       email address: 'Adresse de courriel :'
       created from: 'Créé depuis :'
@@ -2592,10 +2588,7 @@ fr:
     show:
       title: « %{block_on} » bloqué par « %{block_by} »
       heading: « %{block_on} » bloqué par « %{block_by} »
-      time_future: Prendra fin dans %{time}
-      time_past: A pris fin il y a %{time}
       created: Créé
-      ago: il y a %{time}
       status: État
       show: Afficher
       edit: Modifier
@@ -2629,7 +2622,6 @@ fr:
       description: Description
       created_at: Créée le
       last_changed: Dernière modification
-      ago_html: il y a %{when}
   javascripts:
     close: Fermer
     share:
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index b96ed92ff..96ea56993 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -354,7 +354,6 @@ fur:
       post: Publiche
       when: Cuant
       comment: Coment
-      ago: '%{ago} indaûr'
       newer_comments: Coments plui gnûfs
       older_comments: Coments plui vieris
   geocoder:
@@ -1015,7 +1014,6 @@ fur:
     trace:
       pending: IN SPIETE
       count_points: '%{count} ponts'
-      ago: '{time_in_words_ago} indaûr'
       more: plui
       trace_details: Cjale i detais dal percors
       view_map: Viôt mape
@@ -1186,11 +1184,9 @@ fur:
       remove as friend: Gjave dai amîs
       add as friend: Zonte ai amîs
       mapper since: 'Al mape dai:'
-      ago: (%{time_in_words_ago} indaûr)
       ct status: 'Tiermins par contribuî:'
       ct undecided: Nol à decidût
       ct declined: Refudâts
-      ct accepted: Acetâts %{ago} indaûr
       latest edit: 'Ultin cambiament %{ago}:'
       email address: 'Direzion di pueste:'
       created from: 'Creât di:'
@@ -1368,8 +1364,6 @@ fur:
     show:
       title: '%{block_on} blocât di %{block_by}'
       heading: '%{block_on} blocât di %{block_by}'
-      time_future: Finìs ca di %{time}
-      time_past: Finît %{time} indaûr
       status: Stât
       show: Mostre
       edit: Cambie
@@ -1402,7 +1396,6 @@ fur:
       description: Descrizion
       created_at: Creade ai
       last_changed: Ultin cambiament
-      ago_html: '%{when} indaûr'
   javascripts:
     close: Siere
     share:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 4ab75d23c..fdb50f329 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -353,7 +353,6 @@ ga:
       post: Postáil
       when: Cá huair
       comment: Nóta tráchta
-      ago: '%{ago} ó shin'
       newer_comments: Nótaí Tráchta Níos Úire
       older_comments: Nótaí Tráchta Níos Sine
   geocoder:
@@ -1697,7 +1696,6 @@ ga:
     trace:
       pending: AR FEITHEAMH
       count_points: '%{count} pointe'
-      ago: '%{time_in_words_ago} ó shin'
       more: tuilleadh
       trace_details: Amharc ar Shonraí an Loirg
       view_map: Amharc ar an Léarscáil
@@ -1976,10 +1974,8 @@ ga:
       remove as friend: Bris cairdeas
       add as friend: Cuir Cara Leis
       mapper since: 'Ag léarscáiliú ó:'
-      ago: (%{time_in_words_ago} ó shin)
       ct status: 'Téarmaí do rannchuiditheoirí:'
       ct declined: Diúltaithe
-      ct accepted: Glactha leis %{ago} ó shin
       latest edit: 'Athrú is déanaí %{ago}:'
       email address: 'Seoladh ríomhphoist:'
       created from: 'Cruthaithe ó:'
@@ -2104,7 +2100,6 @@ ga:
     mine:
       id: ID
       last_changed: Athrú deireanach
-      ago_html: '%{when} ó shin'
   javascripts:
     close: Dún
     share:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 139e853d2..fa4aec5c5 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -388,7 +388,6 @@ gd:
       post: Post
       when: Àm
       comment: Beachd
-      ago: o chionn %{ago}
       newer_comments: Beachdan nas ùire
       older_comments: Beachdan nas sine
   geocoder:
@@ -1660,7 +1659,6 @@ gd:
     trace:
       pending: RI DHÈILIGEADH
       count_points: '%{count} puing'
-      ago: o chionn %{time_in_words_ago}
       more: barrachd
       trace_details: Seall mion-fhiosrachadh an lorgaidh
       view_map: Seall am mapa
@@ -1969,11 +1967,9 @@ gd:
       remove as friend: Thoir an càirdeas air falbh
       add as friend: Cuir caraid ris
       mapper since: 'Ris an obair-mhapa o:'
-      ago: (o chionn %{time_in_words_ago})
       ct status: 'Teirmichean a'' chom-pàirtiche:'
       ct undecided: Gun taghadh
       ct declined: Gun gabhail riutha
-      ct accepted: Air aontachadh riutha o chionn %{ago}
       latest edit: 'An deasachadh mu dheireadh %{ago}:'
       email address: 'Seòladh puist-d:'
       created from: 'Air a chruthachadh o:'
@@ -2261,8 +2257,6 @@ gd:
     show:
       title: Chaidh %{block_on} a bhacadh le %{block_by}
       heading: Chaidh %{block_on} a bhacadh le %{block_by}
-      time_future: Falbhaidh an ùine air an ceann %{time}
-      time_past: Dh'fhalbh an ùine air o chionn %{time}
       status: Staid
       show: Seall
       edit: Deasaich
@@ -2298,7 +2292,6 @@ gd:
       description: Tuairisgeul
       created_at: Air a chruthachadh
       last_changed: An t-atharrachadh mu dheireadh
-      ago_html: o chionn %{when}
   javascripts:
     close: Dùin
     share:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index ea6d03518..d352a2ff0 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -117,6 +117,45 @@ gl:
         description: Descrición
         languages: Linguas
         pass_crypt: Contrasinal
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: ó redor dunha hora
+        other: ó redor de %{count} horas
+      about_x_months:
+        one: ó redor dun mes
+        other: ó redor de %{count} meses
+      about_x_years:
+        one: ó redor dun ano
+        other: ó redor de %{count} ano
+      almost_x_years:
+        one: hai case un ano
+        other: hai case %{count} anos
+      half_a_minute: hai medio minuto
+      less_than_x_seconds:
+        one: hai menos dun segundo
+        other: hai menos de %{count} segundos
+      less_than_x_minutes:
+        one: hai menos dun minuto
+        other: hai menos de %{count} minutos
+      over_x_years:
+        one: hai máis dun ano
+        other: hai máis de %{count} anos
+      x_seconds:
+        one: hai un segundo
+        other: hai %{count} segundos
+      x_minutes:
+        one: hai un minuto
+        other: hai %{count} minutos
+      x_days:
+        one: hai un día
+        other: hai %{count} días
+      x_months:
+        one: hai un mes
+        other: hai %{count} meses
+      x_years:
+        one: hai un ano
+        other: hai %{count} anos
   printable_name:
     with_version: '%{id}, v%{version}'
     with_name_html: '%{name} (%{id})'
@@ -137,14 +176,14 @@ gl:
   api:
     notes:
       comment:
-        opened_at_html: Creado hai %{when}
-        opened_at_by_html: Creado hai %{when} por %{user}
-        commented_at_html: Actualizado hai %{when}
-        commented_at_by_html: Actualizado hai %{when} por %{user}
-        closed_at_html: Resolto hai %{when}
-        closed_at_by_html: Resolto hai %{when} por %{user}
-        reopened_at_html: Reactivado hai %{when}
-        reopened_at_by_html: Reactivado hai %{when} por %{user}
+        opened_at_html: Creado %{when}
+        opened_at_by_html: Creado %{when} por %{user}
+        commented_at_html: Actualizado %{when}
+        commented_at_by_html: Actualizado %{when} por %{user}
+        closed_at_html: Resolto %{when}
+        closed_at_by_html: Resolto %{when} por %{user}
+        reopened_at_html: Reactivado %{when}
+        reopened_at_by_html: Reactivado %{when} por %{user}
       rss:
         title: Notas do OpenStreetMap
         description_area: Unha listaxe das notas recibidas, comentadas ou pechadas
@@ -160,12 +199,12 @@ gl:
   browse:
     created: Creado
     closed: Pechado
-    created_html: Creado <abbr title='%{title}'>hai %{time}</abbr>
-    closed_html: Pechado <abbr title='%{title}'>hai %{time}</abbr>
-    created_by_html: Creado <abbr title='%{title}'>hai %{time}</abbr> por %{user}
-    deleted_by_html: Eliminado <abbr title='%{title}'>hai %{time}</abbr> por %{user}
-    edited_by_html: Editado <abbr title='%{title}'>hai %{time}</abbr> por %{user}
-    closed_by_html: Pechado <abbr title='%{title}'>hai %{time}</abbr> por %{user}
+    created_html: Creado <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Pechado <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Creado <abbr title='%{title}'>%{time}</abbr> por %{user}
+    deleted_by_html: Eliminado <abbr title='%{title}'>%{time}</abbr> por %{user}
+    edited_by_html: Editado <abbr title='%{title}'>%{time}</abbr> por %{user}
+    closed_by_html: Pechado <abbr title='%{title}'>%{time}</abbr> por %{user}
     version: Versión
     in_changeset: Conxunto de mudanzas
     anonymous: anónimo
@@ -185,15 +224,14 @@ gl:
       relation: Relacións (%{count})
       relation_paginated: Relacións (%{x}-%{y} de %{count})
       comment: Comentarios (%{count})
-      hidden_commented_by: Comentario agochado de %{user} <abbr title='%{exact_time}'>
-        hai %{when}</abbr>
-      commented_by: Comentario de %{user} <abbr title='%{exact_time}'> hai %{when}</abbr>
+      hidden_commented_by: Comentario agochado de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Comentario de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: Conxunto de mudanzas do XML
       osmchangexml: osmChange XML
       feed:
         title: Conxunto de mudanzas %{id}
         title_comment: Conxunto de mudanzas %{id} - %{comment}
-      join_discussion: Inicia-la sesión pra unirse á parola
+      join_discussion: Iniciar a sesión para unirse á parola
       discussion: Parola
       still_open: O conxunto de mudanzas segue aberto - Abrirase a parola cando o
         conxunto de mudanzas estea pechado.
@@ -265,18 +303,15 @@ gl:
       open_title: Nota sen resolver nº%{note_name}
       closed_title: Nota resolta nº%{note_name}
       hidden_title: Nota agochada nº%{note_name}
-      open_by: Creado por %{user} <abbr title='%{exact_time}'>hai %{when}</abbr>
-      open_by_anonymous: Creado por un anónimo <abbr title='%{exact_time}'>hai %{when}</abbr>
-      commented_by: Comentado por %{user} <abbr title='%{exact_time}'>hai %{when}</abbr>
-      commented_by_anonymous: Comentado por un anónimo <abbr title='%{exact_time}'>hai
-        %{when}</abbr>
-      closed_by: Resolto por %{user} <abbr title='%{exact_time}'>hai %{when}</abbr>
-      closed_by_anonymous: Resolto por un anónimo <abbr title='%{exact_time}'>hai
-        %{when}</abbr>
-      reopened_by: Reactivado por %{user} <abbr title='%{exact_time}'>hai %{when}</abbr>
-      reopened_by_anonymous: Reactivado por un anónimo <abbr title='%{exact_time}'>hai
-        %{when}</abbr>
-      hidden_by: Agochado por %{user} <abbr title='%{exact_time}'>hai %{when}</abbr>
+      open_by: Creado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Creado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Comentado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Comentado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Resolto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Resolto por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Reactivado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Reactivado por un anónimo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Agochado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Informar desta nota
     query:
       title: Consulta-los elementos
@@ -317,7 +352,7 @@ gl:
     comment:
       comment: 'Novo comentario sobre os conxuntos de mudanzas #%{changeset_id} de
         %{author}'
-      commented_at_by_html: Actualizado hai %{when} por %{user}
+      commented_at_by_html: Actualizado %{when} por %{user}
     comments:
       comment: 'Novo comentario sobre o conxunto de mudanzas #%{changeset_id} de %{author}'
     index:
@@ -403,7 +438,6 @@ gl:
       post: Artigo
       when: Cando
       comment: Comentario
-      ago: hai %{ago}
       newer_comments: Comentarios máis recentes
       older_comments: Comentarios máis vellos
   geocoder:
@@ -1019,8 +1053,8 @@ gl:
       status: Estado
       reports: Informes
       last_updated: Última actualización
-      last_updated_time_html: <abbr title='%{title}'>Hai %{time}</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>Hai %{time}</abbr> por %{user}
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> por %{user}
       link_to_reports: Ollar informes
       reports_count:
         one: 1 informe
@@ -1117,8 +1151,8 @@ gl:
       alt_text: Logotipo do OpenStreetMap
     home: Ir á localización inicial
     logout: Pecha-la sesión
-    log_in: Inicia-la sesión
-    log_in_tooltip: Inicia-la sesión cunha conta existente
+    log_in: Iniciar a sesión
+    log_in_tooltip: Iniciar a sesión cunha conta existente
     sign_up: Rexistrarse
     start_mapping: Comezar a cartografar
     sign_up_tooltip: Crear unha conta para editar
@@ -1896,7 +1930,6 @@ gl:
     trace:
       pending: PENDENTE
       count_points: '%{count} puntos'
-      ago: hai %{time_in_words_ago}
       more: máis
       trace_details: Olla-los detalles da pista
       view_map: Olla-lo mapa
@@ -2205,12 +2238,10 @@ gl:
       remove as friend: Eliminar coma amizade
       add as friend: Engadir coma amizade
       mapper since: 'Cartógrafo dende:'
-      ago: (hai %{time_in_words_ago})
       ct status: 'Termos do contribuínte:'
       ct undecided: Indeciso
       ct declined: Rexeitou
-      ct accepted: Aceptou hai %{ago}
-      latest edit: 'Última edición %{ago}:'
+      latest edit: 'Última edición (%{ago}):'
       email address: 'Enderezo de correo electrónico:'
       created from: 'Creado a partir de:'
       status: 'Estado:'
@@ -2440,8 +2471,8 @@ gl:
         API?
       tried_contacting: Púxenme en contacto co usuario e pedinlle que parase.
       tried_waiting: Dálle ó usuario tempo suficiente para respostar ás mensaxes.
-      needs_view: O usuario ten que acceder ao sistema antes de que o bloqueo sexa
-        retirado
+      needs_view: O usuario ten que acceder ó sistema antes de que o bloqueo sexa
+        revogado
       back: Ollar tódolos bloqueos
     edit:
       title: Editando o bloqueo de %{name}
@@ -2454,8 +2485,8 @@ gl:
         API?
       show: Ollar este bloqueo
       back: Ollar tódolos bloqueos
-      needs_view: O usuario ten que acceder ao sistema antes de que o bloqueo sexa
-        retirado?
+      needs_view: O usuario ten que acceder ó sistema antes de que o bloqueo sexa
+        revogado?
     filter:
       block_expired: O bloqueo xa caducou. Non se pode editar.
       block_period: O período de bloqueo debe elixirse de entre os valores presentes
@@ -2476,7 +2507,7 @@ gl:
       title: Revogando o bloqueo en %{block_on}
       heading: Revogando o bloqueo en %{block_on} por %{block_by}
       time_future: Este bloqueo rematará en %{time}.
-      past: Este bloqueo rematou hai %{time}. Entón, xa non se pode retirar.
+      past: Este bloqueo rematou %{time} e xa non se pode revogar.
       confirm: Ten a certeza de querer revogar este bloqueo?
       revoke: Revogar!
       flash: Revogouse o bloqueo.
@@ -2485,7 +2516,7 @@ gl:
       until_login: Activo até que o usuario inicie sesión.
       time_future_and_until_login: Remata en %{time} e despois de que o usuario iniciou
         a sesión.
-      time_past: Rematou hai %{time}.
+      time_past: Rematou %{time}.
       block_duration:
         hours:
           one: 1 hora
@@ -2513,10 +2544,7 @@ gl:
     show:
       title: '%{block_on} bloqueado por %{block_by}'
       heading: '%{block_on} bloqueado por %{block_by}'
-      time_future: Remata en %{time}
-      time_past: Rematou hai %{time}
       created: Creado
-      ago: hai %{time}
       status: Estado
       show: Amosar
       edit: Editar
@@ -2525,8 +2553,8 @@ gl:
       reason: 'Motivo para o bloqueo:'
       back: Ollar tódolos bloqueos
       revoker: 'Autor da revogación:'
-      needs_view: O usuario ten que acceder ao sistema antes de que o bloqueo sexa
-        retirado.
+      needs_view: O usuario ten que acceder ó sistema antes de que o bloqueo sexa
+        revogado.
     block:
       not_revoked: (non revogado)
       show: Amosar
@@ -2551,7 +2579,6 @@ gl:
       description: Descrición
       created_at: Creado o
       last_changed: Última modificación
-      ago_html: hai %{when}
   javascripts:
     close: Pechar
     share:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 808042bde..65eaa6b8e 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -406,7 +406,6 @@ he:
       post: רשומה
       when: מתי
       comment: הערה
-      ago: לפני %{ago}
       newer_comments: הערות חדשות
       older_comments: הערות ישנות
   geocoder:
@@ -1841,7 +1840,6 @@ he:
     trace:
       pending: בהמתנה
       count_points: '%{count} נקודות'
-      ago: לפני %{time_in_words_ago}
       more: עוד
       trace_details: הצגת פרטי מסלול
       view_map: הצגת מפה
@@ -2131,11 +2129,9 @@ he:
       remove as friend: הסרה מרשימת חברים
       add as friend: הוספה כחבר
       mapper since: 'ממפה מאז:'
-      ago: (לפני %{time_in_words_ago})
       ct status: 'תנאי תרומה:'
       ct undecided: עוד אין החלטה
       ct declined: נדחו
-      ct accepted: אושרו לפני %{ago}
       latest edit: 'עריכה אחרונה %{ago}:'
       email address: 'כתובת דוא״ל:'
       created from: 'נוצר מתוך:'
@@ -2421,10 +2417,7 @@ he:
     show:
       title: החשבון של %{block_on} נחסם על־ידי %{block_by}
       heading: החשבון של %{block_on} נחסם על־ידי %{block_by}
-      time_future: תסתיים בעוד %{time}
-      time_past: הסתיימה לפני %{time}
       created: נוצר
-      ago: לפני %{time}
       status: סטטוס
       show: הצגה
       edit: עריכה
@@ -2458,7 +2451,6 @@ he:
       description: תיאור
       created_at: 'יצירה:'
       last_changed: 'שינוי אחרון:'
-      ago_html: לפני %{when}
   javascripts:
     close: סגירה
     share:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index f9dde6d3a..34d146e2c 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -370,7 +370,6 @@ hr:
       post: Pošalji
       when: Kada
       comment: Komentar
-      ago: prije %{ago}
       newer_comments: Noviji komentari
       older_comments: Stariji komentari
   geocoder:
@@ -1417,7 +1416,6 @@ hr:
     trace:
       pending: U TIJEKU
       count_points: '%{count} točaka'
-      ago: prije %{time_in_words_ago}
       more: više
       trace_details: Vidi detalje traga
       view_map: Prikaži kartu
@@ -1675,11 +1673,9 @@ hr:
       remove as friend: Prekini prijateljstvo
       add as friend: Dodaj prijatelja
       mapper since: 'Maper od:'
-      ago: prije (%{time_in_words_ago})
       ct status: 'Uvjeti doprinositelja:'
       ct undecided: Neopredjeljen
       ct declined: Odbio
-      ct accepted: Prihvaćeno prije %{ago}
       latest edit: 'Najnovija izmjena %{ago}:'
       email address: 'Email adresa:'
       created from: 'Napravljeno iz:'
@@ -1922,8 +1918,6 @@ hr:
     show:
       title: '%{block_on} blokiran od %{block_by}'
       heading: '%{block_on} blokiran od %{block_by}'
-      time_future: Završava u %{time}
-      time_past: Završeno prije %{time}
       status: Status
       show: Prikaži
       edit: Uredi
@@ -1957,7 +1951,6 @@ hr:
       description: Opis
       created_at: Napravljeno
       last_changed: Zadnji put promijenjeno
-      ago_html: prije %{when}
   javascripts:
     close: Zatvori
     share:
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 5e32bf3d7..fba612593 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -370,7 +370,6 @@ hsb:
       post: Powěsć
       when: Časowy dypk
       comment: Komentar
-      ago: před %{ago}
       newer_comments: Nowše komentary
       older_comments: Starše komentary
   geocoder:
@@ -1617,7 +1616,6 @@ hsb:
     trace:
       pending: NJESČINJENY
       count_points: '%{count} dypkow'
-      ago: před %{time_in_words_ago}
       more: wjace
       trace_details: Podrobnosće ćěrje pokazać
       view_map: Kartu pokazać
@@ -1901,11 +1899,9 @@ hsb:
       remove as friend: Přećela wotstronić
       add as friend: Přećela přidać
       mapper since: 'Kartěrowar wot:'
-      ago: (před %{time_in_words_ago})
       ct status: 'Wuměnjenja za sobuskutkowarjow:'
       ct undecided: Njerozsudźeny
       ct declined: Wotpokazany
-      ct accepted: Před %{ago} akceptowany
       latest edit: 'Najnowša změna %{ago}:'
       email address: 'E-mejlowa adresa:'
       created from: 'Wutworjeny z:'
@@ -2182,10 +2178,7 @@ hsb:
     show:
       title: '%{block_on} wot %{block_by} zablokowany'
       heading: '%{block_on} wot %{block_by} zablokowany'
-      time_future: Kónči so %{time}
-      time_past: Je so před %{time} skónčiło.
       created: Wutworjeny
-      ago: před %{time}
       status: Status
       show: Pokazać
       edit: Wobdźěłać
@@ -2219,7 +2212,6 @@ hsb:
       description: Wopisanje
       created_at: 'Wutworjeny:'
       last_changed: Posledni raz změnjeny
-      ago_html: před %{when}
   javascripts:
     close: Začinić
     share:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 85579bae0..14e368ce8 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -402,7 +402,6 @@ hu:
       post: Hozzászólás
       when: Mikor
       comment: Megjegyzés
-      ago: '%{ago} idővel ezelőtt'
       newer_comments: Újabb hozzászólások
       older_comments: Régebbi hozzászólások
   geocoder:
@@ -1795,7 +1794,6 @@ hu:
     trace:
       pending: FÜGGŐBEN
       count_points: '%{count} pont'
-      ago: 'ennyivel ezelőtt: %{time_in_words_ago}'
       more: tovább
       trace_details: Nyomvonal részleteinek megtekintése
       view_map: Térkép megtekintése
@@ -2095,11 +2093,9 @@ hu:
       remove as friend: Barát eltávolítása
       add as friend: Felvétel barátnak
       mapper since: 'Térképszerkesztő ezóta:'
-      ago: (%{time_in_words_ago} óta)
       ct status: 'Hozzájárulási feltételek:'
       ct undecided: Nem eldöntött
       ct declined: Elutasítva
-      ct accepted: 'Elfogadva: %{ago} óta'
       latest edit: 'Utolsó szerkesztés %{ago}:'
       email address: 'E-mail cím:'
       created from: 'Készítve innen:'
@@ -2391,10 +2387,7 @@ hu:
     show:
       title: '%{block_on} blokkolva %{block_by} által'
       heading: '%{block_by} blokkolta %{block_on} felhasználót'
-      time_future: Véget ér %{time} múlva
-      time_past: Véget ért %{time} óta
       created: Létrehozva
-      ago: '%{time} ezelőtt'
       status: Állapot
       show: Megjelenítés
       edit: Szerkesztés
@@ -2428,7 +2421,6 @@ hu:
       description: Leírás
       created_at: Létrehozva ekkor
       last_changed: Utoljára módosítva
-      ago_html: '%{when}'
   javascripts:
     close: Bezárás
     share:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 75f04a212..094e99279 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -105,6 +105,45 @@ ia:
         description: Description
         languages: Linguas
         pass_crypt: Contrasigno
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: circa 1 hora retro
+        other: circa %{count} horas retro
+      about_x_months:
+        one: circa 1 mense retro
+        other: circa %{count} menses retro
+      about_x_years:
+        one: circa 1 anno retro
+        other: circa %{count} annos retro
+      almost_x_years:
+        one: quasi 1 anno retro
+        other: quasi %{count} annos retro
+      half_a_minute: un medie minuta retro
+      less_than_x_seconds:
+        one: minus de 1 seconda retro
+        other: minus de %{count} secundas retro
+      less_than_x_minutes:
+        one: minus de un minuta retro
+        other: minus de %{count} minutas retro
+      over_x_years:
+        one: plus de 1 anno retro
+        other: plus de %{count} annos retro
+      x_seconds:
+        one: 1 secunda retro
+        other: '%{count} secundas retro'
+      x_minutes:
+        one: 1 minuta retro
+        other: '%{count} minutas retro'
+      x_days:
+        one: 1 die retro
+        other: '%{count} dies retro'
+      x_months:
+        one: 1 mense retro
+        other: '%{count} menses retro'
+      x_years:
+        one: 1 anno retro
+        other: '%{count} annos retro'
   editor:
     default: Predefinite (actualmente %{name})
     potlatch:
@@ -122,14 +161,14 @@ ia:
   api:
     notes:
       comment:
-        opened_at_html: Create %{when} retro
-        opened_at_by_html: Create %{when} retro per %{user}
-        commented_at_html: Actualisate %{when} retro
-        commented_at_by_html: Actualisate %{when} retro per %{user}
-        closed_at_html: Resolvite %{when} retro
-        closed_at_by_html: Resolvite %{when} retro per %{user}
-        reopened_at_html: Reactivate %{when} retro
-        reopened_at_by_html: Reactivate %{when} retro per %{user}
+        opened_at_html: Create %{when}
+        opened_at_by_html: Create %{when} per %{user}
+        commented_at_html: Actualisate %{when}
+        commented_at_by_html: Actualisate %{when} per %{user}
+        closed_at_html: Resolvite %{when}
+        closed_at_by_html: Resolvite %{when} per %{user}
+        reopened_at_html: Reactivate %{when}
+        reopened_at_by_html: Reactivate %{when} per %{user}
       rss:
         title: Notas de OpenStreetMap
         description_area: Un lista de notas reportate, commentate o claudite in tu
@@ -145,12 +184,12 @@ ia:
   browse:
     created: Create a
     closed: Claudite a
-    created_html: Create <abbr title='%{title}'>%{time} retro</abbr>
-    closed_html: Claudite <abbr title='%{title}'>%{time} retro</abbr>
-    created_by_html: Create <abbr title='%{title}'>%{time} retro</abbr> per %{user}
-    deleted_by_html: Delite <abbr title='%{title}'>%{time} retro</abbr> per %{user}
-    edited_by_html: Modificate <abbr title='%{title}'>%{time} retro</abbr> per %{user}
-    closed_by_html: Claudite <abbr title='%{title}'>%{time} retro</abbr> per %{user}
+    created_html: Create <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Claudite <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Create <abbr title='%{title}'>%{time}</abbr> per %{user}
+    deleted_by_html: Delite <abbr title='%{title}'>%{time}</abbr> per %{user}
+    edited_by_html: Modificate <abbr title='%{title}'>%{time}</abbr> per %{user}
+    closed_by_html: Claudite <abbr title='%{title}'>%{time}</abbr> per %{user}
     version: Version
     in_changeset: Gruppo de modificationes
     anonymous: anonyme
@@ -170,9 +209,8 @@ ia:
       relation: Relationes (%{count})
       relation_paginated: Relationes (%{x}-%{y} de %{count})
       comment: Commentos (%{count})
-      hidden_commented_by: Commento celate de %{user} <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      commented_by: Commento de %{user} <abbr title='%{exact_time}'>%{when} retro</abbr>
+      hidden_commented_by: Commento celate de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: XML del gruppo de modificationes
       osmchangexml: XML osmChange
       feed:
@@ -250,20 +288,15 @@ ia:
       open_title: Nota non resolvite №%{note_name}
       closed_title: Nota resolvite №%{note_name}
       hidden_title: Nota celate №%{note_name}
-      open_by: Create per %{user} <abbr title='%{exact_time}'>%{when} retro</abbr>
-      open_by_anonymous: Create per un anonymo <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      commented_by: Commento scribite per %{user} <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      commented_by_anonymous: Commento scribite per un anonymo <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      closed_by: Resolvite per %{user} <abbr title='%{exact_time}'>%{when} retro</abbr>
-      closed_by_anonymous: Resolvite per un anonymo <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      reopened_by: Reactivate per %{user} <abbr title='%{exact_time}'>%{when} retro</abbr>
-      reopened_by_anonymous: Reactivate per un anonymo <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      hidden_by: Celate per %{user} <abbr title='%{exact_time}'>%{when} retro</abbr>
+      open_by: Create per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Create per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Commento de un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Resolvite per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Resolvite per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Reactivate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Reactivate per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Celate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Signalar iste nota
     query:
       title: Cercar objectos
@@ -304,7 +337,7 @@ ia:
     comment:
       comment: Nove commento sur le gruppo de modificationes № %{changeset_id} per
         %{author}
-      commented_at_by_html: Actualisate %{when} retro per %{user}
+      commented_at_by_html: Actualisate %{when} per %{user}
     comments:
       comment: Nove commento sur le gruppo de modificationes № %{changeset_id} per
         %{author}
@@ -390,7 +423,6 @@ ia:
       post: Articulo
       when: Quando
       comment: Commento
-      ago: '%{ago} retro'
       newer_comments: Commentos plus recente
       older_comments: Commentos plus ancian
   geocoder:
@@ -958,9 +990,8 @@ ia:
       status: Stato
       reports: Reportos
       last_updated: Ultime actualisation
-      last_updated_time_html: <abbr title='%{title}'>%{time} retro</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time} retro</abbr> per
-        %{user}
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> per %{user}
       link_to_reports: Vider reportos
       reports_count:
         one: 1 reporto
@@ -1752,7 +1783,6 @@ ia:
     trace:
       pending: PENDENTE
       count_points: '%{count} punctos'
-      ago: '%{time_in_words_ago} retro'
       more: plus
       trace_details: Vider detalios del tracia
       view_map: Vider carta
@@ -2052,12 +2082,10 @@ ia:
       remove as friend: Remover amico
       add as friend: Adder amico
       mapper since: 'Cartographo depost:'
-      ago: (%{time_in_words_ago} retro)
       ct status: 'Conditiones de contributor:'
       ct undecided: Indecise
       ct declined: Declinate
-      ct accepted: Acceptate %{ago} retro
-      latest edit: 'Ultime modification %{ago}:'
+      latest edit: 'Ultime modification (%{ago}):'
       email address: 'Adresse de e-mail:'
       created from: 'Create ex:'
       status: 'Stato:'
@@ -2317,7 +2345,7 @@ ia:
       title: Revoca blocada de %{block_on}
       heading: Revoca blocada de %{block_on} per %{block_by}
       time_future: Iste blocada expirara in %{time}.
-      past: Iste blocada expirava %{time} retro e non pote esser revocate ora.
+      past: Iste blocada expirava %{time} e non pote esser revocate ora.
       confirm: Es tu secur de voler revocar iste blocada?
       revoke: Revocar!
       flash: Iste blocada ha essite revocate.
@@ -2326,7 +2354,7 @@ ia:
       until_login: Active usque le usator aperi un session.
       time_future_and_until_login: Termina in %{time} e post que le usator ha aperite
         session.
-      time_past: Expirava %{time} retro.
+      time_past: Expirava %{time}.
       block_duration:
         hours:
           one: 1 hora
@@ -2342,10 +2370,7 @@ ia:
     show:
       title: '%{block_on} blocate per %{block_by}'
       heading: '%{block_on} blocate per %{block_by}'
-      time_future: Expira in %{time}
-      time_past: Expirava %{time} retro
       created: Create
-      ago: '%{time} retro'
       status: Stato
       show: Monstrar
       edit: Modificar
@@ -2379,7 +2404,6 @@ ia:
       description: Description
       created_at: Create a
       last_changed: Ultime modification
-      ago_html: '%{when} retro'
   javascripts:
     close: Clauder
     share:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 26ade5225..446c31254 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -406,7 +406,6 @@ id:
       post: Artikel
       when: Kapan
       comment: Komentar
-      ago: '%{ago} yang lalu'
       newer_comments: Komentar Baru
       older_comments: Komentar Lama
   geocoder:
@@ -1847,7 +1846,6 @@ id:
     trace:
       pending: TERTUNDA
       count_points: '%{count} titik'
-      ago: '%{time_in_words_ago} yang lalu'
       more: selebihnya
       trace_details: Lihat Perincian Jejak
       view_map: Lihat peta
@@ -2144,11 +2142,9 @@ id:
       remove as friend: Hapus pertemanan
       add as friend: Jadikan Teman
       mapper since: 'Melakukan pemetaan sejak:'
-      ago: (%{time_in_words_ago} yang lalu)
       ct status: 'Syarat-syarat kontributor:'
       ct undecided: Belum diputuskan
       ct declined: Tolak
-      ct accepted: Telah diterima %{ago} yang lalu
       latest edit: 'Hasil edit terakhir %{ago}:'
       email address: 'Alamat email:'
       created from: 'Dibuat pada:'
@@ -2437,10 +2433,7 @@ id:
     show:
       title: '%{block_on} diblokir oleh %{block_by}'
       heading: '%{block_on} diblokir oleh %{block_by}'
-      time_future: Berakhir dalam %{time}
-      time_past: Berakhir %{time} yang lalu
       created: Dibuat
-      ago: '%{time} yang lalu'
       status: Status
       show: Tampilkan
       edit: Edit
@@ -2474,7 +2467,6 @@ id:
       description: Deskripsi
       created_at: Dibuat pada
       last_changed: Terakhir diubah
-      ago_html: '%{when} yang lalu'
   javascripts:
     close: Tutup
     share:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index a2dfa9791..feb19a189 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -441,7 +441,6 @@ is:
       post: Senda
       when: Þegar
       comment: Athugasemd
-      ago: fyrir %{ago} síðan
       newer_comments: Nýrri athugasemdir
       older_comments: Eldri athugasemdir
   geocoder:
@@ -1951,7 +1950,6 @@ is:
     trace:
       pending: Í BIÐ
       count_points: '%{count} punktar'
-      ago: '%{time_in_words_ago} síðan'
       more: upplýsingar
       trace_details: Sýna upplýsingar um ferilinn
       view_map: Skoða kort
@@ -2258,11 +2256,9 @@ is:
       remove as friend: fjarlægja úr vinahópi
       add as friend: bæta við sem vini
       mapper since: 'Notandi síðan:'
-      ago: (%{time_in_words_ago} síðan)
       ct status: 'Skilmálar vegna framlags:'
       ct undecided: Óvíst
       ct declined: Hafnað
-      ct accepted: Samþykkt fyrir %{ago} síðan
       latest edit: 'Síðasta breyting %{ago}:'
       email address: 'Netfang:'
       created from: 'Búin til frá:'
@@ -2554,10 +2550,7 @@ is:
     show:
       title: Bann á %{block_on} eftir %{block_by}
       heading: Notandinn „%{block_on}“ var bannaður af „%{block_by}“
-      time_future: Endar eftir %{time}
-      time_past: Endaði fyrir %{time} síðan
       created: Búið til
-      ago: Fyrir %{time} síðan
       status: Staða
       show: Sýna
       edit: Breyta
@@ -2593,7 +2586,6 @@ is:
       description: Lýsing
       created_at: Búið til í
       last_changed: Síðast breytt
-      ago_html: fyrir %{when} síðan
   javascripts:
     close: Loka
     share:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 30bf68533..0cd4c6d7a 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -203,14 +203,14 @@ it:
   api:
     notes:
       comment:
-        opened_at_html: Creata %{when} fa
-        opened_at_by_html: Creata %{when} fa da %{user}
-        commented_at_html: Aggiornata %{when} fa
-        commented_at_by_html: Aggiornata %{when} fa da %{user}
-        closed_at_html: Chiusa %{when} fa
-        closed_at_by_html: Chiusa %{when} fa da %{user}
-        reopened_at_html: Riaperta %{when} fa
-        reopened_at_by_html: Riaperta %{when} fa da %{user}
+        opened_at_html: Creata %{when}
+        opened_at_by_html: Creata %{when} da %{user}
+        commented_at_html: Aggiornata %{when}
+        commented_at_by_html: Aggiornata %{when} da %{user}
+        closed_at_html: Chiusa %{when}
+        closed_at_by_html: Chiusa %{when} da %{user}
+        reopened_at_html: Riaperta %{when}
+        reopened_at_by_html: Riaperta %{when} da %{user}
       rss:
         title: Note di OpenStreetMap
         description_area: Una lista di note inserite, commentate o chiuse nella tua
@@ -226,12 +226,12 @@ it:
   browse:
     created: Creato
     closed: Chiuso
-    created_html: Creato <abbr title='%{title}'>%{time} fa</abbr>
-    closed_html: Chiuso <abbr title='%{title}'>%{time} fa</abbr>
-    created_by_html: Creato <abbr title='%{title}'>%{time} fa</abbr> da %{user}
-    deleted_by_html: Cancellato <abbr title='%{title}'>%{time} fa</abbr> da %{user}
-    edited_by_html: Modificato <abbr title='%{title}'>%{time} fa</abbr> da %{user}
-    closed_by_html: Chiuso <abbr title='%{title}'>%{time} fa</abbr> da %{user}
+    created_html: Creato <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Chiuso <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Creato <abbr title='%{title}'>%{time}</abbr> da %{user}
+    deleted_by_html: Cancellato <abbr title='%{title}'>%{time}</abbr> da %{user}
+    edited_by_html: Modificato <abbr title='%{title}'>%{time}</abbr> da %{user}
+    closed_by_html: Chiuso <abbr title='%{title}'>%{time}</abbr> da %{user}
     version: Versione
     in_changeset: Gruppo di modifiche
     anonymous: anonimo
@@ -251,9 +251,8 @@ it:
       relation: Relazioni (%{count})
       relation_paginated: Relazioni (%{x}-%{y} di %{count})
       comment: Commenti (%{count})
-      hidden_commented_by: Commento nascosto da %{user} <abbr title='%{exact_time}'>%{when}
-        fa</abbr>
-      commented_by: Commento da %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
+      hidden_commented_by: Commento nascosto da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Commento da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: Gruppo di modifiche XML
       osmchangexml: modificheOsm XML
       feed:
@@ -333,18 +332,15 @@ it:
       open_title: 'Nota irrisolta #%{note_name}'
       closed_title: 'Nota risolta #%{note_name}'
       hidden_title: 'Nota nascosta #%{note_name}'
-      open_by: Creato da %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
-      open_by_anonymous: Creato da anonimo <abbr title='%{exact_time}'>%{when} fa</abbr>
-      commented_by: Commento da %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
-      commented_by_anonymous: Commento da anonimo <abbr title='%{exact_time}'>%{when}
-        fa</abbr>
-      closed_by: Risolta da %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
-      closed_by_anonymous: Risolta da anonimo <abbr title='%{exact_time}'>%{when}
-        fa</abbr>
-      reopened_by: Riattivata da %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
-      reopened_by_anonymous: Riattivata da anonimo <abbr title='%{exact_time}'>%{when}
-        fa</abbr>
-      hidden_by: Nascosta da %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
+      open_by: Creato da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Creato da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Commento da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Commento da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Risolta da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Risolta da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Riattivata da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Riattivata da anonimo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Nascosta da %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Segnala questa nota
     query:
       title: Ricerca di elementi
@@ -384,7 +380,7 @@ it:
   changeset_comments:
     comment:
       comment: 'Nuovo commento al gruppo di modifiche #%{changeset_id} di %{author}'
-      commented_at_by_html: Aggiornato %{when} fa da %{user}
+      commented_at_by_html: Aggiornato %{when} da %{user}
     comments:
       comment: 'Nuovo commento al gruppo di modifiche #%{changeset_id} di %{author}'
     index:
@@ -441,11 +437,13 @@ it:
         other: '%{count} commenti'
       edit_link: Modifica questa voce
       hide_link: Nascondi questa voce
+      unhide_link: Mostra questa voce
       confirm: Conferma
       report: Segnala questa voce
     diary_comment:
       comment_from: Commento di %{link_user} il %{comment_created_at}
       hide_link: Nascondi questo commento
+      unhide_link: Mostra questo commento
       confirm: Conferma
       report: Segnala questo commento
     location:
@@ -467,7 +465,6 @@ it:
       post: Messaggio
       when: Quando
       comment: Commento
-      ago: '%{ago} fa'
       newer_comments: Commenti più recenti
       older_comments: Commenti più vecchi
   geocoder:
@@ -1082,8 +1079,8 @@ it:
       status: Stato
       reports: Segnalazioni
       last_updated: Ultima modifica
-      last_updated_time_html: <abbr title='%{title}'>%{time} fa</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time} fa</abbr> da %{user}
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> da %{user}
       link_to_reports: Visualizza segnalazioni
       reports_count:
         one: 1 segnalazione
@@ -1953,7 +1950,6 @@ it:
     trace:
       pending: IN ATTESA
       count_points: '%{count} punti'
-      ago: '%{time_in_words_ago} fa'
       more: altri
       trace_details: Visualizza i dettagli del tracciato
       view_map: Visualizza mappa
@@ -2217,9 +2213,18 @@ it:
       title: Termini
       heading: Termini
       heading_ct: Regole per contribuire
-      read_tou: Ho letto e accetto le Condizioni d’utilizzo
-      consider_pd: In aggiunta a quanto sopra, considero che i miei contributi sono
-        in Pubblico dominio
+      read and accept with tou: Leggi l’accordo di collaborazione e le condizioni
+        d’uso, quando hai finito spunta entrambe le caselle e poi premi il pulsante
+        Continua.
+      contributor_terms_explain: Questo accordo definisce le condizioni delle tue
+        collaborazioni presenti e future.
+      read_ct: Ho letto e accetto le condizioni di collaborazione qui sopra
+      tou_explain_html: Queste %{tou_link} definiscono l’utilizzo del sito web e di
+        altre infrastrutture fornite dalla OSMF. Clicca sul collegamento, leggi il
+        testo e accetta.
+      read_tou: Ho letto e accetto le Condizioni d'uso
+      consider_pd: In aggiunta a quanto sopra, considero i miei contributi come fossero
+        di pubblico dominio
       consider_pd_why: cos'è questo?
       consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 'Informazioni utili a capire questi termini: un <a href="%{summary}">riassunto
@@ -2261,12 +2266,10 @@ it:
       remove as friend: Rimuovi amico
       add as friend: Aggiungi amico
       mapper since: 'Mappatore dal:'
-      ago: (%{time_in_words_ago} fa)
       ct status: 'Termini di collaborazione:'
       ct undecided: Indeciso
       ct declined: Non accetto
-      ct accepted: Accettato da %{ago}
-      latest edit: 'Ultima modifica %{ago}:'
+      latest edit: 'Ultima modifica (%{ago}):'
       email address: 'Indirizzo email:'
       created from: 'Creato da:'
       status: 'Stato:'
@@ -2346,8 +2349,8 @@ it:
         not yet agreed: Non hai ancora accettato le nuove regole per contribuire.
         review link text: Quando puoi segui per favore questo link per leggere ed
           accettare le nuove regole per contribuire.
-        agreed_with_pd: Hai anche dichiarato di considerare le tue modifiche di Pubblico
-          Dominio.
+        agreed_with_pd: Hai anche dichiarato di considerare le tue modifiche come
+          fossero di pubblico dominio.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: che cos'è questo?
       profile description: 'Descrizione del profilo:'
@@ -2529,7 +2532,7 @@ it:
       title: Revoca del blocco su %{block_on}
       heading: Revoca del blocco su %{block_on} imposto da %{block_by}
       time_future: Questo blocco terminerà in %{time}.
-      past: Questo blocco è terminato %{time} fa e non può essere revocato ora.
+      past: Questo blocco è terminato %{time} e non può essere revocato ora.
       confirm: Sei sicuro di voler revocare questo blocco?
       revoke: Revoca!
       flash: Questo blocco è stato revocato.
@@ -2538,7 +2541,7 @@ it:
       until_login: Attivo finché l'utente non si collega.
       time_future_and_until_login: Termina tra %{time} e una volta che l'utente avrà
         effettuato l'accesso.
-      time_past: Terminato %{time} fa.
+      time_past: Terminato %{time}.
       block_duration:
         hours:
           one: 1 ora
@@ -2546,6 +2549,9 @@ it:
         days:
           one: 1 giorno
           other: '%{count} giorni'
+        weeks:
+          one: 1 settimana
+          other: '%{count} settimane'
         months:
           one: 1 mese
           other: '%{count} mesi'
@@ -2563,10 +2569,7 @@ it:
     show:
       title: '%{block_on} bloccato da %{block_by}'
       heading: '%{block_on} bloccato da %{block_by}'
-      time_future: Termina fra %{time}
-      time_past: Terminato %{time} fa
       created: Creato
-      ago: '%{time} fa'
       status: Stato
       show: Mostra
       edit: Modifica
@@ -2600,7 +2603,6 @@ it:
       description: Descrizione
       created_at: Creata il
       last_changed: Modificata per l'ultima volta
-      ago_html: '%{when} fa'
   javascripts:
     close: Chiudi
     share:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index bd6a5bd33..7ab4bb064 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -449,7 +449,6 @@ ja:
       post: 投稿
       when: 日時
       comment: コメント
-      ago: '%{ago}前'
       newer_comments: 新しいコメント
       older_comments: 古いコメント
   geocoder:
@@ -1778,7 +1777,6 @@ ja:
     trace:
       pending: 処理中
       count_points: '%{count} 個の点'
-      ago: '%{time_in_words_ago}前'
       more: 詳細
       trace_details: トレースの詳細表示
       view_map: 地図で表示
@@ -2055,11 +2053,9 @@ ja:
       remove as friend: 友達を解除
       add as friend: 友達として追加
       mapper since: 'マッパー歴:'
-      ago: (%{time_in_words_ago}前)
       ct status: '協力者規約:'
       ct undecided: 未決定
       ct declined: 拒否
-      ct accepted: '%{ago}前に承認'
       latest edit: '最終編集 %{ago}:'
       email address: 'メール アドレス:'
       created from: '作成日:'
@@ -2322,10 +2318,7 @@ ja:
     show:
       title: '%{block_by} が %{block_on} をブロックしました'
       heading: '%{block_by} が %{block_on} をブロックしました'
-      time_future: '%{time} に終了'
-      time_past: '%{time}前に終了しました'
       created: 作成済み
-      ago: '%{time}前'
       status: 状態
       show: 表示
       edit: 編集
@@ -2359,7 +2352,6 @@ ja:
       description: 説明
       created_at: 作成日時
       last_changed: 最近の変更
-      ago_html: '%{when}前'
   javascripts:
     close: 閉じる
     share:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 2791b31a0..41e420cc9 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -283,7 +283,6 @@ ka:
       post: პოსტი
       when: როდის
       comment: კომენტარი
-      ago: '%{ago} წინ'
       newer_comments: ახალი კომენტარები
       older_comments: ძველი კომენტარები
   geocoder:
@@ -997,7 +996,6 @@ ka:
     trace:
       pending: დამუშავება
       count_points: '%{count} წერტილი'
-      ago: '%{time_in_words_ago} წინ'
       more: მეტი
       view_map: რუკის ნახვა
       edit: რედაქტირება
@@ -1079,7 +1077,6 @@ ka:
       edits: რედაქტირებები
       remove as friend: მეგობრებიდან წაშლა
       add as friend: მეგობრებში დამატება
-      ct accepted: მიღებულია %{ago} წინ
       latest edit: 'ბოლო რედაქტირება %{ago}:'
       email address: 'ელ. ფოსტის მისამართი:'
       created from: 'შექმნილია:'
@@ -1191,8 +1188,6 @@ ka:
     show:
       title: '%{block_on}, დაადო ბლოკი: %{block_by}'
       heading: '%{block_on}, დაადო ბლოკი: %{block_by}'
-      time_future: მთავრდება %{time}–ში
-      time_past: დასრულდა %{time} წინ
       status: სტატუსი
       show: ჩვენება
       edit: რედაქტირება
@@ -1220,7 +1215,6 @@ ka:
     mine:
       creator: შემქმნელი
       description: აღწერა
-      ago_html: '%{when} წინ'
   javascripts:
     map:
       base:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 74fc4a739..f18f28608 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -371,7 +371,6 @@ kab:
       post: Amagrad
       when: Melmi
       comment: Awennit
-      ago: '%{ago} aya'
       newer_comments: Iwenniten ineggura
       older_comments: Iwenniten iqbuṛen
   geocoder:
@@ -1091,7 +1090,6 @@ kab:
     trace:
       pending: YETTRAǦU
       count_points: '%{count} n tneqqiḍin'
-      ago: '%{time_in_words_ago} aya'
       more: ugar
       trace_details: Sken talqayt n lǧerra
       view_map: Sken takarḍa
@@ -1302,10 +1300,8 @@ kab:
       notes: Tizmilin n tkarḍa
       remove as friend: Kkes seg imdukkal
       add as friend: Rnu amdakkel
-      ago: (%{time_in_words_ago} aya)
       ct status: 'Tiwtilin n iwiziw:'
       ct declined: Yettwagi
-      ct accepted: Yettwaqbel %{ago} aya
       latest edit: 'Asnifel aneggaru %{ago} :'
       email address: 'Tansa imayl:'
       created from: 'Yettwarna seg:'
@@ -1444,10 +1440,7 @@ kab:
     show:
       title: '%{block_on} isewḥel-it %{block_by}'
       heading: '%{block_on} isewḥel-it %{block_by}'
-      time_future: Ad ifak di %{time}
-      time_past: Ifuk %{time} aya
       created: Yettwarna
-      ago: '%{time} aya'
       status: Addad
       show: Sken
       edit: Ẓreg
@@ -1477,7 +1470,6 @@ kab:
       description: Aglam
       created_at: Yettwarna di
       last_changed: Asnifel aneggaru
-      ago_html: '%{when} aya'
   javascripts:
     close: Mdel
     share:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 92ed61ee7..92808f4a6 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -411,7 +411,6 @@ ko:
       post: 게시물
       when: 날짜
       comment: 의견
-      ago: '%{ago} 전'
       newer_comments: 새 의견
       older_comments: 이전 의견
   geocoder:
@@ -1818,7 +1817,6 @@ ko:
     trace:
       pending: 보류 중
       count_points: 점 %{count}개
-      ago: '%{time_in_words_ago} 전'
       more: 더 보기
       trace_details: 궤적 상세보기
       view_map: 지도 보기
@@ -2104,11 +2102,9 @@ ko:
       remove as friend: 친구 제거
       add as friend: 친구 추가
       mapper since: '이후 매퍼:'
-      ago: (%{time_in_words_ago} 전)
       ct status: '기여자 약관:'
       ct undecided: 정의되지 않음
       ct declined: 거부됨
-      ct accepted: '%{ago} 전에 승인함'
       latest edit: '마지막 편집 %{ago}:'
       email address: '이메일 주소:'
       created from: '만든 위치:'
@@ -2381,10 +2377,7 @@ ko:
     show:
       title: '%{block_on}님이 %{block_by}님에 의해 차단됨'
       heading: '%{block_on}님이 %{block_by}님에 의해 차단됨'
-      time_future: '%{time}에 끝남'
-      time_past: '%{time} 전에 끝남'
       created: 만들어짐
-      ago: '%{time} 전'
       status: 상태
       show: 보기
       edit: 편집
@@ -2418,7 +2411,6 @@ ko:
       description: 설명
       created_at: 만든 날짜
       last_changed: 마지막으로 바뀜
-      ago_html: '%{when} 전'
   javascripts:
     close: 닫기
     share:
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 150d16e98..0bb54b305 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -389,7 +389,6 @@ ku-Latn:
       post: Nivîs
       when: Kengî
       comment: Şîrove
-      ago: berî %{ago}
       newer_comments: Şîroveyên nûtir
       older_comments: Şîroveyên kevintir
   geocoder:
@@ -1859,7 +1858,6 @@ ku-Latn:
     trace:
       pending: LI BENDÊ YE
       count_points: '%{count} nuqte'
-      ago: '%{time_in_words_ago} berê'
       more: dêtay
       trace_details: Dêtayên Şopê Bibîne
       view_map: Nexşeyê bibîne
@@ -2157,11 +2155,9 @@ ku-Latn:
       remove as friend: Ji hevaltiyê derxe
       add as friend: Bibe heval
       mapper since: Destpêka nexşesaziyêː
-      ago: (berî %{time_in_words_ago})
       ct status: Şertên beşdariyêː
       ct undecided: Bêqerar
       ct declined: Redkirî
-      ct accepted: Berî %{ago} hatiye qebûlkirin
       latest edit: Guherandina axirkî %{ago}ː
       email address: 'Navnîşana e-nameyê:'
       created from: Ji van hate çêkirinː
@@ -2452,10 +2448,7 @@ ku-Latn:
     show:
       title: '%{block_on} ji alî %{block_by} ve hate astengkirin'
       heading: '%{block_on} ji alî %{block_by} ve hate astengkirin'
-      time_future: Di %{time} de diqede
-      time_past: Berî %{time} qediya
       created: Hate çêkirin
-      ago: berî %{time}
       status: Rewş
       show: nîşan bide
       edit: Biguherîne
@@ -2489,7 +2482,6 @@ ku-Latn:
       description: Danasîn
       created_at: Wextê çêkirinê
       last_changed: Guherandinê dawîn
-      ago_html: berî %{when}
   javascripts:
     close: Bigre
     share:
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 81df00b0e..951b1852c 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -80,6 +80,9 @@ lb:
   datetime:
     distance_in_words_ago:
       half_a_minute: virun enger hallwer Minutt
+      x_seconds:
+        one: virun 1 virun enger Sekonn
+        other: virun viru(n) %{count} Sekonnen
   editor:
     default: Standard (elo %{name})
     potlatch:
@@ -261,7 +264,6 @@ lb:
     comments:
       when: Wéini
       comment: Bemierkung
-      ago: viru(n) %{ago}
       newer_comments: Méi nei Bemierkungen
       older_comments: Méi al Bemierkungen
   geocoder:
@@ -989,7 +991,6 @@ lb:
       showing_page: Säit %{page}
     trace:
       count_points: '%{count} Punkten'
-      ago: viru(n) %{time_in_words_ago}
       more: méi
       view_map: Kaart weisen
       edit: änneren
@@ -1127,8 +1128,6 @@ lb:
       notes: Notizen op der Kaart
       remove as friend: Frënd ewechhuelen
       add as friend: Frënd derbäisetzen
-      ago: (viru(n) %{time_in_words_ago})
-      ct accepted: Viru(n) %{ago} akzeptéert
       latest edit: 'Lescht Ännerung %{ago}:'
       email address: 'E-Mail-Adress:'
       status: 'Status:'
@@ -1283,7 +1282,6 @@ lb:
     show:
       title: '%{block_on} gespaart vum %{block_by}'
       heading: '%{block_on} gespaart vum %{block_by}'
-      ago: viru(n) %{time}}
       status: Status
       show: Weisen
       edit: Änneren
@@ -1308,7 +1306,6 @@ lb:
     mine:
       description: Beschreiwung
       last_changed: Lescht Ännerung
-      ago_html: viru(n) %{when}
   javascripts:
     close: Zoumaachen
     share:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 6fd771ac0..4dacb0f4f 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -385,7 +385,6 @@ lt:
       post: Rašyti
       when: Kada
       comment: Komentuoti
-      ago: prieš %{ago}
       newer_comments: Naujesni komentarai
       older_comments: Senesni komentarai
   geocoder:
@@ -1685,7 +1684,6 @@ lt:
     trace:
       pending: LAUKIAMA
       count_points: '%{count} taškai(-ų)'
-      ago: Prieš %{time_in_words_ago}
       more: daugiau
       trace_details: Žiūrėti pėdsako detales
       view_map: Žemėlapis
@@ -1973,11 +1971,9 @@ lt:
       remove as friend: Nebedraugauti
       add as friend: Pridėti draugą
       mapper since: 'Žymi nuo:'
-      ago: Prieš %{time_in_words_ago}
       ct status: Talkininkų sąlygos
       ct undecided: Nenuspręsta
       ct declined: Atmesta
-      ct accepted: Praėjo %{ago}
       latest edit: 'Paskutinis pakeitimas %{ago}:'
       email address: 'E-pašto adresas:'
       created from: 'Sukurta iš:'
@@ -2260,10 +2256,7 @@ lt:
     show:
       title: Naudotoją %{block_on} blokuoja %{block_by}
       heading: Naudotoją %{block_on} blokuoja %{block_by}
-      time_future: Baigiasi %{time}
-      time_past: Baigėsi prieš %{time}
       created: Sukurta
-      ago: prieš %{time}
       status: BÅ«sena
       show: Rodyti
       edit: Keisti
@@ -2297,7 +2290,6 @@ lt:
       description: Aprašymas
       created_at: Sukurta
       last_changed: Paskutinį kartą atnaujinta
-      ago_html: prieš %{when}
   javascripts:
     close: Uždaryti
     share:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index f932465e1..1d4b8e83d 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -382,7 +382,6 @@ lv:
       post: Publicēt
       when: Kad
       comment: Komentārs
-      ago: '%{ago} atpakaļ'
       newer_comments: Jaunākie komentāri
       older_comments: Vecāki komentāri
   geocoder:
@@ -1672,7 +1671,6 @@ lv:
     trace:
       pending: RINDĀ
       count_points: '%{count} punkti'
-      ago: pirms %{time_in_words_ago}
       more: vairāk
       trace_details: Skatīt sīkāku informāciju par šo trasi
       view_map: Skatīt karti
@@ -1959,11 +1957,9 @@ lv:
       remove as friend: Atcelt draudzību
       add as friend: Pievienot kā draugu
       mapper since: 'Kartētājs kopš:'
-      ago: (pirms %{time_in_words_ago})
       ct status: 'Dalībnieka noteikumi:'
       ct undecided: Nav izlēmis
       ct declined: Noraidīti
-      ct accepted: Akceptēts %{ago} iepriekš
       latest edit: 'Pēdējais labojums %{ago}:'
       email address: 'E-pasta adrese:'
       created from: 'Izveidota no:'
@@ -2242,10 +2238,7 @@ lv:
     show:
       title: '%{block_on} bloķēts pēc %{block_by}'
       heading: '%{block_on} bloķēts pēc %{block_by}'
-      time_future: Beidzas %{time}
-      time_past: Beidzās %{time} atpakaļ.
       created: Izveidots
-      ago: '%{time} atpakaļ'
       status: Statuss
       show: Rādīt
       edit: Labot
@@ -2279,7 +2272,6 @@ lv:
       description: Apraksts
       created_at: Izveidots
       last_changed: Pēdējā izmaiņa
-      ago_html: '%{when} pirms'
   javascripts:
     close: Aizvērt
     share:
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index c1d661956..ca5b682e7 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -430,7 +430,6 @@ mk:
       post: Објава
       when: Кога
       comment: Коментар
-      ago: пред %{ago}
       newer_comments: Понови коментари
       older_comments: Постари коментари
   geocoder:
@@ -1910,7 +1909,6 @@ mk:
     trace:
       pending: ВО ИСЧЕКУВАЊЕ
       count_points: '%{count} точки'
-      ago: пред %{time_in_words_ago}
       more: повеќе
       trace_details: Погледајте ги деталите за трагата
       view_map: Погледај ја картата
@@ -2219,11 +2217,9 @@ mk:
       remove as friend: Отстрани од пријатели
       add as friend: Додај во пријатели
       mapper since: 'Картограф од:'
-      ago: (пред %{time_in_words_ago})
       ct status: 'Услови за учество:'
       ct undecided: Неодлучено
       ct declined: Одбиен
-      ct accepted: Прифатен пред %{ago} дена
       latest edit: 'Последно уредување %{ago}:'
       email address: Е-пошта
       created from: 'Создадено од:'
@@ -2525,10 +2521,7 @@ mk:
     show:
       title: '%{block_on} блокиран од %{block_by}'
       heading: '%{block_on} блокиран од %{block_by}'
-      time_future: Уредувања во %{time}
-      time_past: Истечено пред %{time}
       created: Создадено
-      ago: пред %{time}
       status: Статус
       show: Прикажи
       edit: Уреди
@@ -2562,7 +2555,6 @@ mk:
       description: Опис
       created_at: Создадена
       last_changed: Изменета
-      ago_html: пред %{when}
   javascripts:
     close: Затвори
     share:
diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 1e402ac2e..6605c8ca0 100644
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -192,7 +192,6 @@ mo:
       post: Месаж
       when: Кынд
       comment: Коментариу
-      ago: ку %{ago} ын урмэ
   geocoder:
     search_osm_nominatim:
       prefix:
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 4dbb91711..8e66b3123 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -321,7 +321,6 @@ mr:
       post: पाठवा
       when: कधी
       comment: अभिप्राय
-      ago: '%{ago} पूर्वी'
       newer_comments: नवे अभिप्राय
       older_comments: जुने अभिप्राय
   geocoder:
@@ -1198,7 +1197,6 @@ mr:
     trace:
       pending: प्रलंबित
       count_points: '%{count} बिंदू'
-      ago: '%{time_in_words_ago} पूर्वी'
       more: अधिक
       trace_details: अनुरेखाचा तपशील पहा
       view_map: नकाशा पहा
@@ -1303,11 +1301,9 @@ mr:
       edits: संपादने
       traces: अनुरेख
       notes: नकाशावरील टीपा
-      ago: (%{time_in_words_ago} पूर्वी)
       ct status: 'योगदात्यांसाठी अटी:'
       ct undecided: अनिर्णीत
       ct declined: अमान्य
-      ct accepted: '%{ago} पूर्वी मान्य'
       latest edit: 'नवीनतम संपादन %{ago}:'
       status: 'स्थिती:'
       description: वर्णन
@@ -1377,9 +1373,6 @@ mr:
       showing_page: पान %{page}
       next: पुढील »
       previous: « मागील
-  notes:
-    mine:
-      ago_html: '%{when} पूर्वी'
   javascripts:
     close: बंद करा
     share:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index b2701564f..588eee833 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -365,7 +365,6 @@ ms:
       post: Hantar
       when: Bila
       comment: Komen
-      ago: '%{ago} lalu'
       newer_comments: Komen Terbaru
       older_comments: Komen Terlama
   geocoder:
@@ -1565,7 +1564,6 @@ ms:
     trace:
       pending: MENUNGGU
       count_points: '%{count} titik'
-      ago: '%{time_in_words_ago} lalu'
       more: lagi
       trace_details: Lihat Butiran Jejak
       view_map: Lihat Peta
@@ -1844,11 +1842,9 @@ ms:
       remove as friend: Gugurkan Kawan
       add as friend: Jadikan Kawan
       mapper since: 'Pemeta sejak:'
-      ago: (%{time_in_words_ago} lalu)
       ct status: 'Terma-terma penyumbang:'
       ct undecided: Belum diputuskan
       ct declined: Ditolak
-      ct accepted: Diterima %{ago} dahulu
       latest edit: 'Suntingan terkini %{ago}:'
       email address: 'Alamat e-mel:'
       created from: 'Dibuat daripada:'
@@ -2116,8 +2112,6 @@ ms:
     show:
       title: '%{block_on} disekat oleh %{block_by}'
       heading: '%{block_on} disekat oleh %{block_by}'
-      time_future: Berakhir dalam masa %{time}
-      time_past: Berakhir %{time} lalu
       created: Dicipta
       status: Status
       show: Tunjukkan
@@ -2152,7 +2146,6 @@ ms:
       description: Keterangan
       created_at: Dicatatkan pada
       last_changed: Kali terakhir disunting
-      ago_html: '%{when} yang lalu'
   javascripts:
     close: Tutup
     share:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 2ff095bd2..ad0b0ffc6 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -200,7 +200,6 @@ my:
       edit: ပြင်ဆင်ရန်
     comments:
       comment: မှတ်ချက်
-      ago: '%{ago} အကြာက'
       newer_comments: ပိုသစ်သော မှတ်ချက်များ
       older_comments: ပိုဟောင်းသော မှတ်ချက်များ
   geocoder:
@@ -707,7 +706,6 @@ my:
     trace_paging_nav:
       showing_page: စာမျက်နှာ %{page}
     trace:
-      ago: '%{time_in_words_ago} အကြာက'
       more: ပို၍
       view_map: မြေပုံကို ကြည့်ရန်
       edit: ပြင်ဆင်ရန်
@@ -778,7 +776,6 @@ my:
       diary: နေ့စဉ်မှတ်တမ်း
       edits: တည်းဖြတ်မှုများ
       notes: မြေပုံ မှတ်စုများ
-      ct accepted: '%{ago} အကြာက တည်းဖြတ်ခဲ့သည်'
       email address: 'အီးမေးလ် လိပ်စာ:'
       status: 'အခြေအနေ:'
       description: ဖော်ပြချက်
@@ -831,7 +828,6 @@ my:
           one: 1 နှစ်
           other: '%{count} နှစ်'
     show:
-      ago: '%{time} အကြာက'
       status: အခြေအနေ
       show: ပြ
       edit: ပြင်ဆင်
@@ -849,7 +845,6 @@ my:
     mine:
       creator: ဖန်တီးသူ
       description: ဖော်ပြချက်
-      ago_html: '%{when} အကြာက'
   javascripts:
     close: ပိတ်ရန်
     share:
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 1165fb00a..ad81a3750 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -401,7 +401,6 @@ nb:
       post: Artikkel
       when: NÃ¥r
       comment: Kommentar
-      ago: '%{ago} siden'
       newer_comments: Nyere kommentarer
       older_comments: Eldre kommentarer
   geocoder:
@@ -1859,7 +1858,6 @@ nb:
     trace:
       pending: VENTER
       count_points: '%{count} punkter'
-      ago: '%{time_in_words_ago} siden'
       more: mer
       trace_details: Vis detaljer for spor
       view_map: Vis kart
@@ -2154,11 +2152,9 @@ nb:
       remove as friend: Fjern venn
       add as friend: Legg til venn
       mapper since: 'Bruker siden:'
-      ago: (%{time_in_words_ago} siden)
       ct status: 'Bidragsyters vilkår:'
       ct undecided: Usikker
       ct declined: Avslått
-      ct accepted: Akseptert %{ago} siden
       latest edit: 'Siste redigering %{ago}:'
       email address: 'E-postadresse:'
       created from: 'Opprettet fra:'
@@ -2439,10 +2435,7 @@ nb:
     show:
       title: '%{block_on} blokkert av %{block_by}'
       heading: '%{block_on} blokkert av %{block_by}'
-      time_future: Slutter om %{time}
-      time_past: Sluttet for %{time} siden
       created: Opprettet
-      ago: for %{time} siden
       status: Status
       show: Vis
       edit: Rediger
@@ -2476,7 +2469,6 @@ nb:
       description: Beskrivelse
       created_at: Opprettet
       last_changed: Sist endret
-      ago_html: for %{when} siden
   javascripts:
     close: Lukk
     share:
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index e2c24a156..98454846a 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -367,7 +367,6 @@ ne:
       post: पोष्ट
       when: कहिले
       comment: टिप्पणी
-      ago: '%{ago} पहिले'
       newer_comments: नयाँ टिप्पणीहरू
       older_comments: पूरानो टिप्पणीहरू
   geocoder:
@@ -1084,7 +1083,6 @@ ne:
     trace:
       pending: बाँकी रहेको
       count_points: पोइन्टहरु %{count}
-      ago: '%{time_in_words_ago} पहिले'
       more: थप
       trace_details: ट्रेसको विस्तृत जानकारी हेर्ने
       view_map: नक्सा हेर्ने
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 0c79fa48e..59fc1bcd7 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -433,7 +433,6 @@ nl:
       post: Dagboekbericht
       when: Wanneer
       comment: Reactie
-      ago: '%{ago} geleden'
       newer_comments: Nieuwe opmerkingen
       older_comments: Eerdere opmerkingen
   geocoder:
@@ -1915,7 +1914,6 @@ nl:
     trace:
       pending: BEZIG
       count_points: '%{count} punten'
-      ago: '%{time_in_words_ago} geleden'
       more: meer
       trace_details: Trackdetails bekijken
       view_map: Kaart bekijken
@@ -2216,11 +2214,9 @@ nl:
       remove as friend: Vriend verwijderen
       add as friend: Vriend toevoegen
       mapper since: 'Mapper sinds:'
-      ago: (%{time_in_words_ago} geleden)
       ct status: 'Voorwaarden voor bijdragen:'
       ct undecided: Onbeslist
       ct declined: Afgewezen
-      ct accepted: '%{ago} geleden geaccepteerd'
       latest edit: 'Laatste bewerking %{ago}:'
       email address: 'E-mailadres:'
       created from: 'Aangemaakt door:'
@@ -2508,10 +2504,7 @@ nl:
     show:
       title: '%{block_on} geblokkeerd door %{block_by}'
       heading: '%{block_on} geblokkeerd door %{block_by}'
-      time_future: Vervalt over %{time}
-      time_past: Is %{time} geleden vervallen
       created: Aangemaakt
-      ago: '%{time} geleden'
       status: Status
       show: Weergeven
       edit: Bewerken
@@ -2545,7 +2538,6 @@ nl:
       description: Beschrijving
       created_at: Aangemaakt op
       last_changed: Laatste wijziging
-      ago_html: '%{when} geleden'
   javascripts:
     close: Sluiten
     share:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 39556dcd7..937c8bba4 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -355,7 +355,6 @@ nn:
       post: Post
       when: NÃ¥r
       comment: Kommentar
-      ago: '%{ago} sidan'
       newer_comments: Nyare kommentarar
       older_comments: Eldre kommentarar
   geocoder:
@@ -1473,7 +1472,6 @@ nn:
     trace:
       pending: VENTAR
       count_points: '%{count} punkt'
-      ago: '%{time_in_words_ago} sidan'
       more: meir
       trace_details: Vis detaljar for spor
       view_map: Vis kart
@@ -1749,11 +1747,9 @@ nn:
       remove as friend: Fjern ven
       add as friend: Legg til ven
       mapper since: 'Brukar sidan:'
-      ago: (%{time_in_words_ago} sidan)
       ct status: 'Bidragsytarvilkår:'
       ct undecided: Usikker
       ct declined: Avslått
-      ct accepted: Akseptert %{ago} sidan
       latest edit: 'Siste redigering %{ago}:'
       email address: 'E-postadresse:'
       created from: 'Oppretta frå:'
@@ -2015,10 +2011,7 @@ nn:
     show:
       title: '%{block_on} blokkert av %{block_by}'
       heading: '%{block_on} blokkert av %{block_by}'
-      time_future: Sluttar om %{time}
-      time_past: Slutta %{time} sidan
       created: Oppretta
-      ago: '%{time} sidan'
       status: Status
       show: Vis
       edit: Rediger
@@ -2051,7 +2044,6 @@ nn:
       description: Skildring
       created_at: Oppretta den
       last_changed: Sist endra
-      ago_html: '%{when} sidan'
   javascripts:
     close: Lat att
     share:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 2a798627d..4901a9ad4 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -373,7 +373,6 @@ oc:
       post: Mandar
       when: Quand
       comment: Comentari
-      ago: i a %{ago}
       newer_comments: Comentaris mai recents
       older_comments: Comentaris mai ancians
   geocoder:
@@ -1603,7 +1602,6 @@ oc:
     trace:
       pending: EN ESPÈRA
       count_points: '%{count} punts'
-      ago: i a %{time_in_words_ago}
       more: mai
       trace_details: Veire los detalhs de la traça
       view_map: Veire la mapa
@@ -1853,11 +1851,9 @@ oc:
       remove as friend: Suprimir en tant qu'amic
       add as friend: Apondre en tant qu'amic
       mapper since: 'Mapaire dempuèi :'
-      ago: (i a %{time_in_words_ago})
       ct status: 'Condicions del contributor :'
       ct undecided: Pas decidit
       ct declined: Refusat
-      ct accepted: Acceptat fa %{ago}
       latest edit: 'Darrièra modificacion %{ago} :'
       email address: 'Adreça de corrièr electronic :'
       created from: 'Creat dempuèi :'
@@ -2085,10 +2081,7 @@ oc:
     show:
       title: '%{block_on} blocat per %{block_by}'
       heading: '%{block_on} blocat per %{block_by}'
-      time_future: S'acaba dins %{time}
-      time_past: S'es acabat fa %{time}
       created: Creat
-      ago: i a %{time}
       status: Estatut
       show: Afichar
       edit: Modificar
@@ -2122,7 +2115,6 @@ oc:
       description: Descripcion
       created_at: Creat lo
       last_changed: Darrièr cambiament
-      ago_html: i a %{when}
   javascripts:
     close: Tampar
     share:
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 7733daebc..c8ffc3731 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -214,7 +214,6 @@ pa:
       post: ਡਾਕ
       when: ਕਦੋਂ
       comment: ਟਿੱਪਣੀ
-      ago: '%{ago} ਪਹਿਲਾਂ'
       newer_comments: ਹੋਰ ਨਵੀਆਂ ਟਿੱਪਣੀਆਂ
       older_comments: ਹੋਰ ਪੁਰਾਣੀਆਂ ਟਿੱਪਣੀਆਂ
   geocoder:
@@ -979,7 +978,6 @@ pa:
     trace:
       pending: ਲਮਕਦਾ
       count_points: '%{count} ਬਿੰਦੂ'
-      ago: '%{time_in_words_ago} ਪਹਿਲਾਂ'
       more: ਹੋਰ
       trace_details: ਖੁਰਾ-ਖੋਜ ਦਾ ਵੇਰਵਾ ਵੇਖੋ
       view_map: ਨਕਸ਼ਾ ਵੇਖੋ
@@ -1086,11 +1084,9 @@ pa:
       remove as friend: ਯਾਰੀ ਤੋੜੋ
       add as friend: ਯਾਰੀ ਪਾਉ
       mapper since: 'ਕਦੋਂ ਤੋਂ ਨਕਸ਼ਾਸਾਜ਼:'
-      ago: (%{time_in_words_ago} ਪਹਿਲਾਂ)
       ct status: 'ਯੋਗਦਾਨੀ ਦੀਆਂ ਸ਼ਰਤਾਂ:'
       ct undecided: ਦੁਚਿੱਤੀ 'ਚ
       ct declined: ਨਕਾਰੀ
-      ct accepted: '%{ago} ਪਹਿਲਾਂ ਕਬੂਲੀ'
       latest edit: 'ਆਖ਼ਰੀ ਸੋਧ %{ago}:'
       email address: 'ਈਮੇਲ ਪਤਾ:'
       created from: 'ਕਿੱਥੋਂ ਉਸਾਰਿਆ:'
@@ -1233,7 +1229,6 @@ pa:
       description: ਵੇਰਵਾ
       created_at: ਕਦੋਂ ਸਿਰਜਿਆ ਗਿਆ
       last_changed: ਆਖ਼ਰੀ ਤਬਦੀਲੀ
-      ago_html: '%{when} ਪਹਿਲਾਂ'
   javascripts:
     close: ਬੰਦ ਕਰੋ
     share:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 5939c66f7..fa2fdd98b 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -26,6 +26,7 @@
 # Author: M4sk1n
 # Author: Macofe
 # Author: Maraf24
+# Author: Maro21
 # Author: Mateon1
 # Author: Nemo bis
 # Author: Odie2
@@ -65,7 +66,7 @@ pl:
       diary_entry:
         create: Opublikuj
       issue_comment:
-        create: Dodaj Komentarz
+        create: Dodaj komentarz
       message:
         create: Wyślij
       client_application:
@@ -100,13 +101,13 @@ pl:
       old_node: Stary węzeł
       old_node_tag: Znacznik wcześniejszego węzła
       old_relation: Stara relacja
-      old_relation_member: Członek starej relacji
+      old_relation_member: Człon starej relacji
       old_relation_tag: Znacznik wcześniejszej relacji
       old_way: Stara linia
       old_way_node: Węzeł starej linii
       old_way_tag: Znacznik starej linii
       relation: Relacja
-      relation_member: Członek relacji
+      relation_member: Człon relacji
       relation_tag: Tag relacji
       session: Sesja
       trace: Ślad
@@ -151,6 +152,45 @@ pl:
         description: Opis
         languages: Języki
         pass_crypt: Hasło
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: około godziny temu
+        other: około %{count} h temu
+      about_x_months:
+        one: około miesiąc temu
+        other: około %{count} mies. temu
+      about_x_years:
+        one: około rok temu
+        other: około %{count} lata temu
+      almost_x_years:
+        one: prawie rok temu
+        other: prawie %{count} lata temu
+      half_a_minute: 30 sekund temu
+      less_than_x_seconds:
+        one: mniej niż sekundę temu
+        other: mniej niż %{count} sekund temu
+      less_than_x_minutes:
+        one: mniej niż minutę temu
+        other: mniej niż %{count} minut temu
+      over_x_years:
+        one: ponad rok temu
+        other: ponad %{count} lata temu
+      x_seconds:
+        one: sekundę temu
+        other: '%{count} sekund temu'
+      x_minutes:
+        one: minutę temu
+        other: '%{count} min temu'
+      x_days:
+        one: 1 dzień temu
+        other: '%{count} dni temu'
+      x_months:
+        one: miesiąc temu
+        other: '%{count} mies. temu'
+      x_years:
+        one: rok temu
+        other: '%{count} lata temu'
   printable_name:
     with_version: '%{id}, wersja %{version}'
     with_name_html: '%{name}(%{id})'
@@ -171,14 +211,14 @@ pl:
   api:
     notes:
       comment:
-        opened_at_html: Stworzono %{when} temu
-        opened_at_by_html: Stworzono %{when} temu przez %{user}
-        commented_at_html: Zaktualizowano %{when} temu
-        commented_at_by_html: Zaktualizowano %{when} temu przez %{user}
-        closed_at_html: Rozwiązano %{when} temu
-        closed_at_by_html: Rozwiązano %{when} temu przez %{user}
-        reopened_at_html: Ponownie aktywowano %{when} temu
-        reopened_at_by_html: Ponownie aktywowano %{when} temu przez %{user}
+        opened_at_html: Stworzono %{when}
+        opened_at_by_html: Stworzono %{when} przez %{user}
+        commented_at_html: Zaktualizowano %{when}
+        commented_at_by_html: Zaktualizowano %{when} przez %{user}
+        closed_at_html: Rozwiązano %{when}
+        closed_at_by_html: Rozwiązano %{when} przez %{user}
+        reopened_at_html: Ponownie aktywowano %{when}
+        reopened_at_by_html: Ponownie aktywowano %{when} przez %{user}
       rss:
         title: Uwagi OpenStreetMap
         description_area: Lista uwag stworzonych, skomentowanych lub zamkniętych w
@@ -194,12 +234,12 @@ pl:
   browse:
     created: Utworzone
     closed: Zamknięte
-    created_html: Utworzone <abbr title='%{title}'>%{time} temu</abbr>
-    closed_html: Zamknięte <abbr title='%{title}'>%{time} temu</abbr>
-    created_by_html: Utworzone <abbr title='%{title}'>%{time} temu</abbr> przez %{user}
-    deleted_by_html: Usunięte <abbr title='%{title}'>%{time} temu</abbr> przez %{user}
-    edited_by_html: Edytowane <abbr title='%{title}'>%{time} temu</abbr> przez %{user}
-    closed_by_html: Zamknięte <abbr title='%{title}'>%{time} temu </abbr> przez %{user}
+    created_html: Utworzone <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Zamknięte <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Utworzone <abbr title='%{title}'>%{time}</abbr> przez %{user}
+    deleted_by_html: Usunięte <abbr title='%{title}'>%{time}</abbr> przez %{user}
+    edited_by_html: Edytowane <abbr title='%{title}'>%{time}</abbr> przez %{user}
+    closed_by_html: Zamknięte <abbr title='%{title}'>%{time} </abbr> przez %{user}
     version: Wersja
     in_changeset: Zestaw zmian
     anonymous: Anonimowy użytkownik
@@ -219,9 +259,8 @@ pl:
       relation: Relacje (%{count})
       relation_paginated: Relacje (%{x}-%{y} z %{count})
       comment: Komentarze (%{count})
-      hidden_commented_by: Ukryty komentarz od użytkownika %{user} <abbr title='%{exact_time}'>%{when}
-        temu</abbr>
-      commented_by: Komentarz od %{user} <abbr title='%{exact_time}'>%{when} temu</abbr>
+      hidden_commented_by: Ukryty komentarz od użytkownika %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Komentarz od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: XML w formacie zestawu zmian
       osmchangexml: XML w formacie osmChange
       feed:
@@ -244,7 +283,7 @@ pl:
     relation:
       title: 'Relacja: %{name}'
       history_title: 'Historia relacji: %{name}'
-      members: Członkowie
+      members: Człony relacji
     relation_member:
       entry: '%{type} %{name}'
       entry_role: '%{type} %{name} jako %{role}'
@@ -301,20 +340,15 @@ pl:
       open_title: 'Nierozwiązana uwaga #%{note_name}'
       closed_title: 'Rozwiązana uwaga #%{note_name}'
       hidden_title: 'Ukryta uwaga #%{note_name}'
-      open_by: 'Utworzona przez: %{user} <abbr title=''%{exact_time}''>%{when} temu</abbr>'
-      open_by_anonymous: Utworzona anonimowo <abbr title='%{exact_time}'>%{when} temu.</abbr>
-      commented_by: Komentarz od %{user} <abbr title='%{exact_time}'>%{when} temu</abbr>
-      commented_by_anonymous: Skomentowana anonimowo <abbr title='%{exact_time}'>%{when}
-        temu</abbr>
-      closed_by: 'Rozwiązana przez: %{user} <abbr title=''%{exact_time}''>%{when}
-        temu</abbr>'
-      closed_by_anonymous: Rozwiązana anonimowo <abbr title='%{exact_time}'>%{when}
-        temu</abbr>
-      reopened_by: Ponownie aktywowana przez %{user} <abbr title='%{exact_time}'>%{when}
-        temu</abbr>
-      reopened_by_anonymous: Ponownie aktywowana anonimowo <abbr title='%{exact_time}'>%{when}
-        temu</abbr>
-      hidden_by: Ukryte przez %{user} <abbr title='%{exact_time}'>%{when} temu</abbr>
+      open_by: 'Utworzona przez: %{user} <abbr title=''%{exact_time}''>%{when}</abbr>'
+      open_by_anonymous: Utworzona anonimowo <abbr title='%{exact_time}'>%{when}.</abbr>
+      commented_by: Komentarz od %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Skomentowana anonimowo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: 'Rozwiązana przez: %{user} <abbr title=''%{exact_time}''>%{when}</abbr>'
+      closed_by_anonymous: Rozwiązana anonimowo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Ponownie aktywowana przez %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Ponownie aktywowana anonimowo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Ukryte przez %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Zgłoś tę uwagę
     query:
       title: Dane obiektu
@@ -353,7 +387,7 @@ pl:
   changeset_comments:
     comment:
       comment: 'Nowy komentarz do zestawu zmian #%{changeset_id}% autorstwa %{author}'
-      commented_at_by_html: Zaktualizowano %{when} temu przez %{user}
+      commented_at_by_html: Zaktualizowano %{when} przez %{user}
     comments:
       comment: 'Nowy komentarz do zestawu zmian #%{changeset_id} autorstwa %{author}'
     index:
@@ -435,7 +469,6 @@ pl:
       post: Wpis
       when: Kiedy
       comment: Komentarz
-      ago: '%{ago} temu'
       newer_comments: Nowsze komentarze
       older_comments: Starsze komentarze
   geocoder:
@@ -534,7 +567,7 @@ pl:
           place_of_worship: Miejsce kultu
           police: Policja lub straż miejska/gminna
           post_box: Skrzynka pocztowa
-          post_office: Poczta-urząd pocztowy
+          post_office: Poczta
           preschool: Przedszkole
           prison: Więzienie/areszt
           pub: Pub
@@ -563,12 +596,12 @@ pl:
           village_hall: Urząd gminy
           waste_basket: Kosz na śmieci
           waste_disposal: Śmietnik
-          water_point: Punkt Wody
+          water_point: Punkt poboru wody
           youth_centre: Centrum młodzieżowe
         boundary:
           administrative: Granica gminy
           census: Granica spisu ludności
-          national_park: Park Narodowy
+          national_park: Park narodowy
           protected_area: Obszar chroniony
         bridge:
           aqueduct: Akwedukt
@@ -581,7 +614,7 @@ pl:
           "yes": Budynek
         craft:
           brewery: Browar
-          carpenter: Stolarz
+          carpenter: Cieśla
           electrician: Elektryk
           gardener: Ogrodnik
           painter: Malarz
@@ -672,7 +705,7 @@ pl:
           wayside_cross: Przydrożny krzyż
           wayside_shrine: Przydrożna kapliczka
           wreck: Zatopiony statek
-          "yes": Miejsce Historyczne
+          "yes": Miejsce historyczne
         junction:
           "yes": Funkcja
         landuse:
@@ -691,7 +724,7 @@ pl:
           grass: Trawa
           greenfield: Tereny niezagospodarowane
           industrial: Teren przemysłowy
-          landfill: Wysypisko śmieci
+          landfill: Składowisko odpadów
           meadow: Łąka
           military: Teren wojskowy
           mine: Kopalnia
@@ -709,12 +742,12 @@ pl:
           "yes": Zagospodarowanie terenu
         leisure:
           beach_resort: Strzeżona plaża
-          bird_hide: Ukryj ptaki
+          bird_hide: Czatownia ornitologiczna
           common: Błonie
           dog_park: Wybieg dla psów
           firepit: Palenisko
           fishing: Łowisko
-          fitness_centre: Centrum Fitness
+          fitness_centre: Siłownia
           fitness_station: Siłownia zewnętrzna
           garden: Ogród
           golf_course: Pole golfowe
@@ -771,7 +804,7 @@ pl:
           water_works: Wodociągi
           windmill: Młyn wiatrowy
           works: Fabryka
-          "yes": Sztuczny
+          "yes": Konstrukcja
         military:
           airfield: Lotnisko wojskowe
           barracks: Koszary
@@ -906,7 +939,7 @@ pl:
           chemist: Drogeria
           clothes: Sklep odzieżowy
           computer: Sklep komputerowy
-          confectionery: Cukiernia
+          confectionery: Sklep ze słodyczami
           convenience: Sklep ogólnospożywczy
           copyshop: Ksero
           cosmetics: Sklep kosmetyczny
@@ -918,11 +951,11 @@ pl:
           electronics: Sklep elektroniczny
           estate_agent: Biuro nieruchomości
           farm: Sklep gospodarski
-          fashion: Sklep z modą
+          fashion: Sklep odzieżowy
           fish: Sklep rybny
           florist: Kwiaciarnia
           food: Sklep spożywczy
-          funeral_directors: Zakłady pogrzebowe
+          funeral_directors: Zakład pogrzebowy
           furniture: Sklep meblowy
           gallery: Galeria
           garden_centre: Centrum ogrodnicze
@@ -930,9 +963,9 @@ pl:
           gift: Sklep z pamiątkami
           greengrocer: Warzywniak
           grocery: Sklep spożywczy
-          hairdresser: Fryzjernia
+          hairdresser: Fryzjer
           hardware: Sklep ze sprzętem
-          hifi: Hi-Fi
+          hifi: Sklep ze sprzętem hi-fi
           houseware: Sklep z artykułami gospodarstwa domowego
           interior_decoration: Sklep z dekoracją wnętrz
           jewelry: Sklep z biżuterią
@@ -969,7 +1002,7 @@ pl:
           tyres: Sklep z oponami
           vacant: Sklep zamknięty
           variety_store: Mały sklep wielobranżowy
-          video: Sklep filmowy
+          video: Sklep wideo/DVD
           wine: Sklep z winami
           "yes": Sklep
         tourism:
@@ -978,9 +1011,9 @@ pl:
           artwork: Dzieło sztuki
           attraction: Atrakcja turystyczna
           bed_and_breakfast: Bed and Breakfast
-          cabin: Kabina
+          cabin: Domek letniskowy
           camp_site: Kemping
-          caravan_site: Miejsce na przyczepę campingową
+          caravan_site: Miejsce na przyczepę kempingową
           chalet: Schronisko
           gallery: Galeria
           guest_house: Pensjonat
@@ -1018,9 +1051,9 @@ pl:
           "yes": Szlak wodny
       admin_levels:
         level2: Granica kraju
-        level4: 'Granica:'
+        level4: Granica
         level5: Granica regionu
-        level6: 'Granica powiatu:'
+        level6: Granica powiatu
         level8: Granica miejscowości
         level9: Granica dzielnicy
         level10: Granica przedmieścia
@@ -1043,17 +1076,16 @@ pl:
       select_type: Wybierz kategorię
       select_last_updated_by: Ostatnio zaktualizowane przez
       reported_user: Zgłoszony użytkownik
-      not_updated: Nie zaktualizowane
+      not_updated: Niezaktualizowane
       search: Wyszukaj
       search_guidance: Przeszukaj sprawy
-      user_not_found: Użytkownika nie istnieje
+      user_not_found: Użytkownik nie istnieje
       issues_not_found: Nie znaleziono takiej sprawy
       status: Stan
       reports: Zgłoszenia
       last_updated: Ostatnia aktualizacja
-      last_updated_time_html: <abbr title='%{title}'>%{time} temu</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time} temu</abbr> przez
-        %{user}
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> przez %{user}
       link_to_reports: Zobacz zgłoszenia
       reports_count:
         one: 1 zgłoszenie
@@ -1082,7 +1114,7 @@ pl:
       ignore: Zignoruj
       reopen: Otwórz ponownie
       reports_of_this_issue: Zgłoszenia w tej sprawie
-      read_reports: Czytaj Raporty
+      read_reports: Czytaj raporty
       new_reports: Nowe zgłoszenia
       other_issues_against_this_user: Inne sprawy przeciwko temu użytkownikowi
       no_other_issues: Brak innych zgłoszeń dotyczących tego użytkownika.
@@ -1904,7 +1936,6 @@ pl:
     trace:
       pending: OCZEKUJE
       count_points: '%{count} punktów'
-      ago: '%{time_in_words_ago} temu'
       more: więcej
       trace_details: Wyświetl szczegóły śladu
       view_map: Wyświetl mapę
@@ -2204,11 +2235,9 @@ pl:
       remove as friend: usuń ze znajomych
       add as friend: dodaj do znajomych
       mapper since: 'Mapuje od:'
-      ago: (%{time_in_words_ago} temu)
       ct status: 'Warunki uczestnictwa:'
       ct undecided: niezdecydowane
       ct declined: odrzucone
-      ct accepted: przyjęte %{ago} temu
       latest edit: 'Ostatnia zmiana %{ago}:'
       email address: Adres e‐mail
       created from: 'Stworzony z:'
@@ -2481,11 +2510,23 @@ pl:
       time_future: Blokada wygasa za %{time}.
       until_login: Aktywne do momentu zalogowania użytkownika.
       time_future_and_until_login: Kończy się %{time} i po zalogowaniu się użytkownika.
-      time_past: Zakończono %{time} temu.
+      time_past: Zakończono %{time}.
       block_duration:
         hours:
           one: 1 godzina
           other: '%{count} godzin'
+        days:
+          one: 1 dzień
+          other: '%{count} dni'
+        weeks:
+          one: tydzień
+          other: '%{count} tygodnie'
+        months:
+          one: miesiąc
+          other: '%{count} mies.'
+        years:
+          one: rok
+          other: '%{count} lata'
     blocks_on:
       title: Blokady na użytkownika %{name}
       heading: Lista blokad na użytkownika %{name}
@@ -2497,10 +2538,7 @@ pl:
     show:
       title: '%{block_on} zablokowany przez użytkownika %{block_by}'
       heading: '%{block_on} zablokowany przez użytkownika %{block_by}'
-      time_future: Blokada wygasa za %{time}
-      time_past: Zakończona %{time} temu
       created: Utworzony
-      ago: '%{time} temu'
       status: Stan
       show: Wyświetl
       edit: Edytuj
@@ -2534,7 +2572,6 @@ pl:
       description: Opis
       created_at: Utworzono w dniu
       last_changed: Ostatnio zmieniono
-      ago_html: '%{when} temu'
   javascripts:
     close: Zamknij
     share:
@@ -2624,7 +2661,7 @@ pl:
       engines:
         fossgis_osrm_bike: Rower (OSRM)
         fossgis_osrm_car: Samochód (OSRM)
-        fossgis_osrm_foot: Pieszo (OSRM}
+        fossgis_osrm_foot: Pieszo (OSRM)
         graphhopper_bicycle: Rower (GraphHopper)
         graphhopper_car: Samochód (GraphHopper)
         graphhopper_foot: Pieszo (GraphHopper)
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index f24db01a3..d2b884efc 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -206,14 +206,14 @@ pt-BR:
   api:
     notes:
       comment:
-        opened_at_html: Criado %{when} atrás
-        opened_at_by_html: Criado %{when} atrás por %{user}
-        commented_at_html: Atualizado %{when} atrás
-        commented_at_by_html: Atualizado %{when} atrás por %{user}
-        closed_at_html: Resolvido %{when} atrás
-        closed_at_by_html: Resolvido %{when} atrás por %{user}
-        reopened_at_html: Reativado %{when} atrás
-        reopened_at_by_html: Reativado %{when} atrás por %{user}
+        opened_at_html: Criado %{when}
+        opened_at_by_html: Criado %{when} por %{user}
+        commented_at_html: Atualizado %{when}
+        commented_at_by_html: Atualizado %{when} por %{user}
+        closed_at_html: Resolvido %{when}
+        closed_at_by_html: Resolvido %{when} por %{user}
+        reopened_at_html: Reativado %{when}
+        reopened_at_by_html: Reativado %{when} por %{user}
       rss:
         title: Notas do OpenStreetMap
         description_area: Uma lista de notas relatadas, comentadas ou encerradas na
@@ -229,12 +229,12 @@ pt-BR:
   browse:
     created: Criado
     closed: Fechado
-    created_html: Criado <abbr title='%{title}'>%{time} atrás</abbr>
-    closed_html: Fechado <abbr title='%{title}'>%{time} atrás</abbr>
-    created_by_html: Criado <abbr title='%{title}'>%{time} atrás</abbr> por %{user}
-    deleted_by_html: Excluído <abbr title='%{title}'>%{time} atrás</abbr> por %{user}
-    edited_by_html: Editado <abbr title='%{title}'>%{time} atrás</abbr> por %{user}
-    closed_by_html: Fechado <abbr title='%{title}'>%{time} atrás</abbr> por %{user}
+    created_html: Criado <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Fechado <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Criado <abbr title='%{title}'>%{time}</abbr> por %{user}
+    deleted_by_html: Excluído <abbr title='%{title}'>%{time}</abbr> por %{user}
+    edited_by_html: Editado <abbr title='%{title}'>%{time}</abbr> por %{user}
+    closed_by_html: Fechado <abbr title='%{title}'>%{time}</abbr> por %{user}
     version: Versão
     in_changeset: Conjunto de alterações
     anonymous: anônimo
@@ -254,9 +254,8 @@ pt-BR:
       relation: Relações (%{count})
       relation_paginated: Relações (%{x}-%{y} de %{count})
       comment: Comentários (%{count})
-      hidden_commented_by: Comentário oculto de %{user} <abbr title='%{exact_time}'>%{when}
-        atrás</abbr>
-      commented_by: Comentário de %{user} <abbr title='%{exact_time}'>%{when} atrás</abbr>
+      hidden_commented_by: Comentário oculto de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Comentário de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: XML do conjunto de alterações
       osmchangexml: XML osmChange
       feed:
@@ -334,19 +333,15 @@ pt-BR:
       open_title: 'Nota não resolvida #%{note_name}'
       closed_title: 'Nota resolvida #%{note_name}'
       hidden_title: 'Nota oculta #%{note_name}'
-      open_by: Criado por %{user} <abbr title='%{exact_time}'>%{when} atrás</abbr>
-      open_by_anonymous: Criado por um usuário anônimo <abbr title='%{exact_time}'>%{when}
-        atrás</abbr>
-      commented_by: Comentado por %{user} <abbr title='%{exact_time}'>%{when} atrás</abbr>
-      commented_by_anonymous: Comentado por um usuário anônimo <abbr title='%{exact_time}'>%{when}
-        atrás</abbr>
-      closed_by: Resolvido por %{user} <abbr title='%{exact_time}'>%{when} atrás</abbr>
-      closed_by_anonymous: Resolvido por um usuário anônimo <abbr title='%{exact_time}'>%{when}
-        atrás</abbr>
-      reopened_by: Reaberto por %{user} <abbr title='%{exact_time}'>%{when} atrás</abbr>
-      reopened_by_anonymous: Reaberto por um usuário anônimo <abbr title='%{exact_time}'>%{when}
-        atrás</abbr>
-      hidden_by: Ocultado por %{user} <abbr title='%{exact_time}'>%{when} atrás</abbr>
+      open_by: Criado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Criado por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Comentado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Comentado por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Resolvido por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Resolvido por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Reaberto por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Reaberto por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Ocultado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Denunciar esta nota
     query:
       title: Consultar elementos
@@ -386,7 +381,7 @@ pt-BR:
   changeset_comments:
     comment:
       comment: 'Comentário novo no conjunto de alterações #%{changeset_id} por %{author}'
-      commented_at_by_html: Atualizado %{when} atrás por %{user}
+      commented_at_by_html: Atualizado %{when} por %{user}
     comments:
       comment: 'Comentário novo no conjunto de alterações #%{changeset_id} por %{author}'
     index:
@@ -471,7 +466,6 @@ pt-BR:
       post: Entrada
       when: Quando
       comment: Comentário
-      ago: '%{ago} atrás'
       newer_comments: Comentários mais recentes
       older_comments: Comentários mais antigos
   geocoder:
@@ -1087,9 +1081,8 @@ pt-BR:
       status: Status
       reports: Relatórios
       last_updated: Última Atualização
-      last_updated_time_html: <abbr title='%{title}'>%{time} atrás</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time} atrás</abbr> por
-        %{user}
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> por %{user}
       link_to_reports: Ver Denúncias
       reports_count:
         one: 1 Relatório
@@ -1961,7 +1954,6 @@ pt-BR:
     trace:
       pending: PENDENTE
       count_points: '%{count} pontos'
-      ago: '%{time_in_words_ago} atrás'
       more: mais
       trace_details: Ver detalhes da trilha
       view_map: Ver Mapa
@@ -2273,12 +2265,10 @@ pt-BR:
       remove as friend: Desfazer Amizade
       add as friend: Adicionar como amigo
       mapper since: 'Mapeador desde:'
-      ago: (%{time_in_words_ago} atrás)
       ct status: 'Termos do contribuidor:'
       ct undecided: Não decidido
       ct declined: Discordo
-      ct accepted: Aceito %{ago} atrás
-      latest edit: 'Última edição %{ago}:'
+      latest edit: 'Última edição (%{ago}):'
       email address: 'Endereço de e-mail:'
       created from: 'Criado de:'
       status: 'Estado:'
@@ -2577,10 +2567,7 @@ pt-BR:
     show:
       title: '%{block_on} bloqueado por %{block_by}'
       heading: '%{block_on} bloqueado por %{block_by}'
-      time_future: Termina em %{time}
-      time_past: Terminou há %{time}
       created: Criado
-      ago: '%{time} atrás'
       status: Estado
       show: Exibir
       edit: Editar
@@ -2614,7 +2601,6 @@ pt-BR:
       description: Descrição
       created_at: Criado em
       last_changed: Última alteração
-      ago_html: '%{when} atrás'
   javascripts:
     close: Fechar
     share:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 13a49348f..8d53d65b8 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -409,7 +409,6 @@ pt-PT:
       post: Entrada
       when: Quando
       comment: Comentário
-      ago: '%{ago} atrás'
       newer_comments: Comentários mais recentes
       older_comments: Comentários mais antigos
   geocoder:
@@ -1886,7 +1885,6 @@ pt-PT:
     trace:
       pending: PENDENTE
       count_points: '%{count} pontos'
-      ago: Há %{time_in_words_ago}
       more: mais
       trace_details: Ver Detalhes do Trilho
       view_map: Ver Mapa
@@ -2187,11 +2185,9 @@ pt-PT:
       remove as friend: Remover amigo
       add as friend: Adicionar aos amigos
       mapper since: 'A cartografar desde:'
-      ago: (%{time_in_words_ago} atrás)
       ct status: 'Termos de Colaborador:'
       ct undecided: Indeciso
       ct declined: Rejeitou
-      ct accepted: Aceite há %{ago}
       latest edit: 'Última edição %{ago}:'
       email address: 'E-mail:'
       created from: 'Criado em:'
@@ -2488,10 +2484,7 @@ pt-PT:
     show:
       title: '%{block_on} bloqueado por %{block_by}'
       heading: '%{block_on} bloqueado por %{block_by}'
-      time_future: Termina em %{time}
-      time_past: Terminou há %{time} atrás
       created: Criado
-      ago: há %{time}
       status: Estado
       show: Mostrar
       edit: Editar
@@ -2525,7 +2518,6 @@ pt-PT:
       description: Descrição
       created_at: Criado em
       last_changed: Última alteração
-      ago_html: há %{when}
   javascripts:
     close: Fechar
     share:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index cb7d91178..5846ce0c3 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -402,7 +402,6 @@ ro:
       post: Postează
       when: Când
       comment: Comentariu
-      ago: cu %{ago} în urmă
       newer_comments: Comentarii mai noi
       older_comments: Comentarii mai vechi
   geocoder:
@@ -1894,7 +1893,6 @@ ro:
     trace:
       pending: ÎN AȘTEPTARE
       count_points: puncte %{count}
-      ago: '%{time_in_words_ago} în urmă'
       more: mai multe
       trace_details: Vezi detaliile urmei
       view_map: Vezi hartă
@@ -2209,11 +2207,9 @@ ro:
       remove as friend: Scoate din lista de prieteni
       add as friend: Adaugă Prieten
       mapper since: 'Cartograf din:'
-      ago: (%{time_in_words_ago} în urmă)
       ct status: 'Termenii colaboratorului:'
       ct undecided: Nedefinit
       ct declined: Declinat
-      ct accepted: Acceptat %{ago} în urmă
       latest edit: 'Ultima editare %{ago}:'
       email address: 'Adresa de e-mail:'
       created from: 'Creat de la:'
@@ -2524,10 +2520,7 @@ ro:
     show:
       title: '%{block_on} blocat de %{block_by}'
       heading: '%{block_on} blocat de %{block_by}'
-      time_future: Se termină în %{time}.
-      time_past: Terminat în urmă cu %{time}.
       created: Creat
-      ago: '%{time} acum'
       status: Stare
       show: Arată
       edit: Modificare
@@ -2562,7 +2555,6 @@ ro:
       description: Descriere
       created_at: Creat  la
       last_changed: Ultima modificare
-      ago_html: '%{when} acum'
   javascripts:
     close: Închide
     share:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 090ae8c68..0932acb66 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -510,7 +510,6 @@ ru:
       post: Сообщение
       when: Когда
       comment: Комментарий
-      ago: '%{ago} назад'
       newer_comments: Более новые комментарии
       older_comments: Более старые комментарии
   geocoder:
@@ -1981,7 +1980,6 @@ ru:
     trace:
       pending: ОБРАБОТКА
       count_points: '%{count} точек'
-      ago: '%{time_in_words_ago} назад'
       more: подробнее
       trace_details: Показать данные трека
       view_map: Просмотр карты
@@ -2295,11 +2293,9 @@ ru:
       remove as friend: Удалить из друзей
       add as friend: Добавить в друзья
       mapper since: 'Зарегистрирован:'
-      ago: (%{time_in_words_ago} назад)
       ct status: 'Условия участия:'
       ct undecided: Неопределено
       ct declined: Отклонены
-      ct accepted: Приняты %{ago} назад
       latest edit: 'Последняя правка %{ago}:'
       email address: 'Адрес Email:'
       created from: 'Создано из:'
@@ -2613,10 +2609,7 @@ ru:
     show:
       title: '%{block_on} заблокирован пользователем %{block_by}'
       heading: '%{block_on} заблокирован пользователем %{block_by}'
-      time_future: Заканчивается через %{time}
-      time_past: Закончилась %{time} назад
       created: Создано
-      ago: '%{time} назад'
       status: Состояние
       show: Показывать
       edit: Изменить
@@ -2651,7 +2644,6 @@ ru:
       description: Описание
       created_at: Создана
       last_changed: Изменена
-      ago_html: '%{when} назад'
   javascripts:
     close: Закрыть
     share:
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index f1699e8e1..0ff3f3719 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -370,7 +370,6 @@ scn:
       post: Pùbblica
       when: Quannu
       comment: Cummentu
-      ago: '%{ago} fa'
       newer_comments: Cummenti cchiù novi
       older_comments: Cummenti cchiù vecchî
   geocoder:
@@ -1632,7 +1631,6 @@ scn:
     trace:
       pending: N CUDA
       count_points: '%{count} punti'
-      ago: '%{time_in_words_ago} fa'
       more: dittagghî
       trace_details: Talìa li dittagghî dû tracciatu
       view_map: Talìa lu tracciatu supra dâ cartina
@@ -1916,11 +1914,9 @@ scn:
       remove as friend: Leva di l'amici
       add as friend: Agghiunci a l'amici
       mapper since: 'Mappaturi di:'
-      ago: (%{time_in_words_ago} fa)
       ct status: 'Cunnizzioni di cuntribbuzzioni:'
       ct undecided: Nun dicisi
       ct declined: Rifiutati
-      ct accepted: Accittati %{ago} fa
       latest edit: 'Ùrtimu canciamentu %{ago}:'
       email address: 'Nnirizzu di posta elittrònica:'
       created from: 'Criatu di:'
@@ -2194,10 +2190,7 @@ scn:
     show:
       title: '%{block_on} bluccatu di %{block_by}'
       heading: '%{block_on} bluccatu di %{block_by}'
-      time_future: Finisci tra %{time}
-      time_past: Finìu %{time} fa
       created: Criatu
-      ago: '%{time} fa'
       status: Statu
       show: Ammustra
       edit: Cancia
@@ -2231,7 +2224,6 @@ scn:
       description: Discrizzioni
       created_at: Criata lu
       last_changed: Canciata l'ùrtima vota lu
-      ago_html: '%{when} fa'
   javascripts:
     close: Chiudi
     share:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 5f448f4f1..40face15c 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -314,7 +314,6 @@ sco:
       post: Post
       when: When
       comment: Comment
-      ago: '%{ago} ago'
       newer_comments: Newer Comments
       older_comments: Aulder Comments
   geocoder:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a9076aaa9..0c2f8ba22 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -342,7 +342,6 @@ sk:
       post: Príspevok
       when: Kedy
       comment: Komentár
-      ago: pred %{ago}
       newer_comments: Novšie komentáre
       older_comments: Staršie komentáre
   geocoder:
@@ -1461,7 +1460,6 @@ sk:
     trace:
       pending: NEVYRIEŠENÉ
       count_points: '%{count} bodov'
-      ago: pred %{time_in_words_ago}
       more: viac
       trace_details: Zobraziť detaily stopy
       view_map: Zobraziť mapu
@@ -1713,11 +1711,9 @@ sk:
       remove as friend: Odstrániť z priateľov
       add as friend: Pridať priateľa
       mapper since: 'Mapuje od:'
-      ago: (pred %{time_in_words_ago})
       ct status: 'Podmienky prispievania:'
       ct undecided: Nerozhodnuté
       ct declined: Odmietnuté
-      ct accepted: Prijaté pred %{ago}
       latest edit: 'Posledné úpravy pred %{ago}:'
       email address: 'Emailová adresa:'
       created from: 'Vytvorené od:'
@@ -1984,10 +1980,7 @@ sk:
     show:
       title: '%{block_on} zablokovaný používateľom %{block_by}'
       heading: '%{block_on} zablokovaný používateľom %{block_by}'
-      time_future: Končí o %{time}
-      time_past: Ukončené pred %{time}
       created: Vytvorené
-      ago: pred %{time}
       status: Stav
       show: Zobraziť
       edit: Upraviť
@@ -2017,7 +2010,6 @@ sk:
       description: Popis
       created_at: Vytvorené
       last_changed: Posledná zmena
-      ago_html: pred %{when}
   javascripts:
     close: Zavrieť
     share:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 123883ad5..4295477af 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -385,7 +385,6 @@ sl:
       post: Objavi
       when: Kdaj
       comment: Komentar
-      ago: pred %{ago}
       newer_comments: Novejši komentarji
       older_comments: Starejši komentarji
   geocoder:
@@ -1565,7 +1564,6 @@ sl:
     trace:
       pending: V ČAKALNI VRSTI
       count_points: '%{count} točk'
-      ago: '%{time_in_words_ago} nazaj'
       more: več
       trace_details: Ogled podrobnnosti zemljevida
       view_map: Ogled zemljevida
@@ -1858,11 +1856,9 @@ sl:
       remove as friend: Odstrani prijatelja
       add as friend: Dodaj med prijatelje
       mapper since: 'Kartograf od:'
-      ago: (%{time_in_words_ago})
       ct status: 'Pogoji sodelovanja:'
       ct undecided: Neodločen
       ct declined: Zavrnjeni
-      ct accepted: 'Sprejeto pred: %{ago}'
       latest edit: 'Zadnje urejanje %{ago}:'
       email address: 'E-poštni naslov:'
       created from: 'Ustvarjen iz:'
@@ -2138,10 +2134,7 @@ sl:
     show:
       title: '%{block_on} je blokiral %{block_by}'
       heading: '%{block_on} je blokiral %{block_by}'
-      time_future: Konča v %{time}
-      time_past: Je končala %{time} nazaj
       created: Ustvarjeno
-      ago: '%{time} nazaj'
       status: Stanje
       show: Prikaži
       edit: Uredi
@@ -2175,7 +2168,6 @@ sl:
       description: Opis
       created_at: Ustvarjeno
       last_changed: Zadnja sprememba
-      ago_html: '%{when} nazaj'
   javascripts:
     close: Zapri
     share:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 4cc49e333..5e37ba889 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -358,7 +358,6 @@ sq:
       post: Posto
       when: Kur
       comment: Komenti
-      ago: '%{ago} më parë'
       newer_comments: Komentet më të fundit
       older_comments: Komentet e vjetra
   geocoder:
@@ -1303,7 +1302,6 @@ sq:
     trace:
       pending: NE PRITJE
       count_points: '%{count} pikë'
-      ago: '%{time_in_words_ago} më parë'
       more: më shumë
       trace_details: Shfaq detajet e gjurmës
       view_map: Shiko hartën
@@ -1458,7 +1456,6 @@ sq:
       remove as friend: Largo mikun
       add as friend: Shto si mik
       mapper since: 'Hartues që prej:'
-      ago: (%{time_in_words_ago} më parë)
       latest edit: 'Redaktimi i fundit %{ago}:'
       email address: 'Adresa e emailit:'
       created from: 'Krijuar nga:'
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 5ee8f7c14..e23c31b62 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -255,7 +255,6 @@ sr-Latn:
       post: Postavi
       when: Kada
       comment: Komentar
-      ago: pre %{ago}
       newer_comments: Noviji komentari
       older_comments: Stariji komentari
   geocoder:
@@ -1164,7 +1163,6 @@ sr-Latn:
     trace:
       pending: NA_ČEKANJU
       count_points: '%{count} tačaka'
-      ago: pre %{time_in_words_ago}
       more: više
       trace_details: Pogledajte detalje o tragu
       view_map: Pogledaj kartu
@@ -1381,11 +1379,9 @@ sr-Latn:
       remove as friend: ukloni kao prijatelja
       add as friend: dodaj kao prijatelja
       mapper since: 'Kartograf od:'
-      ago: (pre %{time_in_words_ago})
       ct status: 'Uslovi za učešće:'
       ct undecided: Neodlučeno
       ct declined: Odbijeno
-      ct accepted: Prihvaćeno pre %{ago} dana
       latest edit: 'Poslednja izmena pre %{ago}:'
       email address: 'E-adresa:'
       created from: 'Napravljeno iz:'
@@ -1634,8 +1630,6 @@ sr-Latn:
     show:
       title: '%{block_on} je blokiran/a od %{block_by}'
       heading: '%{block_on} je blokiran/a od %{block_by}'
-      time_future: Završava se u %{time}
-      time_past: Završeno pre %{time}
       status: Stanje
       show: Prikaži
       edit: Uredi
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index e0ca59559..3419b4513 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -395,7 +395,6 @@ sr:
       post: Објава
       when: Када
       comment: Коментар
-      ago: пре %{ago}
       newer_comments: Новији коментари
       older_comments: Старији коментари
   geocoder:
@@ -1788,7 +1787,6 @@ sr:
     trace:
       pending: НА_ЧЕКАЊУ
       count_points: '%{count} тачака'
-      ago: пре %{time_in_words_ago}
       more: више
       trace_details: Погледајте детаље о трагу
       view_map: Погледај карту
@@ -2079,11 +2077,9 @@ sr:
       remove as friend: Избаци из пријатеља
       add as friend: Додај пријатеља
       mapper since: 'Картограф од:'
-      ago: (пре %{time_in_words_ago})
       ct status: 'Услови за учешће:'
       ct undecided: Неодлучено
       ct declined: Одбијено
-      ct accepted: Прихваћено пре %{ago} дана
       latest edit: 'Последња измена пре %{ago}:'
       email address: 'Имејл адреса:'
       created from: 'Направљено из:'
@@ -2363,10 +2359,7 @@ sr:
     show:
       title: '%{block_on} је блокиран/а од %{block_by}'
       heading: '%{block_on} је блокиран/а од %{block_by}'
-      time_future: Завршава се у %{time}
-      time_past: Завршено пре %{time}
       created: Направљено
-      ago: пре %{time}
       status: Стање
       show: Прикажи
       edit: Уреди
@@ -2400,7 +2393,6 @@ sr:
       description: Опис
       created_at: Направљено
       last_changed: Последња промена
-      ago_html: пре %{when}
   javascripts:
     close: Затвори
     share:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 52739b198..55537ab38 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -165,10 +165,10 @@ sv:
         opened_at_by_html: Skapades för %{when} sedan av %{user}
         commented_at_html: Uppdaterades för %{when} sedan
         commented_at_by_html: Uppdaterades för %{when} sedan av %{user}
-        closed_at_html: Löstes för %{when} sedan
-        closed_at_by_html: Löstes för %{when} sedan av %{user}
-        reopened_at_html: Återaktiverades för %{when} sedan
-        reopened_at_by_html: Återaktiverades för %{when} sedan av %{user}
+        closed_at_html: Löstes för %{when}
+        closed_at_by_html: Löstes för %{when} av %{user}
+        reopened_at_html: Återaktiverades för %{when}
+        reopened_at_by_html: Återaktiverades för %{when} av %{user}
       rss:
         title: OpenStreetMap-anteckningar
         description_area: En lista med anteckningar som rapporterats, kommenterats
@@ -185,13 +185,12 @@ sv:
     created: Skapad
     closed: Stängd
     created_html: Skapades <abbr title='%{title}'>för %{time} sedan</abbr>
-    closed_html: Stängdes <abbr title='%{title}'>för %{time} sedan</abbr>
+    closed_html: Stängdes <abbr title='%{title}'>för %{time}</abbr>
     created_by_html: Skapades <abbr title='%{title}'>för %{time} sedan</abbr> av %{user}
     deleted_by_html: Raderades <abbr title='%{title}'>för %{time} sedan</abbr> av
       %{user}
-    edited_by_html: Redigerades <abbr title='%{title}'>för %{time} sedan</abbr> av
-      %{user}
-    closed_by_html: Stängdes <abbr title='%{title}'> för %{time} sedan</abbr> av %{user}
+    edited_by_html: Redigerades <abbr title='%{title}'>för %{time}</abbr> av %{user}
+    closed_by_html: Stängdes <abbr title='%{title}'> för %{time}</abbr> av %{user}
     version: Version
     in_changeset: Ändringsset
     anonymous: anonym
@@ -213,7 +212,7 @@ sv:
       comment: Kommentarer (%{count})
       hidden_commented_by: Dold kommentar från %{user} <abbr title='%{exact_time}'>%{when}
         sedan</abbr>
-      commented_by: Kommentar från %{user} <abbr title='%{exact_time}'>%{when} sedan</abbr>
+      commented_by: Kommentar från %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: XML för ändringsset
       osmchangexml: osmChange XML
       feed:
@@ -291,19 +290,19 @@ sv:
       open_title: 'Ej avklarad anteckning #%{note_name}'
       closed_title: 'Avklarad anteckning #%{note_name}'
       hidden_title: 'Dold anteckning #%{note_name}'
-      open_by: Skapad av %{user} <abbr title='%{exact_time}'>%{when} sedan</abbr>
-      open_by_anonymous: Skapad av anonym <abbr title='%{exact_time}'>%{when} sedan</abbr>
-      commented_by: Kommentar från %{user} <abbr title='%{exact_time}'>%{when} sedan</abbr>
+      open_by: Skapad av %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Skapad av anonym <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Kommentar från %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_anonymous: Kommentar från en anonym användare <abbr title='%{exact_time}'>för
-        %{when} sedan</abbr>
-      closed_by: Löst av %{user} <abbr title='%{exact_time}'>för %{when} sedan</abbr>
+        %{when}</abbr>
+      closed_by: Löst av %{user} <abbr title='%{exact_time}'>för %{when}</abbr>
       closed_by_anonymous: Löst av en anonym användare <abbr title='%{exact_time}'>för
         %{when} sedan</abbr>
       reopened_by: Återaktiverades av %{user} <abbr title='%{exact_time}'>för %{when}
         sedan</abbr>
       reopened_by_anonymous: Återaktiverades av en anonym användare <abbr title='%{exact_time}'>för
         %{when} sedan</abbr>
-      hidden_by: Doldes av %{user} <abbr title='%{exact_time}'>för %{when} sedan</abbr>
+      hidden_by: Doldes av %{user} <abbr title='%{exact_time}'>för %{when}</abbr>
       report: Rapportera denna anteckning
     query:
       title: Undersök kartobjekt
@@ -429,7 +428,6 @@ sv:
       post: Inlägg
       when: När
       comment: Kommentar
-      ago: '%{ago} sedan'
       newer_comments: Nyare kommentarer
       older_comments: Äldre kommentarer
   geocoder:
@@ -1912,7 +1910,6 @@ sv:
     trace:
       pending: VÄNTANDE
       count_points: '%{count} punkter'
-      ago: '%{time_in_words_ago} sedan'
       more: mer
       trace_details: Visa detaljer för GPS-spår
       view_map: Visa karta
@@ -2219,11 +2216,9 @@ sv:
       remove as friend: Ta bort vän
       add as friend: Lägg till vän
       mapper since: 'Karterar sedan:'
-      ago: (%{time_in_words_ago} sedan)
       ct status: 'Användarvillkor:'
       ct undecided: Ej bestämda
       ct declined: Avböjda
-      ct accepted: Godkända för %{ago} sedan
       latest edit: 'Senaste redigering %{ago}:'
       email address: 'E-post:'
       created from: 'Skapad från:'
@@ -2490,7 +2485,7 @@ sv:
       title: Upphäv blockering av %{block_on}
       heading: Upphäv blockering på %{block_on} av %{block_by}
       time_future: Denna blockering kommer att avslutas inom %{time}.
-      past: Detta block avslutades %{time} sedan och kan inte upphävas nu.
+      past: Detta block avslutades %{time} och kan inte upphävas nu.
       confirm: Är du säker på att du vill återkalla denna blockering?
       revoke: Upphäv!
       flash: Denna blockering har upphävts.
@@ -2527,10 +2522,7 @@ sv:
     show:
       title: '%{block_on} blockerad av %{block_by}'
       heading: '%{block_on} blockerad av %{block_by}'
-      time_future: Upphör om %{time}
-      time_past: Slutade för %{time} sedan
       created: Skapad
-      ago: '%{time} sedan'
       status: Status
       show: Visa
       edit: Redigera
@@ -2564,7 +2556,6 @@ sv:
       description: Beskrivning
       created_at: Skapades den
       last_changed: Senast ändrad
-      ago_html: '%{when} sedan'
   javascripts:
     close: Stäng
     share:
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index b3d3eb41a..c6e020809 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -737,7 +737,6 @@ ta:
       diary: நாட்குறிப்பேடு
       edits: தொகுப்புகள்
       add as friend: நண்பராக சேர்
-      ago: (%{time_in_words_ago} முன்பு)
       ct status: 'பங்களிப்பாளர் விதிமுறைகள்:'
       ct undecided: முடிவு செய்யப்படாத
       ct declined: நிராகரிக்கப்பட்டது
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 17c4754ac..8709f9124 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -221,7 +221,6 @@ te:
       post: పంపించు
       when: ఎప్పుడు
       comment: వ్యాఖ్య
-      ago: '%{ago} క్రితం'
       newer_comments: కొత్త వ్యాఖ్యలు
       older_comments: పాత వ్యాఖ్యలు
   geocoder:
@@ -670,7 +669,6 @@ te:
       description: 'వివరణ:'
     trace:
       count_points: '%{count} బిందువులు'
-      ago: '%{time_in_words_ago} క్రితం'
       more: మరిన్ని
       edit: మార్చు
   oauth_clients:
@@ -747,10 +745,8 @@ te:
       notes: పటపు గమనికలు
       remove as friend: స్నేహితునిగా తొలగించు
       add as friend: స్నేహితునిగా చేర్చు
-      ago: (%{time_in_words_ago} క్రితం)
       ct undecided: నిర్ణయించుకోలేదు
       ct declined: తిరస్కరించారు
-      ct accepted: '%{ago} క్రితం అంగీకరించారు'
       latest edit: 'చివరి మార్పు %{ago}:'
       email address: 'ఈమెయిలు చిరునామా:'
       status: 'స్థితి:'
@@ -849,9 +845,6 @@ te:
       title: '%{name} పై నిరోధాలు'
       heading: '%{name}పై ఉన్న నిరోధాల జాబితా'
     show:
-      time_future: '%{time}లో ముగుస్తుంది'
-      time_past: '%{time} క్రితం ముగిసింది'
-      ago: '%{time} క్రితం'
       status: స్థితి
       show: చూపించు
       edit: మార్చు
@@ -870,7 +863,6 @@ te:
       heading: '%{user} గమనికలు'
       description: వివరణ
       last_changed: చివరి మార్పు
-      ago_html: '%{when} క్రితం'
   javascripts:
     close: మూసివేయి
     share:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 5f5b9ecdb..84974cc19 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -379,7 +379,6 @@ th:
       post: เผยแพร่
       when: เมื่อ
       comment: ความเห็น
-      ago: เมื่อ %{ago} ก่อน
       newer_comments: ความคิดเห็นใหม่กว่า
       older_comments: ความคิดเห็นเก่ากว่า
   geocoder:
@@ -1633,7 +1632,6 @@ th:
     trace:
       pending: ค้างอยู่
       count_points: '%{count} จุด'
-      ago: '%{time_in_words_ago} มาแล้ว'
       more: เพิ่มเติม
       trace_details: ดูรายละเอียดรอยทาง
       view_map: แสดงแผนที่
@@ -1877,11 +1875,9 @@ th:
       remove as friend: ลบจากรายการเพื่อน
       add as friend: เพิ่มเข้ารายการเพื่อน
       mapper since: 'ทำแผนที่นี้ตั้งแต่:'
-      ago: (%{time_in_words_ago} มาแล้ว)
       ct status: 'เงื่อนไขผู้ร่วมสร้างสรรค์:'
       ct undecided: ยังไม่ตัดสินใจ
       ct declined: ไม่ยอมรับ
-      ct accepted: ยอมรับแล้วเมื่อ %{ago} ก่อน
       latest edit: 'แก้ไขล่าสุดเมื่อ %{ago}:'
       email address: 'ที่อยู่อีเมล:'
       created from: 'สร้างจาก:'
@@ -2104,9 +2100,7 @@ th:
       empty: '%{name} ไม่เคยได้สั่งระงับผู้ใช้คนใดเลย'
     show:
       heading: '%{block_on} โดนระงับโดย %{block_by}'
-      time_past: สิ้นสุดไปเมื่อ %{time}ก่อน
       created: ระงับเมื่อ
-      ago: '%{time}ก่อน'
       status: สถานะ
       show: แสดง
       edit: แก้ไข
@@ -2129,7 +2123,6 @@ th:
     mine:
       heading: หมายเหตุของ %{user}
       creator: ผู้สร้าง
-      ago_html: '%{when}ก่อน'
   javascripts:
     close: ปิด
     share:
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 402cba655..5ec7ae1de 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -335,7 +335,6 @@ tl:
       post: Ipaskil
       when: Kailan
       comment: Puna
-      ago: '%{ago} na ang nakalilipas'
       newer_comments: Mas Bagong mga Pagpuna
       older_comments: Mas Lumang mga Puna
   geocoder:
@@ -1417,7 +1416,6 @@ tl:
     trace:
       pending: NAGHIHINTAY
       count_points: '%{count} mga puntos'
-      ago: '%{time_in_words_ago} ang nakalipas'
       more: marami pa
       trace_details: Tingnan ang mga Detalye ng Bakas
       view_map: Tingnan ang Mapa
@@ -1657,11 +1655,9 @@ tl:
       remove as friend: tanggalin bilang kaibigan
       add as friend: idagdag bilang kaibigan
       mapper since: 'Tagapagmapa mula pa noong:'
-      ago: (%{time_in_words_ago} na ang nakalipas)
       ct status: 'Mga tuntunin sa taga-ambag:'
       ct undecided: Walang kapasyahan
       ct declined: Tumanggi
-      ct accepted: Tinanggap noong %{ago} na ang nakalilipas
       latest edit: 'Pinakahuling pagbabago %{ago}:'
       email address: 'Tirahan ng e-liham:'
       created from: 'Nilikha magmula sa:'
@@ -1942,10 +1938,7 @@ tl:
     show:
       title: '%{block_on} hinadlangan ni %{block_by}'
       heading: '%{block_on} hinadlangan ni %{block_by}'
-      time_future: Magwawakas sa %{time}
-      time_past: Nagwakas noong %{time} na ang nakalilipas
       created: Nilikha
-      ago: '%{time} ang nakaraan'
       status: Kalagayan
       show: Ipakita
       edit: Baguhin
@@ -1977,7 +1970,6 @@ tl:
       description: Paglalarawan
       created_at: Nilikha Noong
       last_changed: Huling binago
-      ago_html: '%{when} ang nakaraan'
   javascripts:
     close: Isara
     share:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 50332c9a5..c6caa393d 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -192,14 +192,14 @@ tr:
   api:
     notes:
       comment:
-        opened_at_html: '%{when} önce oluşturuldu'
-        opened_at_by_html: '%{when} önce %{user} tarafından oluşturuldu'
-        commented_at_html: '%{when} önce güncellendi'
-        commented_at_by_html: '%{user} tarafından %{when} tarihinde güncellendi'
-        closed_at_html: '%{when} önce çözüldü'
-        closed_at_by_html: '%{user} tarafından %{when} tarihinde çözüldü'
-        reopened_at_html: '%{when} önce yeniden etkinleştirildi'
-        reopened_at_by_html: '%{user} tarafından %{when} tarihinde yeniden etkinleştirildi'
+        opened_at_html: '%{when} oluşturuldu'
+        opened_at_by_html: '%{user} tarafından %{when} oluşturuldu'
+        commented_at_html: '%{when} güncellendi'
+        commented_at_by_html: '%{user} tarafından %{when} güncellendi'
+        closed_at_html: '%{when} çözüldü'
+        closed_at_by_html: '%{user} tarafından %{when} çözüldü'
+        reopened_at_html: '%{when} yeniden etkinleştirildi'
+        reopened_at_by_html: '%{user} tarafından %{when} yeniden etkinleştirildi'
       rss:
         title: OpenStreetMap Notları
         description_area: '[(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] bölgenizde
@@ -215,16 +215,12 @@ tr:
   browse:
     created: Oluşturuldu
     closed: Kapandı
-    created_html: <abbr title='%{title}'>%{time} önce</abbr> oluşturuldu
-    closed_html: <abbr title='%{title}'>%{time} önce</abbr> kapandı
-    created_by_html: <abbr title='%{title}'>%{time} önce</abbr> %{user} tarafından
-      oluşturuldu
-    deleted_by_html: <abbr title='%{title}'>%{time} önce</abbr> %{user} tarafından
-      silindi
-    edited_by_html: <abbr title='%{title}'>%{time} önce</abbr> %{user} tarafından
-      düzenlendi
-    closed_by_html: <abbr title='%{title}'>%{time} önce</abbr> %{user} tarafından
-      kapandı
+    created_html: <abbr title='%{title}'>%{time}</abbr> oluşturuldu
+    closed_html: <abbr title='%{title}'>%{time}</abbr> kapandı
+    created_by_html: <abbr title='%{title}'>%{time}</abbr> %{user} tarafından oluşturuldu
+    deleted_by_html: <abbr title='%{title}'>%{time}</abbr> %{user} tarafından silindi
+    edited_by_html: <abbr title='%{title}'>%{time}</abbr> %{user} tarafından düzenlendi
+    closed_by_html: <abbr title='%{title}'>%{time}</abbr> %{user} tarafından kapandı
     version: Sürüm
     in_changeset: Değişiklik Kaydı
     anonymous: anonim
@@ -244,10 +240,8 @@ tr:
       relation: İlişkiler (%{count})
       relation_paginated: İlişkiler (%{x}-%{y} - toplam %{count})
       comment: Yorumlar (%{count})
-      hidden_commented_by: '%{user} tarafından gizli yorum <abbr title="%{exact_time}">%{when}
-        önce</abbr>'
-      commented_by: '%{user} kullanıcıdan yorum <abbr title="%{exact_time}">%{when}
-        önce</abbr>'
+      hidden_commented_by: '%{user} tarafından gizli yorum <abbr title="%{exact_time}">%{when}</abbr>'
+      commented_by: '%{user} kullanıcıdan yorum <abbr title="%{exact_time}">%{when}</abbr>'
       changesetxml: Değişiklik kaydı XML
       osmchangexml: osmChange XML
       feed:
@@ -325,23 +319,22 @@ tr:
       open_title: 'Çözümlenmemiş not: #%{note_name}'
       closed_title: 'Çözümlenmiş not: #%{note_name}'
       hidden_title: 'Gizli not #%{note_name}'
-      open_by: '%{user} tarafından <abbr title=''%{exact_time}''>%{when} önce</abbr>
-        oluşturuldu'
-      open_by_anonymous: Anonim olarak <abbr title='%{exact_time}'>%{when} önce</abbr>
+      open_by: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr> oluşturuldu'
+      open_by_anonymous: Anonim olarak <abbr title='%{exact_time}'>%{when}</abbr>
         oluşturuldu
-      commented_by: '%{user} kullanıcısının <abbr title=''%{exact_time}''>%{when}
-        önceki</abbr> yorumu'
-      commented_by_anonymous: Anonim kullanıcının <abbr title='%{exact_time}'>%{when}
-        önceki</abbr> yorumu
-      closed_by: '%{user} tarafından <abbr title=''%{exact_time}''>%{when} önce</abbr>
+      commented_by: '%{user} kullanıcısının <abbr title=''%{exact_time}''>%{when}</abbr>
+        yorumu'
+      commented_by_anonymous: Anonim kullanıcının <abbr title='%{exact_time}'>%{when}</abbr>
+        yorumu
+      closed_by: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
         çözüldü'
-      closed_by_anonymous: Anonim kullanıcı tarafından <abbr title='%{exact_time}'>%{when}
-        önce</abbr> çözüldü
-      reopened_by: '%{user} tarafından <abbr title=''%{exact_time}''>%{when} önce</abbr>
+      closed_by_anonymous: Anonim kullanıcı tarafından <abbr title='%{exact_time}'>%{when}</abbr>
+        çözüldü
+      reopened_by: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
         yeniden etkin hâle getirildi.'
-      reopened_by_anonymous: Anonim kullanıcı tarafından <abbr title='%{exact_time}'>%{when}
-        önce</abbr> yeniden etkin hâle getirildi.
-      hidden_by: '%{user} tarafından <abbr title=''%{exact_time}''>%{when} önce</abbr>
+      reopened_by_anonymous: Anonim kullanıcı tarafından <abbr title='%{exact_time}'>%{when}</abbr>
+        yeniden etkin hâle getirildi.
+      hidden_by: '%{user} tarafından <abbr title=''%{exact_time}''>%{when}</abbr>
         gizlendi'
       report: Bu notu bildir
     query:
@@ -382,7 +375,7 @@ tr:
     comment:
       comment: 'Değişiklik seti #%{changeset_id} hakkında %{author} yeni bir yorum
         yaptı.'
-      commented_at_by_html: '%{user} tarafından %{when} önce güncellendi'
+      commented_at_by_html: '%{user} tarafından %{when} güncellendi'
     comments:
       comment: 'Değişiklik seti #%{changeset_id} hakkında %{author} yeni bir yorum
         yaptı.'
@@ -470,7 +463,6 @@ tr:
       post: Yazı
       when: Tarih
       comment: Yorum
-      ago: '%{ago} önce'
       newer_comments: Daha Yeni Yorumlar
       older_comments: Daha Eski Yorumlar
   geocoder:
@@ -1085,9 +1077,8 @@ tr:
       status: Durum
       reports: Raporlar
       last_updated: Son Güncelleme
-      last_updated_time_html: <abbr title='%{title}'>%{time} önce</abbr>
-      last_updated_time_user_html: '%{user} tarafından <abbr title=''%{title}''>%{time}
-        önce</abbr>'
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: '%{user} tarafından <abbr title=''%{title}''>%{time}</abbr>'
       link_to_reports: Raporları Görüntüle
       reports_count:
         one: 1 Rapor
@@ -1960,7 +1951,6 @@ tr:
     trace:
       pending: BEKLEMEDE
       count_points: '%{count} nokta'
-      ago: '%{time_in_words_ago} önce'
       more: ayrıntı
       trace_details: İz Ayrıntılarını Görüntüle
       view_map: Haritayı Görüntüle
@@ -2271,12 +2261,10 @@ tr:
       remove as friend: Arkadaş listesinden çıkart
       add as friend: Arkadaş Olarak Ekle
       mapper since: 'Haritacılığa başlama tarihi:'
-      ago: (%{time_in_words_ago} önce)
       ct status: 'Katılımcının şartları:'
       ct undecided: Kararsız
       ct declined: Reddetti
-      ct accepted: '%{ago} önce kabul etti'
-      latest edit: 'Son değişiklik %{ago}:'
+      latest edit: 'Son değişiklik (%{ago}):'
       email address: 'E-posta adresi:'
       created from: 'Kullanıldı yazılım:'
       status: 'Durum:'
@@ -2540,7 +2528,7 @@ tr:
       title: '%{block_on} engellerini iptal etme'
       heading: '%{block_by} tarafından yapılan %{block_on} engellerini iptal etme'
       time_future: Engellenme %{time} içerisinde bitecek.
-      past: Bu engelleme %{time} önce bitmiş ve artık iptal edilemez.
+      past: Bu engelleme %{time} bitmiş ve artık iptal edilemez.
       confirm: Bu engeli kaldırmak istediğine emin misin?
       revoke: Ä°ptal!
       flash: Bu engelleme iptal edildi.
@@ -2548,7 +2536,7 @@ tr:
       time_future: '%{time} içinde bitecek.'
       until_login: Kullanıcı giriş yapana kadar aktif.
       time_future_and_until_login: '%{time} içinde ve kullanıcı oturum açtığında bitecek.'
-      time_past: '%{time} önce bitti.'
+      time_past: '%{time} bitti.'
       block_duration:
         hours:
           one: 1 saat
@@ -2576,10 +2564,7 @@ tr:
     show:
       title: '%{block_on} kişisi %{block_by} tarafından engellendi'
       heading: '%{block_on} kişisi %{block_by} tarafından engellendi'
-      time_future: '%{time} içinde bitecek'
-      time_past: '%{time} önce bitti'
       created: Oluşturuldu
-      ago: '%{time} önce'
       status: Durum
       show: Göster
       edit: Düzenle
@@ -2613,7 +2598,6 @@ tr:
       description: Açıklama
       created_at: Oluşturulma tarihi
       last_changed: Son değişiklik
-      ago_html: '%{when} önce'
   javascripts:
     close: Kapat
     share:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index bea42a5da..c296a69c7 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -418,7 +418,6 @@ uk:
       post: Повідомлення
       when: Коли
       comment: Коментарі
-      ago: '%{ago} тому'
       newer_comments: Нові коментарі
       older_comments: Більш старі коментарі
   geocoder:
@@ -1683,7 +1682,6 @@ uk:
     trace:
       pending: ОЧІКУЄ
       count_points: '%{count} точок'
-      ago: '%{time_in_words_ago} тому'
       more: більше
       trace_details: Показати дані треку
       view_map: Перегляд Мапи
@@ -1978,11 +1976,9 @@ uk:
       remove as friend: Вилучити із списку друзів
       add as friend: Додати до списку друзів
       mapper since: 'Зареєстрований:'
-      ago: (%{time_in_words_ago} тому)
       ct status: 'Умови співпраці:'
       ct undecided: Невизначились
       ct declined: Відхилили
-      ct accepted: Прийняті %{ago} тому
       latest edit: 'Остання правка %{ago}:'
       email address: 'Адреса Е-пошти:'
       created from: 'Створено з:'
@@ -2271,10 +2267,7 @@ uk:
     show:
       title: '%{block_on}, заблокував: %{block_by}'
       heading: '%{block_on}, заблокував: %{block_by}'
-      time_future: До закінчення %{time}
-      time_past: Закінчилось %{time} назад
       created: Створено
-      ago: '%{time} тому'
       status: Стан
       show: Показувати
       edit: Правити
@@ -2309,7 +2302,6 @@ uk:
       description: Опис
       created_at: Створено
       last_changed: Остання зміна
-      ago_html: '%{when} тому'
   javascripts:
     close: Закрити
     share:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 8c234f197..cb3d945f7 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -393,7 +393,6 @@ vi:
       post: Mục nhật ký
       when: Lúc đăng
       comment: Nhận xét
-      ago: cách đây %{ago}
       newer_comments: Các Nhận xét Mới hơn
       older_comments: Các Nhận xét Cũ hơn
   geocoder:
@@ -1825,7 +1824,6 @@ vi:
     trace:
       pending: CHƯA XỬ
       count_points: '%{count} nốt'
-      ago: cách đây %{time_in_words_ago}
       more: thêm
       trace_details: Xem Chi tiết Tuyến đường
       view_map: Xem Bản đồ
@@ -2134,11 +2132,9 @@ vi:
       remove as friend: Hủy Kết Bạn
       add as friend: Kết Bạn
       mapper since: 'Tham gia:'
-      ago: (cách đây %{time_in_words_ago})
       ct status: 'Điều khoản đóng góp:'
       ct undecided: Chưa quyết định
       ct declined: Từ chối
-      ct accepted: Chấp nhận cách đây %{ago}
       latest edit: 'Sửa đổi gần đây nhất cách đây %{ago}:'
       email address: 'Địa chỉ thư điện tử:'
       created from: 'Địa chỉ IP khi mở:'
@@ -2421,10 +2417,7 @@ vi:
     show:
       title: '%{block_on} bị cấm bởi %{block_by}'
       heading: '%{block_on} bị cấm bởi %{block_by}'
-      time_future: Hết hạn %{time}
-      time_past: Đã hết hạn cách đây %{time}
       created: Tạo
-      ago: cách đây %{time}
       status: Trạng thái
       show: Hiện
       edit: Sửa đổi
@@ -2458,7 +2451,6 @@ vi:
       description: Miêu tả
       created_at: Lúc tạo
       last_changed: Thay đổi gần đây nhất
-      ago_html: cách đây %{when}
   javascripts:
     close: Đóng
     share:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6c7e52172..c8f684627 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -204,14 +204,14 @@ zh-CN:
   api:
     notes:
       comment:
-        opened_at_html: 于 %{when} 前创建
-        opened_at_by_html: '%{user} 于 %{when} 前创建'
-        commented_at_html: 于 %{when} 前更新
-        commented_at_by_html: '%{user} 于 %{when} 前更新'
-        closed_at_html: 于 %{when} 前解决
-        closed_at_by_html: '%{user} 于 %{when} 前解决'
-        reopened_at_html: 于 %{when} 前重新激活
-        reopened_at_by_html: '%{user} 于 %{when} 前重新激活'
+        opened_at_html: 于%{when}创建
+        opened_at_by_html: '%{user}于%{when}创建'
+        commented_at_html: 于%{when}更新
+        commented_at_by_html: '%{user}于%{when}更新'
+        closed_at_html: 于%{when}解决
+        closed_at_by_html: '%{user}于%{when}解决'
+        reopened_at_html: 于%{when}重新激活
+        reopened_at_by_html: '%{user}于%{when}重新激活'
       rss:
         title: OpenStreetMap 笔记
         description_area: 在您的区域 [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
@@ -227,12 +227,12 @@ zh-CN:
   browse:
     created: 创建于
     closed: 关闭于
-    created_html: 创建于 <abbr title='%{title}'>%{time} 前</abbr>
-    closed_html: 关闭于 <abbr title='%{title}'>%{time} 前</abbr>
-    created_by_html: '%{user} 创建于 <abbr title=''%{title}''>%{time} 前</abbr>'
-    deleted_by_html: '%{user} 删除于 <abbr title=''%{title}''>%{time} 前</abbr>'
-    edited_by_html: '%{user} 编辑于 <abbr title=''%{title}''>%{time} 前</abbr>'
-    closed_by_html: '%{user} 关闭于 <abbr title=''%{title}''>%{time} 前</abbr>'
+    created_html: 创建于<abbr title='%{title}'>%{time}</abbr>
+    closed_html: 关闭于<abbr title='%{title}'>%{time}</abbr>
+    created_by_html: '%{user}创建于<abbr title=''%{title}''>%{time}</abbr>'
+    deleted_by_html: '%{user}删除于<abbr title=''%{title}''>%{time}</abbr>'
+    edited_by_html: '%{user}编辑于<abbr title=''%{title}''>%{time}</abbr>'
+    closed_by_html: '%{user}关闭于<abbr title=''%{title}''>%{time}</abbr>'
     version: 版本
     in_changeset: 修改集合
     anonymous: 匿名用户
@@ -252,8 +252,8 @@ zh-CN:
       relation: 关系 (%{count})
       relation_paginated: 关系 (%{x}-%{y}，共 %{count})
       comment: 评论 (%{count})
-      hidden_commented_by: <abbr title='%{exact_time}'>%{when}前</abbr>来自 %{user} 的隐藏评论
-      commented_by: <abbr title='%{exact_time}'>%{when}前</abbr>来自 %{user} 的评论
+      hidden_commented_by: <abbr title='%{exact_time}'>%{when}</abbr>来自%{user}的隐藏评论
+      commented_by: <abbr title='%{exact_time}'>%{when}</abbr>来自%{user}的评论
       changesetxml: 修改集合 XML
       osmchangexml: osm 修改 XML
       feed:
@@ -328,15 +328,15 @@ zh-CN:
       open_title: '未解决笔记 #%{note_name}'
       closed_title: '已解决笔记 #%{note_name}'
       hidden_title: '隐藏笔记 #%{note_name}'
-      open_by: '%{user} 创建于 <abbr title=''%{exact_time}''>%{when} 前</abbr>'
-      open_by_anonymous: 匿名用户创建于 <abbr title='%{exact_time}'>%{when} 前</abbr>
-      commented_by: '%{user} 于 <abbr title=''%{exact_time}''>%{when} 前</abbr>发表的评论'
-      commented_by_anonymous: 匿名用户于 <abbr title='%{exact_time}'>%{when} 前</abbr>发表的评论
-      closed_by: '%{user} 解决于 <abbr title=''%{exact_time}''>%{when} 前</abbr>'
-      closed_by_anonymous: 匿名用户解决于 <abbr title='%{exact_time}'>%{when} 前</abbr>
-      reopened_by: '%{user} 重新激活于 <abbr title=''%{exact_time}''>%{when} 前</abbr>'
-      reopened_by_anonymous: 匿名用户重新激活于 <abbr title='%{exact_time}'>%{when} 前</abbr>
-      hidden_by: '%{user} 隐藏于 <abbr title=''%{exact_time}''>%{when} 前</abbr>'
+      open_by: '%{user}创建于<abbr title=''%{exact_time}''>%{when}</abbr>'
+      open_by_anonymous: 匿名用户创建于<abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: '%{user}于<abbr title=''%{exact_time}''>%{when}</abbr>发表的评论'
+      commented_by_anonymous: 匿名用户于<abbr title='%{exact_time}'>%{when}</abbr>发表的评论
+      closed_by: '%{user}解决于<abbr title=''%{exact_time}''>%{when}</abbr>'
+      closed_by_anonymous: 匿名用户解决于<abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: '%{user}重新激活于<abbr title=''%{exact_time}''>%{when}</abbr>'
+      reopened_by_anonymous: 匿名用户重新激活于<abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: '%{user}隐藏于<abbr title=''%{exact_time}''>%{when}</abbr>'
       report: 举报此注释
     query:
       title: 查询要素
@@ -375,7 +375,7 @@ zh-CN:
   changeset_comments:
     comment:
       comment: '%{author}对修改集合%{changeset_id}的新评论'
-      commented_at_by_html: 由 %{user} 更新于 %{when} 前
+      commented_at_by_html: 由%{user}更新于%{when}
     comments:
       comment: '%{author}对修改集合%{changeset_id}的新评论'
     index:
@@ -457,7 +457,6 @@ zh-CN:
       post: 发布
       when: 时间
       comment: 评论
-      ago: '%{ago} 前'
       newer_comments: 新评论
       older_comments: 旧评论
   geocoder:
@@ -1073,8 +1072,8 @@ zh-CN:
       status: 状态
       reports: 举报
       last_updated: 最后更新
-      last_updated_time_html: <abbr title='%{title}'>%{time}前</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time}前</abbr>由%{user}
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr>由%{user}
       link_to_reports: 查看举报
       reports_count:
         one: 1个举报
@@ -1782,7 +1781,6 @@ zh-CN:
     trace:
       pending: 挂起
       count_points: '%{count} 个点'
-      ago: '%{time_in_words_ago} 前'
       more: 更多
       trace_details: 查看轨迹详情
       view_map: 查看地图
@@ -2056,12 +2054,10 @@ zh-CN:
       remove as friend: 删除朋友
       add as friend: 添加朋友
       mapper since: 绘图始于：
-      ago: （%{time_in_words_ago} 前）
       ct status: 贡献者条款：
       ct undecided: 未决定
       ct declined: 已拒绝
-      ct accepted: 接受于 %{ago} 前
-      latest edit: '%{ago} 的最后编辑：'
+      latest edit: '%{ago}的最后编辑：'
       email address: 电子邮件地址：
       created from: 创建于：
       status: 状态：
@@ -2288,7 +2284,7 @@ zh-CN:
       title: 正在撤销对 %{block_on} 的封禁
       heading: 正在撤销 %{block_by} 对 %{block_on} 的封禁
       time_future: 此封禁将于 %{time} 结束。
-      past: 此封禁已在 %{time} 之前结束，现在不能被撤销。
+      past: 此封禁已在%{time}结束，现在不能被撤销。
       confirm: 您确定要撤销该封禁？
       revoke: 撤销！
       flash: 该封禁已经被撤销。
@@ -2296,7 +2292,7 @@ zh-CN:
       time_future: 结束于 %{time}。
       until_login: 用户登录时激活。
       time_future_and_until_login: 结束于%{time}，并在用户登录之后。
-      time_past: 结束于 %{time} 前。
+      time_past: 结束于%{time}。
       block_duration:
         hours:
           one: 1 小时
@@ -2324,10 +2320,7 @@ zh-CN:
     show:
       title: '%{block_on} 被 %{block_by} 封禁'
       heading: '%{block_on} 被 %{block_by} 封禁'
-      time_future: 结束于 %{time}
-      time_past: 结束于 %{time} 前
       created: 已创建
-      ago: '%{time}前'
       status: 状态
       show: 显示
       edit: 编辑
@@ -2361,7 +2354,6 @@ zh-CN:
       description: 描述
       created_at: 创建于
       last_changed: 最后修改于
-      ago_html: '%{when} 前'
   javascripts:
     close: 关闭
     share:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 2b62c676b..601cb50fd 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -36,7 +36,7 @@
 ---
 zh-TW:
   html:
-    dir: ltr
+    dir: 由左至右
   time:
     formats:
       friendly: '%Y 年 %B %e 日 %H 時 %M 分'
@@ -447,7 +447,6 @@ zh-TW:
       post: 貼文
       when: 於
       comment: 評論
-      ago: '%{ago} 前'
       newer_comments: 較新的評論
       older_comments: 較舊的評論
   geocoder:
@@ -1805,7 +1804,6 @@ zh-TW:
     trace:
       pending: 等候
       count_points: '%{count} 個點'
-      ago: '%{time_in_words_ago} 之前'
       more: 更多
       trace_details: 檢視軌跡詳細資料
       view_map: 檢視地圖
@@ -2080,11 +2078,9 @@ zh-TW:
       remove as friend: 移除好友
       add as friend: 加入為好友
       mapper since: 註冊為製圖者日期：
-      ago: (%{time_in_words_ago} 之前)
       ct status: 貢獻者條款：
       ct undecided: 未決定
       ct declined: 已拒絕
-      ct accepted: 於 %{ago} 前接受
       latest edit: 上次編輯於 %{ago}：
       email address: 電子郵件地址：
       created from: 建立於：
@@ -2343,10 +2339,7 @@ zh-TW:
     show:
       title: '%{block_on} 被 %{block_by} 封鎖'
       heading: '%{block_on} 被 %{block_by} 封鎖'
-      time_future: 於 %{time} 內終止
-      time_past: 於 %{time} 前終止
       created: 已建立
-      ago: '%{time} 前'
       status: 狀態
       show: 顯示
       edit: 編輯
@@ -2380,7 +2373,6 @@ zh-TW:
       description: 說明
       created_at: 建立於：
       last_changed: 最新變更
-      ago_html: '%{when} 前'
   javascripts:
     close: 關閉
     share: