Index: app/helpers/settings_helper.rb
===================================================================
--- app/helpers/settings_helper.rb	(revision 16427)
+++ app/helpers/settings_helper.rb	(working copy)
@@ -132,10 +132,10 @@
   def session_lifetime_options
     options = [[l(:label_disabled), 0]]
     options += [4, 8, 12].map {|hours|
-      [l('datetime.distance_in_words.x_hours', :count => hours), (hours * 60).to_s]
+      [l('datetime.x_hours', :count => hours), (hours * 60).to_s]
     }
     options += [1, 7, 30, 60, 365].map {|days|
-      [l('datetime.distance_in_words.x_days', :count => days), (days * 24 * 60).to_s]
+      [l('datetime.x_days', :count => days), (days * 24 * 60).to_s]
     }
     options
   end
@@ -143,7 +143,7 @@
   def session_timeout_options
     options = [[l(:label_disabled), 0]]
     options += [1, 2, 4, 8, 12, 24, 48].map {|hours|
-      [l('datetime.distance_in_words.x_hours', :count => hours), (hours * 60).to_s]
+      [l('datetime.x_hours', :count => hours), (hours * 60).to_s]
     }
     options
   end
Index: app/models/issue_relation.rb
===================================================================
--- app/models/issue_relation.rb	(revision 16427)
+++ app/models/issue_relation.rb	(working copy)
@@ -156,7 +156,7 @@
     issue_text = block_given? ? yield(other_issue(issue)) : "##{other_issue(issue).try(:id)}"
     s = []
     s << l(label_for(issue))
-    s << "(#{l('datetime.distance_in_words.x_days', :count => delay)})" if delay && delay != 0
+    s << "(#{l('datetime.x_days', :count => delay)})" if delay && delay != 0
     s << issue_text
     s.join(' ')
   end
Index: app/views/settings/_authentication.html.erb
===================================================================
--- app/views/settings/_authentication.html.erb	(revision 16427)
+++ app/views/settings/_authentication.html.erb	(working copy)
@@ -3,7 +3,7 @@
 <div class="box tabular settings">
 <p><%= setting_check_box :login_required %></p>
 
-<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
+<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.x_days', :count => days), days.to_s]} %></p>
 
 <p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
                                            [l(:label_registration_activation_by_email), "1"],
@@ -15,7 +15,7 @@
 <p><%= setting_text_field :password_min_length, :size => 6 %></p>
 
 <p>
-  <%= setting_select :password_max_age, [[l(:label_disabled), 0]] + [7, 30, 60, 90, 180, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %>
+  <%= setting_select :password_max_age, [[l(:label_disabled), 0]] + [7, 30, 60, 90, 180, 365].collect{|days| [l('datetime.x_days', :count => days), days.to_s]} %>
 </p>
 
 <p><%= setting_check_box :lost_password %></p>
Index: config/locales/ar.yml
===================================================================
--- config/locales/ar.yml	(revision 16427)
+++ config/locales/ar.yml	(working copy)
@@ -32,6 +32,12 @@
     pm: "مساءاً"
 
   datetime:
+    x_hours:
+      one:   "%{count} ساعة"
+      other: "%{count} ساعات"
+    x_days:
+      one:   "يوم"
+      other: "%{count} أيام"
     distance_in_words:
       half_a_minute: "نصف دقيقة"
       less_than_x_seconds:
Index: config/locales/az.yml
===================================================================
--- config/locales/az.yml	(revision 16427)
+++ config/locales/az.yml	(working copy)
@@ -81,6 +81,14 @@
           tb: "TB"
 
   datetime:
+    x_hours:
+      one:   "1 saat"
+      other: "%{count} saat"
+    x_days:
+      one:   "%{count} gün"
+      few:   "%{count} gün"
+      many:  "%{count} gün"
+      other: "%{count} gün"
     distance_in_words:
       half_a_minute: "bir dəqiqədən az"
       less_than_x_seconds:
Index: config/locales/bg.yml
===================================================================
--- config/locales/bg.yml	(revision 16427)
+++ config/locales/bg.yml	(working copy)
@@ -33,6 +33,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 час"
+      other: "%{count} часа"
+    x_days:
+      one:   "1 ден"
+      other: "%{count} дена"
     distance_in_words:
       half_a_minute: "half a minute"
       less_than_x_seconds:
Index: config/locales/bs.yml
===================================================================
--- config/locales/bs.yml	(revision 16427)
+++ config/locales/bs.yml	(working copy)
@@ -31,6 +31,12 @@
     pm: "poslijepodne"
 
   datetime:
+    x_hours:
+      one:   "1 sahat"
+      other: "%{count} sahata"
+    x_days:
+      one:   "1 dan"
+      other: "%{count} dana"
     distance_in_words:
       half_a_minute: "pola minute"
       less_than_x_seconds:
Index: config/locales/ca.yml
===================================================================
--- config/locales/ca.yml	(revision 16427)
+++ config/locales/ca.yml	(working copy)
@@ -36,6 +36,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 hora"
+      other: "%{count} hores"
+    x_days:
+      one:   "1 dia"
+      other: "%{count} dies"
     distance_in_words:
       half_a_minute: "mig minut"
       less_than_x_seconds:
Index: config/locales/cs.yml
===================================================================
--- config/locales/cs.yml	(revision 16427)
+++ config/locales/cs.yml	(working copy)
@@ -37,6 +37,12 @@
     pm: "odp."
 
   datetime:
+    x_hours:
+      one:   "1 hodina"
+      other: "%{count} hodin"
+    x_days:
+      one:   "1 den"
+      other: "%{count} dnů"
     distance_in_words:
       half_a_minute: "půl minuty"
       less_than_x_seconds:
Index: config/locales/da.yml
===================================================================
--- config/locales/da.yml	(revision 16427)
+++ config/locales/da.yml	(working copy)
@@ -34,6 +34,12 @@
       skip_last_comma: true
 
   datetime:
+    x_hours:
+      one:   "1 time"
+      other: "%{count} timer"
+    x_days:
+      one:  "en dag"
+      other: "%{count} dage"
     distance_in_words:
       half_a_minute: "et halvt minut"
       less_than_x_seconds:
Index: config/locales/de.yml
===================================================================
--- config/locales/de.yml	(revision 16427)
+++ config/locales/de.yml	(working copy)
@@ -35,6 +35,12 @@
     pm: "nachmittags"
 
   datetime:
+    x_hours:
+      one:   "1 Stunde"
+      other: "%{count} Stunden"
+    x_days:
+      one: '1 Tag'
+      other: '%{count} Tagen'
     distance_in_words:
       half_a_minute: 'eine halbe Minute'
       less_than_x_seconds:
Index: config/locales/el.yml
===================================================================
--- config/locales/el.yml	(revision 16427)
+++ config/locales/el.yml	(working copy)
@@ -34,6 +34,12 @@
     pm: "μμ"
 
   datetime:
+    x_hours:
+      one:   "1 ώρα"
+      other: "%{count} ώρες"
+    x_days:
+      one:   "1 ημέρα"
+      other: "%{count} ημέρες"
     distance_in_words:
       half_a_minute: "μισό λεπτό"
       less_than_x_seconds:
Index: config/locales/en-GB.yml
===================================================================
--- config/locales/en-GB.yml	(revision 16427)
+++ config/locales/en-GB.yml	(working copy)
@@ -31,6 +31,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 hour"
+      other: "%{count} hours"
+    x_days:
+      one:   "1 day"
+      other: "%{count} days"
     distance_in_words:
       half_a_minute: "half a minute"
       less_than_x_seconds:
Index: config/locales/en.yml
===================================================================
--- config/locales/en.yml	(revision 16427)
+++ config/locales/en.yml	(working copy)
@@ -32,6 +32,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 hour"
+      other: "%{count} hours"
+    x_days:
+      one:   "1 day"
+      other: "%{count} days"
     distance_in_words:
       half_a_minute: "half a minute"
       less_than_x_seconds:
Index: config/locales/es-PA.yml
===================================================================
--- config/locales/es-PA.yml	(revision 16427)
+++ config/locales/es-PA.yml	(working copy)
@@ -65,6 +65,12 @@
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
+    x_hours:
+      one:   "1 hora"
+      other: "%{count} horas"
+    x_days:
+      one:  "1 día"
+      other: "%{count} días"
     distance_in_words:
       half_a_minute: "medio minuto"
       less_than_x_seconds:
Index: config/locales/es.yml
===================================================================
--- config/locales/es.yml	(revision 16427)
+++ config/locales/es.yml	(working copy)
@@ -63,6 +63,12 @@
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
+    x_hours:
+      one:   "1 hora"
+      other: "%{count} horas"
+    x_days:
+      one:  "1 día"
+      other: "%{count} días"
     distance_in_words:
       half_a_minute: "medio minuto"
       less_than_x_seconds:
Index: config/locales/et.yml
===================================================================
--- config/locales/et.yml	(revision 16427)
+++ config/locales/et.yml	(working copy)
@@ -49,6 +49,12 @@
     pm: "peale lõunat"
 
   datetime:
+    x_hours:
+      one:   "1 tund"
+      other: "%{count} tundi"
+    x_days:
+      one:   "1 päev"
+      other: "%{count} päeva"
     distance_in_words:
       half_a_minute: "pool minutit"
       less_than_x_seconds:
Index: config/locales/eu.yml
===================================================================
--- config/locales/eu.yml	(revision 16427)
+++ config/locales/eu.yml	(working copy)
@@ -35,6 +35,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "ordu 1"
+      other: "%{count} ordu"
+    x_days:
+      one:   "egun 1"
+      other: "%{count} egun"
     distance_in_words:
       half_a_minute: "minutu erdi"
       less_than_x_seconds:
Index: config/locales/fa.yml
===================================================================
--- config/locales/fa.yml	(revision 16427)
+++ config/locales/fa.yml	(working copy)
@@ -32,6 +32,12 @@
     pm: "عصر"
 
   datetime:
+    x_hours:
+      one:   "1 ساعت"
+      other: "%{count} ساعت"
+    x_days:
+      one:   "1 روز"
+      other: "%{count} روز"
     distance_in_words:
       half_a_minute: "نیم دقیقه"
       less_than_x_seconds:
Index: config/locales/fi.yml
===================================================================
--- config/locales/fi.yml	(revision 16427)
+++ config/locales/fi.yml	(working copy)
@@ -77,6 +77,12 @@
           tb: "TB"
 
   datetime:
+    x_hours:
+      one:   "1 tunti"
+      other: "%{count} tuntia"
+    x_days:
+      one:   "päivä"
+      other: "%{count} päivää"
     distance_in_words:
       half_a_minute: "puoli minuuttia"
       less_than_x_seconds:
Index: config/locales/fr.yml
===================================================================
--- config/locales/fr.yml	(revision 16427)
+++ config/locales/fr.yml	(working copy)
@@ -37,6 +37,12 @@
     pm: 'pm'
 
   datetime:
+    x_hours:
+      one:   "une heure"
+      other: "%{count} heures"
+    x_days:
+      one:   "un jour"
+      other: "%{count} jours"
     distance_in_words:
       half_a_minute: "30 secondes"
       less_than_x_seconds:
Index: config/locales/gl.yml
===================================================================
--- config/locales/gl.yml	(revision 16427)
+++ config/locales/gl.yml	(working copy)
@@ -72,6 +72,12 @@
     pm: ''
 
   datetime:
+    x_hours:
+      one:   "1 hora"
+      other: "%{count} horas"
+    x_days:
+      one: '1 día'
+      other: '%{count} días'
     distance_in_words:
       half_a_minute: 'medio minuto'
       less_than_x_seconds:
Index: config/locales/he.yml
===================================================================
--- config/locales/he.yml	(revision 16427)
+++ config/locales/he.yml	(working copy)
@@ -36,6 +36,12 @@
     pm: 'pm'
 
   datetime:
+    x_hours:
+      one:   "1 שעה"
+      other: "%{count} שעות"
+    x_days:
+      one: 'יום אחד'
+      other: '%{count} ימים'
     distance_in_words:
       half_a_minute: 'חצי דקה'
       less_than_x_seconds:
Index: config/locales/hr.yml
===================================================================
--- config/locales/hr.yml	(revision 16427)
+++ config/locales/hr.yml	(working copy)
@@ -31,6 +31,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 sata"
+      other: "%{count} sati"
+    x_days:
+      one:   "1 dan"
+      other: "%{count} dana"
     distance_in_words:
       half_a_minute: "pola minute"
       less_than_x_seconds:
Index: config/locales/hu.yml
===================================================================
--- config/locales/hu.yml	(revision 16427)
+++ config/locales/hu.yml	(working copy)
@@ -31,6 +31,12 @@
     pm: "du."
 
   datetime:
+    x_hours:
+      one:   "1 óra"
+      other: "%{count} óra"
+    x_days:
+      one: '1 nap'
+      other: '%{count} nap'
     distance_in_words:
       half_a_minute: 'fél perc'
       less_than_x_seconds:
@@ -51,8 +57,8 @@
         one: 'csaknem 1 órája'
         other: 'csaknem %{count} órája'
       x_hours:
-        one:   "1 óra"
-        other: "%{count} óra"
+        one:   "1 órája"
+        other: "%{count} órája"
       x_days:
         one: '1 napja'
         other: '%{count} napja'
Index: config/locales/id.yml
===================================================================
--- config/locales/id.yml	(revision 16427)
+++ config/locales/id.yml	(working copy)
@@ -29,6 +29,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 jam"
+      other: "%{count} jam"
+    x_days:
+      one:   "sehari"
+      other: "%{count} hari"
     distance_in_words:
       half_a_minute: "setengah menit"
       less_than_x_seconds:
Index: config/locales/it.yml
===================================================================
--- config/locales/it.yml	(revision 16427)
+++ config/locales/it.yml	(working copy)
@@ -37,6 +37,12 @@
     pm: 'pm'
 
   datetime:
+    x_hours:
+      one:   "1 ora"
+      other: "%{count} ore"
+    x_days:
+      one:  "1 giorno"
+      other: "%{count} giorni"
     distance_in_words:
       half_a_minute: "mezzo minuto"
       less_than_x_seconds:
Index: config/locales/ja.yml
===================================================================
--- config/locales/ja.yml	(revision 16427)
+++ config/locales/ja.yml	(working copy)
@@ -35,6 +35,12 @@
     pm: "午後"
 
   datetime:
+    x_hours:
+      one:   "1時間"
+      other: "%{count}時間"
+    x_days:
+      one:   "1日"
+      other: "%{count}日"
     distance_in_words:
       half_a_minute: "30秒前後"
       less_than_x_seconds:
Index: config/locales/ko.yml
===================================================================
--- config/locales/ko.yml	(revision 16427)
+++ config/locales/ko.yml	(working copy)
@@ -32,6 +32,12 @@
     pm: "오후"
 
   datetime:
+    x_hours:
+      one:   "1 시간"
+      other: "%{count} 시간"
+    x_days:
+      one:   "하루"
+      other: "%{count}일"
     distance_in_words:
       half_a_minute: "30초"
       less_than_x_seconds:
Index: config/locales/lt.yml
===================================================================
--- config/locales/lt.yml	(revision 16427)
+++ config/locales/lt.yml	(working copy)
@@ -39,6 +39,12 @@
     pm: "vakaro"
 
   datetime:
+    x_hours:
+      one:  "1 valanda"
+      other: "%{count} valandų(os)"
+    x_days:
+      one: "1 diena"
+      other: "%{count} dienų(os)"
     distance_in_words:
       half_a_minute: "pusė minutės"
       less_than_x_seconds:
Index: config/locales/lv.yml
===================================================================
--- config/locales/lv.yml	(revision 16427)
+++ config/locales/lv.yml	(working copy)
@@ -28,6 +28,12 @@
     pm: "vakarā"
 
   datetime:
+    x_hours:
+      one:   "1 stunda"
+      other: "%{count} stundas"
+    x_days:
+      one:   "1 diena"
+      other: "%{count} dienas"
     distance_in_words:
       half_a_minute: "pus minūte"
       less_than_x_seconds:
Index: config/locales/mk.yml
===================================================================
--- config/locales/mk.yml	(revision 16427)
+++ config/locales/mk.yml	(working copy)
@@ -32,6 +32,12 @@
     pm: "попладне"
 
   datetime:
+    x_hours:
+      one:   "1 час"
+      other: "%{count} часа"
+    x_days:
+      one:   "1 ден"
+      other: "%{count} дена"
     distance_in_words:
       half_a_minute: "пола минута"
       less_than_x_seconds:
Index: config/locales/mn.yml
===================================================================
--- config/locales/mn.yml	(revision 16427)
+++ config/locales/mn.yml	(working copy)
@@ -33,6 +33,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 цаг"
+      other: "%{count} цаг"
+    x_days:
+      one:   "1 өдөр"
+      other: "%{count} өдөр"
     distance_in_words:
       half_a_minute: "хагас минут"
       less_than_x_seconds:
Index: config/locales/nl.yml
===================================================================
--- config/locales/nl.yml	(revision 16427)
+++ config/locales/nl.yml	(working copy)
@@ -31,6 +31,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 uur"
+      other: "%{count} uren"
+    x_days:
+      one:   "1 dag"
+      other: "%{count} dagen"
     distance_in_words:
       half_a_minute: "halve minuut"
       less_than_x_seconds:
Index: config/locales/no.yml
===================================================================
--- config/locales/no.yml	(revision 16427)
+++ config/locales/no.yml	(working copy)
@@ -26,6 +26,12 @@
     am: ""
     pm: ""
   datetime:
+    x_hours:
+      one:   "1 time"
+      other: "%{count} timer"
+    x_days:
+      one: "1 dag"
+      other: "%{count} dager"
     distance_in_words:
       half_a_minute: "et halvt minutt"
       less_than_x_seconds:
Index: config/locales/pl.yml
===================================================================
--- config/locales/pl.yml	(revision 16427)
+++ config/locales/pl.yml	(working copy)
@@ -60,6 +60,12 @@
     pm: "po południu"
 
   datetime:
+    x_hours:
+      one:   "1 godzina"
+      other: "%{count} godzin"
+    x_days:
+      one:   "1 dzień"
+      other: "%{count} dni"
     distance_in_words:
       half_a_minute: "pół minuty"
       less_than_x_seconds:
Index: config/locales/pt-BR.yml
===================================================================
--- config/locales/pt-BR.yml	(revision 16427)
+++ config/locales/pt-BR.yml	(working copy)
@@ -31,6 +31,14 @@
 
   # date helper distancia em palavras
   datetime:
+    x_hours:
+      one:   "1 hora"
+      other: "%{count} horas"
+
+    x_days:
+      one: '1 dia'
+      other: '%{count} dias'
+
     distance_in_words:
       half_a_minute: 'meio minuto'
       less_than_x_seconds:
Index: config/locales/pt.yml
===================================================================
--- config/locales/pt.yml	(revision 16427)
+++ config/locales/pt.yml	(working copy)
@@ -35,6 +35,12 @@
     pm: 'pm'
 
   datetime:
+    x_hours:
+      one:   "1 hora"
+      other: "%{count} horas"
+    x_days:
+      one: "1 dia"
+      other: "%{count} dias"
     distance_in_words:
       half_a_minute: "meio minuto"
       less_than_x_seconds:
Index: config/locales/ro.yml
===================================================================
--- config/locales/ro.yml	(revision 16427)
+++ config/locales/ro.yml	(working copy)
@@ -27,6 +27,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 oră"
+      other: "%{count} ore"
+    x_days:
+      one:   "o zi"
+      other: "%{count} zile"
     distance_in_words:
       half_a_minute: "jumătate de minut"
       less_than_x_seconds:
Index: config/locales/ru.yml
===================================================================
--- config/locales/ru.yml	(revision 16427)
+++ config/locales/ru.yml	(working copy)
@@ -89,6 +89,16 @@
           tb: "ТБ"
 
   datetime:
+    x_hours:
+      one:   "%{count} час"
+      few:   "%{count} часа"
+      many:  "%{count} часов"
+      other: "%{count} часа"
+    x_days:
+      one:   "%{count} день"
+      few:   "%{count} дня"
+      many:  "%{count} дней"
+      other: "%{count} дня"
     distance_in_words:
       half_a_minute: "меньше минуты"
       less_than_x_seconds:
Index: config/locales/sk.yml
===================================================================
--- config/locales/sk.yml	(revision 16427)
+++ config/locales/sk.yml	(working copy)
@@ -31,6 +31,12 @@
     pm: "popoludní"
 
   datetime:
+    x_hours:
+      one:   "1 hodina"
+      other: "%{count} hodín"
+    x_days:
+      one:   "1 deň"
+      other: "%{count} dní"
     distance_in_words:
       half_a_minute: "pol minúty"
       less_than_x_seconds:
Index: config/locales/sl.yml
===================================================================
--- config/locales/sl.yml	(revision 16427)
+++ config/locales/sl.yml	(working copy)
@@ -32,6 +32,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 ura"
+      other: "%{count} ur"
+    x_days:
+      one:   "1 dan"
+      other: "%{count} dni"
     distance_in_words:
       half_a_minute: "pol minute"
       less_than_x_seconds:
Index: config/locales/sq.yml
===================================================================
--- config/locales/sq.yml	(revision 16427)
+++ config/locales/sq.yml	(working copy)
@@ -32,6 +32,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 ore"
+      other: "%{count} ore"
+    x_days:
+      one:   "1 day"
+      other: "%{count} days"
     distance_in_words:
       half_a_minute: "half a minute"
       less_than_x_seconds:
Index: config/locales/sr-YU.yml
===================================================================
--- config/locales/sr-YU.yml	(revision 16427)
+++ config/locales/sr-YU.yml	(working copy)
@@ -35,6 +35,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 sat"
+      other: "%{count} sati"
+    x_days:
+      one:   "jedan dan"
+      other: "%{count} dana"
     distance_in_words:
       half_a_minute: "pola minuta"
       less_than_x_seconds:
Index: config/locales/sr.yml
===================================================================
--- config/locales/sr.yml	(revision 16427)
+++ config/locales/sr.yml	(working copy)
@@ -33,6 +33,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 сат"
+      other: "%{count} сати"
+    x_days:
+      one:   "један дан"
+      other: "%{count} дана"
     distance_in_words:
       half_a_minute: "пола минута"
       less_than_x_seconds:
Index: config/locales/sv.yml
===================================================================
--- config/locales/sv.yml	(revision 16427)
+++ config/locales/sv.yml	(working copy)
@@ -61,6 +61,12 @@
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
+    x_hours:
+      one:   "1 timme"
+      other: "%{count} timmar"
+    x_days:
+      one:   "en dag"
+      other: "%{count} dagar"
     distance_in_words:
       half_a_minute: "en halv minut"
       less_than_x_seconds:
Index: config/locales/th.yml
===================================================================
--- config/locales/th.yml	(revision 16427)
+++ config/locales/th.yml	(working copy)
@@ -31,6 +31,12 @@
     pm: "pm"
 
   datetime:
+    x_hours:
+      one:   "1 hour"
+      other: "%{count} hours"
+    x_days:
+      one:   "1 day"
+      other: "%{count} days"
     distance_in_words:
       half_a_minute: "half a minute"
       less_than_x_seconds:
Index: config/locales/tr.yml
===================================================================
--- config/locales/tr.yml	(revision 16427)
+++ config/locales/tr.yml	(working copy)
@@ -32,6 +32,12 @@
     pm: "öğleden sonra"
 
   datetime:
+    x_hours:
+      one:   "1 saat"
+      other: "%{count} saat"
+    x_days:
+      one: '1 gün'
+      other: '%{count} gün'
     distance_in_words:
       half_a_minute: 'yarım dakika'
       less_than_x_seconds:
Index: config/locales/uk.yml
===================================================================
--- config/locales/uk.yml	(revision 16427)
+++ config/locales/uk.yml	(working copy)
@@ -31,6 +31,16 @@
     pm: "вечора"
 
   datetime:
+    x_hours:
+      one:   "1 година"
+      few:   "%{count} години"
+      many:  "%{count} годин"
+      other: "%{count} години"
+    x_days:
+      one:   "1 день"
+      few:   "%{count} дня"
+      many:  "%{count} днів"
+      other: "%{count} днів"
     distance_in_words:
       half_a_minute: "менше хвилини"
       less_than_x_seconds:
Index: config/locales/vi.yml
===================================================================
--- config/locales/vi.yml	(revision 16427)
+++ config/locales/vi.yml	(working copy)
@@ -63,6 +63,12 @@
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
+    x_hours:
+      one:   "1 giờ"
+      other: "%{count} giờ"
+    x_days:
+      one:   "1 ngày"
+      other: "%{count} ngày"
     distance_in_words:
       half_a_minute: "30 giây"
       less_than_x_seconds:
Index: config/locales/zh-TW.yml
===================================================================
--- config/locales/zh-TW.yml	(revision 16427)
+++ config/locales/zh-TW.yml	(working copy)
@@ -105,6 +105,12 @@
 
   # 使用於 distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
+    x_hours:
+      one:   "1 小時"
+      other: "%{count} 小時"
+    x_days:
+      one: "1 天"
+      other: "%{count} 天"
     distance_in_words:
       half_a_minute: "半分鐘"
       less_than_x_seconds:
Index: config/locales/zh.yml
===================================================================
--- config/locales/zh.yml	(revision 16427)
+++ config/locales/zh.yml	(working copy)
@@ -36,6 +36,12 @@
     pm: "下午"
 
   datetime:
+    x_hours:
+      one:   "1 小时"
+      other: "%{count} 小时"
+    x_days:
+      one: "一天"
+      other: "%{count} 天"
     distance_in_words:
       half_a_minute: "半分钟"
       less_than_x_seconds: