Index: sandbox/rails-2.2/app/helpers/application_helper.rb
===================================================================
--- sandbox/rails-2.2/app/helpers/application_helper.rb	(revision 2408)
+++ sandbox/rails-2.2/app/helpers/application_helper.rb	(revision 2409)
@@ -103,13 +103,6 @@
     h(truncate(text.to_s, :length => 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')).gsub(/[\r\n]+/, "<br />")
   end
 
-  def distance_of_date_in_words(from_date, to_date = 0)
-    from_date = from_date.to_date if from_date.respond_to?(:to_date)
-    to_date = to_date.to_date if to_date.respond_to?(:to_date)
-    distance_in_days = (to_date - from_date).abs
-    lwr(:actionview_datehelper_time_in_words_day, distance_in_days)
-  end
-
   def due_date_distance_in_words(date)
     if date
       l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
Index: sandbox/rails-2.2/app/views/issues/_relations.rhtml
===================================================================
--- sandbox/rails-2.2/app/views/issues/_relations.rhtml	(revision 2408)
+++ sandbox/rails-2.2/app/views/issues/_relations.rhtml	(revision 2409)
@@ -10,7 +10,7 @@
 <table style="width:100%">
 <% @issue.relations.select {|r| r.other_issue(@issue).visible? }.each do |relation| %>
 <tr>
-<td><%= l(relation.label_for(@issue)) %> <%= "(#{lwr(:actionview_datehelper_time_in_words_day, relation.delay)})" if relation.delay && relation.delay != 0 %>
+<td><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
     <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %> <%= link_to_issue relation.other_issue(@issue) %></td>
 <td><%=h relation.other_issue(@issue).subject %></td>
 <td><%= relation.other_issue(@issue).status.name %></td>
Index: sandbox/rails-2.2/app/views/settings/_authentication.rhtml
===================================================================
--- sandbox/rails-2.2/app/views/settings/_authentication.rhtml	(revision 2408)
+++ sandbox/rails-2.2/app/views/settings/_authentication.rhtml	(revision 2409)
@@ -5,7 +5,7 @@
 <%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
 
 <p><label><%= l(:setting_autologin) %></label>
-<%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [lwr(:actionview_datehelper_time_in_words_day, days), days.to_s]}, Setting.autologin) %></p>
+<%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]}, Setting.autologin) %></p>
 
 <p><label><%= l(:setting_self_registration) %></label>
 <%= select_tag 'settings[self_registration]',
Index: sandbox/rails-2.2/config/initializers/10-patches.rb
===================================================================
--- sandbox/rails-2.2/config/initializers/10-patches.rb	(revision 2408)
+++ sandbox/rails-2.2/config/initializers/10-patches.rb	(revision 2409)
@@ -12,6 +12,27 @@
   end
 end
 
+module ActionView
+  module Helpers
+    module DateHelper
+      # distance_of_time_in_words breaks when difference is greater than 30 years
+      def distance_of_date_in_words(from_date, to_date = 0, options = {})
+        from_date = from_date.to_date if from_date.respond_to?(:to_date)
+        to_date = to_date.to_date if to_date.respond_to?(:to_date)
+        distance_in_days = (to_date - from_date).abs
+
+        I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
+          case distance_in_days
+            when 0..60     then locale.t :x_days,             :count => distance_in_days
+            when 61..720   then locale.t :about_x_months,     :count => (distance_in_days / 30).round
+            else                locale.t :over_x_years,       :count => (distance_in_days / 365).round
+          end
+        end
+      end
+    end
+  end
+end
+
 ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
 
 # Adds :async_smtp and :async_sendmail delivery methods
Index: sandbox/rails-2.2/config/locales/bg.yml
===================================================================
--- sandbox/rails-2.2/config/locales/bg.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/bg.yml	(revision 2409)
@@ -92,18 +92,6 @@
         not_same_project: "не е от същия проект"
         circular_dependency: "Тази релация ще доведе до безкрайна зависимост"
 
-  actionview_datehelper_time_in_words_day: 1 ден
-  actionview_datehelper_time_in_words_day_plural: "{{count}} дни"
-  actionview_datehelper_time_in_words_hour_about: около час
-  actionview_datehelper_time_in_words_hour_about_plural: "около {{count}} часа"
-  actionview_datehelper_time_in_words_hour_about_single: около час
-  actionview_datehelper_time_in_words_minute: 1 минута
-  actionview_datehelper_time_in_words_minute_half: половин минута
-  actionview_datehelper_time_in_words_minute_less_than: по-малко от минута
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} минути"
-  actionview_datehelper_time_in_words_minute_single: 1 минута
-  actionview_datehelper_time_in_words_second_less_than: по-малко от секунда
-  actionview_datehelper_time_in_words_second_less_than_plural: "по-малко от {{count}} секунди"
   actionview_instancetag_blank_option: Изберете
   
   general_text_No: 'Не'
Index: sandbox/rails-2.2/config/locales/ca.yml
===================================================================
--- sandbox/rails-2.2/config/locales/ca.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/ca.yml	(revision 2409)
@@ -92,18 +92,6 @@
         not_same_project: "no pertany al mateix projecte"
         circular_dependency: "Aquesta relació crearia una dependència circular"
 
-  actionview_datehelper_time_in_words_day: 1 dia
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dies"
-  actionview_datehelper_time_in_words_hour_about: aproximadament una hora
-  actionview_datehelper_time_in_words_hour_about_plural: "aproximadament {{count}} hores"
-  actionview_datehelper_time_in_words_hour_about_single: aproximadament una hora
-  actionview_datehelper_time_in_words_minute: 1 minut
-  actionview_datehelper_time_in_words_minute_half: mig minut
-  actionview_datehelper_time_in_words_minute_less_than: "menys d'un minut"
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minuts"
-  actionview_datehelper_time_in_words_minute_single: 1 minut
-  actionview_datehelper_time_in_words_second_less_than: "menys d'un segon"
-  actionview_datehelper_time_in_words_second_less_than_plural: "menys de {{count}} segons"
   actionview_instancetag_blank_option: Seleccioneu
   
   general_text_No: 'No'
Index: sandbox/rails-2.2/config/locales/cs.yml
===================================================================
--- sandbox/rails-2.2/config/locales/cs.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/cs.yml	(revision 2409)
@@ -95,18 +95,6 @@
   # CZ translation by Maxim Krušina | Massimo Filippi, s.r.o. | maxim@mxm.cz
   # Based on original CZ translation by Jan Kadleček
   
-  actionview_datehelper_time_in_words_day: 1 den
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dny"
-  actionview_datehelper_time_in_words_hour_about: asi hodinou
-  actionview_datehelper_time_in_words_hour_about_plural: "asi {{count}} hodinami"
-  actionview_datehelper_time_in_words_hour_about_single: asi hodinou
-  actionview_datehelper_time_in_words_minute: 1 minutou
-  actionview_datehelper_time_in_words_minute_half: půl minutou
-  actionview_datehelper_time_in_words_minute_less_than: méně než minutou
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minutami"
-  actionview_datehelper_time_in_words_minute_single: 1 minutou
-  actionview_datehelper_time_in_words_second_less_than: méně než sekundou
-  actionview_datehelper_time_in_words_second_less_than_plural: "méně než {{count}} sekundami"
   actionview_instancetag_blank_option: Prosím vyberte
   
   general_text_No: 'Ne'
Index: sandbox/rails-2.2/config/locales/da.yml
===================================================================
--- sandbox/rails-2.2/config/locales/da.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/da.yml	(revision 2409)
@@ -122,18 +122,6 @@
           other:  "{{count}} fejl forhindrede denne {{model}} i at blive gemt"
         body: "Der var problemer med følgende felter:"
   
-  actionview_datehelper_time_in_words_day: 1 dag
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dage"
-  actionview_datehelper_time_in_words_hour_about: cirka en time
-  actionview_datehelper_time_in_words_hour_about_plural: "cirka {{count}} timer"
-  actionview_datehelper_time_in_words_hour_about_single: cirka en time
-  actionview_datehelper_time_in_words_minute: 1 minut
-  actionview_datehelper_time_in_words_minute_half: et halvt minut
-  actionview_datehelper_time_in_words_minute_less_than: mindre end et minut
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minutter"
-  actionview_datehelper_time_in_words_minute_single: 1 minut
-  actionview_datehelper_time_in_words_second_less_than: mindre end et sekund
-  actionview_datehelper_time_in_words_second_less_than_plural: "mindre end {{count}} sekunder"
   actionview_instancetag_blank_option: Vælg venligst
   
   general_text_No: 'Nej'
Index: sandbox/rails-2.2/config/locales/de.yml
===================================================================
--- sandbox/rails-2.2/config/locales/de.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/de.yml	(revision 2409)
@@ -122,18 +122,6 @@
         circular_dependency: "Diese Beziehung würde eine zyklische Abhängigkeit erzeugen"
       models:
   
-  actionview_datehelper_time_in_words_day: 1 Tag
-  actionview_datehelper_time_in_words_day_plural: "{{count}} Tagen"
-  actionview_datehelper_time_in_words_hour_about: ungefähr einer Stunde
-  actionview_datehelper_time_in_words_hour_about_plural: "ungefähr {{count}} Stunden"
-  actionview_datehelper_time_in_words_hour_about_single: ungefähr einer Stunde
-  actionview_datehelper_time_in_words_minute: 1 Minute
-  actionview_datehelper_time_in_words_minute_half: einer halben Minute
-  actionview_datehelper_time_in_words_minute_less_than: weniger als einer Minute
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} Minuten"
-  actionview_datehelper_time_in_words_minute_single: 1 Minute
-  actionview_datehelper_time_in_words_second_less_than: weniger als einer Sekunde
-  actionview_datehelper_time_in_words_second_less_than_plural: "weniger als {{count}} Sekunden"
   actionview_instancetag_blank_option: Bitte auswählen
   
   general_text_No: 'Nein'
Index: sandbox/rails-2.2/config/locales/en.yml
===================================================================
--- sandbox/rails-2.2/config/locales/en.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/en.yml	(revision 2409)
@@ -92,19 +92,6 @@
         not_same_project: "doesn't belong to the same project"
         circular_dependency: "This relation would create a circular dependency"
 
-  
-  actionview_datehelper_time_in_words_day: 1 day
-  actionview_datehelper_time_in_words_day_plural: "{{count}} days"
-  actionview_datehelper_time_in_words_hour_about: about an hour
-  actionview_datehelper_time_in_words_hour_about_plural: "about {{count}} hours"
-  actionview_datehelper_time_in_words_hour_about_single: about an hour
-  actionview_datehelper_time_in_words_minute: 1 minute
-  actionview_datehelper_time_in_words_minute_half: half a minute
-  actionview_datehelper_time_in_words_minute_less_than: less than a minute
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minutes"
-  actionview_datehelper_time_in_words_minute_single: 1 minute
-  actionview_datehelper_time_in_words_second_less_than: less than a second
-  actionview_datehelper_time_in_words_second_less_than_plural: "less than {{count}} seconds"
   actionview_instancetag_blank_option: Please select
   
   general_text_No: 'No'
Index: sandbox/rails-2.2/config/locales/es.yml
===================================================================
--- sandbox/rails-2.2/config/locales/es.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/es.yml	(revision 2409)
@@ -157,18 +157,6 @@
     array:
       sentence_connector: "y"
 
-  actionview_datehelper_time_in_words_day: 1 día
-  actionview_datehelper_time_in_words_day_plural: "{{count}} días"
-  actionview_datehelper_time_in_words_hour_about: una hora aproximadamente
-  actionview_datehelper_time_in_words_hour_about_plural: "aproximadamente {{count}} horas"
-  actionview_datehelper_time_in_words_hour_about_single: una hora aproximadamente
-  actionview_datehelper_time_in_words_minute: 1 minuto
-  actionview_datehelper_time_in_words_minute_half: medio minuto
-  actionview_datehelper_time_in_words_minute_less_than: menos de un minuto
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minutos"
-  actionview_datehelper_time_in_words_minute_single: 1 minuto
-  actionview_datehelper_time_in_words_second_less_than: menos de un segundo
-  actionview_datehelper_time_in_words_second_less_than_plural: "menos de {{count}} segundos"
   actionview_instancetag_blank_option: Por favor seleccione
   
   button_activate: Activar
Index: sandbox/rails-2.2/config/locales/fi.yml
===================================================================
--- sandbox/rails-2.2/config/locales/fi.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/fi.yml	(revision 2409)
@@ -135,18 +135,6 @@
         circular_dependency: "Tämä suhde loisi kehän."
 
   
-  actionview_datehelper_time_in_words_day: 1 päivä
-  actionview_datehelper_time_in_words_day_plural: "{{count}} päivää"
-  actionview_datehelper_time_in_words_hour_about: noin tunti
-  actionview_datehelper_time_in_words_hour_about_plural: "noin {{count}} tuntia"
-  actionview_datehelper_time_in_words_hour_about_single: noin tunnin
-  actionview_datehelper_time_in_words_minute: 1 minuutti
-  actionview_datehelper_time_in_words_minute_half: puoli minuuttia
-  actionview_datehelper_time_in_words_minute_less_than: vähemmän kuin minuuttia
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minuuttia"
-  actionview_datehelper_time_in_words_minute_single: 1 minuutti
-  actionview_datehelper_time_in_words_second_less_than: vähemmän kuin sekuntin
-  actionview_datehelper_time_in_words_second_less_than_plural: "vähemmän kuin {{count}} sekuntia"
   actionview_instancetag_blank_option: Valitse, ole hyvä
   
   general_text_No: 'Ei'
Index: sandbox/rails-2.2/config/locales/fr.yml
===================================================================
--- sandbox/rails-2.2/config/locales/fr.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/fr.yml	(revision 2409)
@@ -125,18 +125,6 @@
         not_same_project: "n'appartient pas au même projet"
         circular_dependency: "Cette relation créerait une dépendance circulaire"
 
-  actionview_datehelper_time_in_words_day: 1 jour
-  actionview_datehelper_time_in_words_day_plural: "{{count}} jours"
-  actionview_datehelper_time_in_words_hour_about: environ une heure
-  actionview_datehelper_time_in_words_hour_about_plural: "environ {{count}} heures"
-  actionview_datehelper_time_in_words_hour_about_single: environ une heure
-  actionview_datehelper_time_in_words_minute: 1 minute
-  actionview_datehelper_time_in_words_minute_half: 30 secondes
-  actionview_datehelper_time_in_words_minute_less_than: moins d'une minute
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minutes"
-  actionview_datehelper_time_in_words_minute_single: 1 minute
-  actionview_datehelper_time_in_words_second_less_than: moins d'une seconde
-  actionview_datehelper_time_in_words_second_less_than_plural: "moins de {{count}} secondes"
   actionview_instancetag_blank_option: Choisir
   
   general_text_No: 'Non'
Index: sandbox/rails-2.2/config/locales/gl.yml
===================================================================
--- sandbox/rails-2.2/config/locales/gl.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/gl.yml	(revision 2409)
@@ -137,18 +137,6 @@
         not_same_project: "non pertence ao mesmo proxecto"
         circular_dependency: "Esta relación podería crear unha dependencia circular"
 
-  actionview_datehelper_time_in_words_day: 1 día
-  actionview_datehelper_time_in_words_day_plural: "{{count}} días"
-  actionview_datehelper_time_in_words_hour_about: unha hora aproximadamente
-  actionview_datehelper_time_in_words_hour_about_plural: "aproximadamente {{count}} horas"
-  actionview_datehelper_time_in_words_hour_about_single: unha hora aproximadamente
-  actionview_datehelper_time_in_words_minute: 1 minuto
-  actionview_datehelper_time_in_words_minute_half: medio minuto
-  actionview_datehelper_time_in_words_minute_less_than: menos dun minuto
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minutos"
-  actionview_datehelper_time_in_words_minute_single: 1 minuto
-  actionview_datehelper_time_in_words_second_less_than: menos dun segundo
-  actionview_datehelper_time_in_words_second_less_than_plural: "menos de {{count}} segundos"
   actionview_instancetag_blank_option: Por favor seleccione
   
   button_activate: Activar
Index: sandbox/rails-2.2/config/locales/he.yml
===================================================================
--- sandbox/rails-2.2/config/locales/he.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/he.yml	(revision 2409)
@@ -103,18 +103,6 @@
         not_same_project: "לא שייך לאותו הפרויקט"
         circular_dependency: "הקשר הזה יצור תלות מעגלית"
 
-  actionview_datehelper_time_in_words_day: יום 1
-  actionview_datehelper_time_in_words_day_plural: "{{count}} ימים"
-  actionview_datehelper_time_in_words_hour_about: כשעה
-  actionview_datehelper_time_in_words_hour_about_plural: "כ-{{count}} שעות"
-  actionview_datehelper_time_in_words_hour_about_single: כשעה
-  actionview_datehelper_time_in_words_minute: דקה 1 
-  actionview_datehelper_time_in_words_minute_half: חצי דקה
-  actionview_datehelper_time_in_words_minute_less_than: פחות מדקה
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} דקות"
-  actionview_datehelper_time_in_words_minute_single: דקה 1
-  actionview_datehelper_time_in_words_second_less_than: פחות משניה
-  actionview_datehelper_time_in_words_second_less_than_plural: "פחות מ-{{count}} שניות"
   actionview_instancetag_blank_option: בחר בבקשה
   
   general_text_No: 'לא'
Index: sandbox/rails-2.2/config/locales/hu.yml
===================================================================
--- sandbox/rails-2.2/config/locales/hu.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/hu.yml	(revision 2409)
@@ -129,18 +129,6 @@
         not_same_project: "nem azonos projekthez tartozik"
         circular_dependency: "Ez a kapcsolat egy körkörös függőséget eredményez"
 
-  actionview_datehelper_time_in_words_day: 1 nap
-  actionview_datehelper_time_in_words_day_plural: "{{count}} nap"
-  actionview_datehelper_time_in_words_hour_about: kb. 1 óra
-  actionview_datehelper_time_in_words_hour_about_plural: "kb. {{count}} óra"
-  actionview_datehelper_time_in_words_hour_about_single: kb. 1 óra
-  actionview_datehelper_time_in_words_minute: 1 perc
-  actionview_datehelper_time_in_words_minute_half: fél perc
-  actionview_datehelper_time_in_words_minute_less_than: kevesebb, mint 1 perc
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} perc"
-  actionview_datehelper_time_in_words_minute_single: 1 perc
-  actionview_datehelper_time_in_words_second_less_than: kevesebb, mint 1 másodperc
-  actionview_datehelper_time_in_words_second_less_than_plural: "kevesebb, mint {{count}} másodperc"
   actionview_instancetag_blank_option: Kérem válasszon
   
   general_text_No: 'Nem'
Index: sandbox/rails-2.2/config/locales/it.yml
===================================================================
--- sandbox/rails-2.2/config/locales/it.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/it.yml	(revision 2409)
@@ -106,18 +106,6 @@
         not_same_project: "non appartiene allo stesso progetto"
         circular_dependency: "Questa relazione creerebbe una dipendenza circolare"
 
-  actionview_datehelper_time_in_words_day: 1 giorno
-  actionview_datehelper_time_in_words_day_plural: "{{count}} giorni"
-  actionview_datehelper_time_in_words_hour_about: circa un'ora
-  actionview_datehelper_time_in_words_hour_about_plural: "circa {{count}} ore"
-  actionview_datehelper_time_in_words_hour_about_single: circa un'ora
-  actionview_datehelper_time_in_words_minute: 1 minuto
-  actionview_datehelper_time_in_words_minute_half: mezzo minuto
-  actionview_datehelper_time_in_words_minute_less_than: meno di un minuto
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minuti"
-  actionview_datehelper_time_in_words_minute_single: 1 minuto
-  actionview_datehelper_time_in_words_second_less_than: meno di un secondo
-  actionview_datehelper_time_in_words_second_less_than_plural: "meno di {{count}} secondi"
   actionview_instancetag_blank_option: Scegli
   
   general_text_No: 'No'
Index: sandbox/rails-2.2/config/locales/ja.yml
===================================================================
--- sandbox/rails-2.2/config/locales/ja.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/ja.yml	(revision 2409)
@@ -123,19 +123,6 @@
         not_same_project: "同じプロジェクトに属していません"
         circular_dependency: "この関係では、循環依存になります"
 
-  
-  actionview_datehelper_time_in_words_day: 1日
-  actionview_datehelper_time_in_words_day_plural: "{{count}}日"
-  actionview_datehelper_time_in_words_hour_about: 約1時間
-  actionview_datehelper_time_in_words_hour_about_plural: "約{{count}}時間"
-  actionview_datehelper_time_in_words_hour_about_single: 約1時間
-  actionview_datehelper_time_in_words_minute: 1分
-  actionview_datehelper_time_in_words_minute_half: 約30秒
-  actionview_datehelper_time_in_words_minute_less_than: 1分以内
-  actionview_datehelper_time_in_words_minute_plural: "{{count}}分"
-  actionview_datehelper_time_in_words_minute_single: 1分
-  actionview_datehelper_time_in_words_second_less_than: 1秒以内
-  actionview_datehelper_time_in_words_second_less_than_plural: "{{count}}秒以内"
   actionview_instancetag_blank_option: 選んでください
   
   general_text_No: 'いいえ'
Index: sandbox/rails-2.2/config/locales/ko.yml
===================================================================
--- sandbox/rails-2.2/config/locales/ko.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/ko.yml	(revision 2409)
@@ -154,18 +154,6 @@
         not_same_project: "는 같은 프로젝트에 속해 있지 않습니다."
         circular_dependency: "이 관계는 순환 의존관계를 만들 수있습니다."
 
-  actionview_datehelper_time_in_words_day: 하루
-  actionview_datehelper_time_in_words_day_plural: "{{count}} 일"
-  actionview_datehelper_time_in_words_hour_about: 약 한 시간
-  actionview_datehelper_time_in_words_hour_about_plural: "약 {{count}} 시간"
-  actionview_datehelper_time_in_words_hour_about_single: 약 한 시간
-  actionview_datehelper_time_in_words_minute: 1 분
-  actionview_datehelper_time_in_words_minute_half: 30초
-  actionview_datehelper_time_in_words_minute_less_than: 1분 이내
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} 분"
-  actionview_datehelper_time_in_words_minute_single: 1 분
-  actionview_datehelper_time_in_words_second_less_than: 1초 이내
-  actionview_datehelper_time_in_words_second_less_than_plural: "{{count}} 초 이전"
   actionview_instancetag_blank_option: 선택하세요
   
   general_text_No: '아니오'
Index: sandbox/rails-2.2/config/locales/lt.yml
===================================================================
--- sandbox/rails-2.2/config/locales/lt.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/lt.yml	(revision 2409)
@@ -133,18 +133,6 @@
       last_word_connector: " ir "
 
   
-  actionview_datehelper_time_in_words_day: 1 diena
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dienų"
-  actionview_datehelper_time_in_words_hour_about: apytiksliai valanda
-  actionview_datehelper_time_in_words_hour_about_plural: "apie {{count}} valandas"
-  actionview_datehelper_time_in_words_hour_about_single: apytiksliai valanda
-  actionview_datehelper_time_in_words_minute: 1 minutė
-  actionview_datehelper_time_in_words_minute_half: pusė minutės
-  actionview_datehelper_time_in_words_minute_less_than: mažiau kaip minutė
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minutės"
-  actionview_datehelper_time_in_words_minute_single: 1 minutė
-  actionview_datehelper_time_in_words_second_less_than: mažiau kaip sekundė
-  actionview_datehelper_time_in_words_second_less_than_plural: "mažiau, negu {{count}} sekundės"
   actionview_instancetag_blank_option: prašom išrinkti
   
   general_text_No: 'Ne'
Index: sandbox/rails-2.2/config/locales/nl.yml
===================================================================
--- sandbox/rails-2.2/config/locales/nl.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/nl.yml	(revision 2409)
@@ -92,18 +92,6 @@
         not_same_project: "hoort niet bij hetzelfde project"
         circular_dependency: "Deze relatie zou een circulaire afhankelijkheid tot gevolg hebben"
 
-  actionview_datehelper_time_in_words_day: 1 dag
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dagen"
-  actionview_datehelper_time_in_words_hour_about: ongeveer een uur
-  actionview_datehelper_time_in_words_hour_about_plural: "ongeveer {{count}} uur"
-  actionview_datehelper_time_in_words_hour_about_single: ongeveer een uur
-  actionview_datehelper_time_in_words_minute: 1 minuut
-  actionview_datehelper_time_in_words_minute_half: een halve minuut
-  actionview_datehelper_time_in_words_minute_less_than: minder dan een minuut
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minuten"
-  actionview_datehelper_time_in_words_minute_single: 1 minuut
-  actionview_datehelper_time_in_words_second_less_than: minder dan een seconde
-  actionview_datehelper_time_in_words_second_less_than_plural: "minder dan {{count}} seconden"
   actionview_instancetag_blank_option: Selecteer
   
   button_activate: Activeer
Index: sandbox/rails-2.2/config/locales/no.yml
===================================================================
--- sandbox/rails-2.2/config/locales/no.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/no.yml	(revision 2409)
@@ -97,18 +97,6 @@
         circular_dependency: "Denne relasjonen ville lagd en sirkulær avhengighet"
 
   
-  actionview_datehelper_time_in_words_day: 1 dag
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dager"
-  actionview_datehelper_time_in_words_hour_about: ca. en time
-  actionview_datehelper_time_in_words_hour_about_plural: "ca. {{count}} timer"
-  actionview_datehelper_time_in_words_hour_about_single: ca. en time
-  actionview_datehelper_time_in_words_minute: 1 minutt
-  actionview_datehelper_time_in_words_minute_half: et halvt minutt
-  actionview_datehelper_time_in_words_minute_less_than: mindre enn et minutt
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minutter"
-  actionview_datehelper_time_in_words_minute_single: 1 minutt
-  actionview_datehelper_time_in_words_second_less_than: mindre enn et sekund
-  actionview_datehelper_time_in_words_second_less_than_plural: "mindre enn {{count}} sekunder"
   actionview_instancetag_blank_option: Vennligst velg
   
   general_text_No: 'Nei'
Index: sandbox/rails-2.2/config/locales/pl.yml
===================================================================
--- sandbox/rails-2.2/config/locales/pl.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/pl.yml	(revision 2409)
@@ -123,26 +123,6 @@
   # Keep this line in order to avoid problems with Windows Notepad UTF-8 EF-BB-BFidea...
   # Best regards from Lublin@Poland :-)
   # PL translation by Mariusz@Olejnik.net,
-  actionview_datehelper_time_in_words_day: 1 dzień
-  actionview_datehelper_time_in_words_day_plural234: "{{count}} dni"
-  actionview_datehelper_time_in_words_day_plural5: "{{count}} dni"
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dni"
-  actionview_datehelper_time_in_words_hour_about: około godziny
-  actionview_datehelper_time_in_words_hour_about_plural234: "około {{count}} godzin"
-  actionview_datehelper_time_in_words_hour_about_plural5: "około {{count}} godzin"
-  actionview_datehelper_time_in_words_hour_about_plural: "około {{count}} godzin"
-  actionview_datehelper_time_in_words_hour_about_single: około godziny
-  actionview_datehelper_time_in_words_minute: 1 minuta
-  actionview_datehelper_time_in_words_minute_half: pół minuty
-  actionview_datehelper_time_in_words_minute_less_than: mniej niż minuta
-  actionview_datehelper_time_in_words_minute_plural234: "{{count}} minuty"
-  actionview_datehelper_time_in_words_minute_plural5: "{{count}} minut"
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minut"
-  actionview_datehelper_time_in_words_minute_single: 1 minuta
-  actionview_datehelper_time_in_words_second_less_than: mniej niż sekunda
-  actionview_datehelper_time_in_words_second_less_than_plural234: "mniej niż {{count}} sekundy"
-  actionview_datehelper_time_in_words_second_less_than_plural5: "mniej niż {{count}} sekund"
-  actionview_datehelper_time_in_words_second_less_than_plural: "mniej niż {{count}} sekund"
   actionview_instancetag_blank_option: Proszę wybierz
   
   button_activate: Aktywuj
Index: sandbox/rails-2.2/config/locales/pt-BR.yml
===================================================================
--- sandbox/rails-2.2/config/locales/pt-BR.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/pt-BR.yml	(revision 2409)
@@ -130,19 +130,6 @@
         not_same_project: "não pertence ao mesmo projeto"
         circular_dependency: "Esta relação geraria uma dependência circular"
 
-  
-  actionview_datehelper_time_in_words_day: 1 dia
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dias"
-  actionview_datehelper_time_in_words_hour_about: aproximadamente uma hora
-  actionview_datehelper_time_in_words_hour_about_plural: "aproximadamente {{count}} horas"
-  actionview_datehelper_time_in_words_hour_about_single: aproximadamente uma hora
-  actionview_datehelper_time_in_words_minute: 1 minuto
-  actionview_datehelper_time_in_words_minute_half: meio minuto
-  actionview_datehelper_time_in_words_minute_less_than: menos de um minuto
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minutos"
-  actionview_datehelper_time_in_words_minute_single: 1 minuto
-  actionview_datehelper_time_in_words_second_less_than: menos de um segundo
-  actionview_datehelper_time_in_words_second_less_than_plural: "menos de {{count}} segundos"
   actionview_instancetag_blank_option: Selecione
   
   general_text_No: 'Não'
Index: sandbox/rails-2.2/config/locales/pt.yml
===================================================================
--- sandbox/rails-2.2/config/locales/pt.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/pt.yml	(revision 2409)
@@ -115,18 +115,6 @@
         circular_dependency: "Esta relação iria criar uma dependência circular"
 
   ## Translated by: Pedro Araújo <phcrva19@hotmail.com>
-  actionview_datehelper_time_in_words_day: 1 dia
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dias"
-  actionview_datehelper_time_in_words_hour_about: cerca de uma hora
-  actionview_datehelper_time_in_words_hour_about_plural: "cerca de {{count}} horas"
-  actionview_datehelper_time_in_words_hour_about_single: cerca de uma hora
-  actionview_datehelper_time_in_words_minute: 1 minuto
-  actionview_datehelper_time_in_words_minute_half: meio minuto
-  actionview_datehelper_time_in_words_minute_less_than: menos de um minuto
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minutos"
-  actionview_datehelper_time_in_words_minute_single: 1 minuto
-  actionview_datehelper_time_in_words_second_less_than: menos de um segundo
-  actionview_datehelper_time_in_words_second_less_than_plural: "menos de {{count}} segundos"
   actionview_instancetag_blank_option: Seleccione
   
   general_text_No: 'Não'
Index: sandbox/rails-2.2/config/locales/ro.yml
===================================================================
--- sandbox/rails-2.2/config/locales/ro.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/ro.yml	(revision 2409)
@@ -138,18 +138,6 @@
         two_words_connector: " şi "
         last_word_connector: " şi "
 
-  actionview_datehelper_time_in_words_day: 1 zi
-  actionview_datehelper_time_in_words_day_plural: "{{count}} zile"
-  actionview_datehelper_time_in_words_hour_about: aproximativ o ora
-  actionview_datehelper_time_in_words_hour_about_plural: "aproximativ {{count}} ore"
-  actionview_datehelper_time_in_words_hour_about_single: aproximativ o ora
-  actionview_datehelper_time_in_words_minute: 1 minut
-  actionview_datehelper_time_in_words_minute_half: 30 de secunde
-  actionview_datehelper_time_in_words_minute_less_than: mai putin de un minut
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minute"
-  actionview_datehelper_time_in_words_minute_single: 1 minut
-  actionview_datehelper_time_in_words_second_less_than: mai putin de o secunda
-  actionview_datehelper_time_in_words_second_less_than_plural: "mai putin de {{count}} secunde"
   actionview_instancetag_blank_option: Va rog selectati
   
   general_text_No: 'Nu'
Index: sandbox/rails-2.2/config/locales/ru.yml
===================================================================
--- sandbox/rails-2.2/config/locales/ru.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/ru.yml	(revision 2409)
@@ -202,26 +202,6 @@
       two_words_connector: " и "
       last_word_connector: " и "
   
-  actionview_datehelper_time_in_words_day: "{{count}} день"
-  actionview_datehelper_time_in_words_day_plural2: "{{count}} дня"
-  actionview_datehelper_time_in_words_day_plural5: "{{count}} дней"
-  actionview_datehelper_time_in_words_day_plural: "{{count}} дней"
-  actionview_datehelper_time_in_words_hour_about_plural2: "около {{count}} часов"
-  actionview_datehelper_time_in_words_hour_about_plural5: "около {{count}} часов"
-  actionview_datehelper_time_in_words_hour_about_plural: "около {{count}} часов"
-  actionview_datehelper_time_in_words_hour_about_single: около часа
-  actionview_datehelper_time_in_words_hour_about: "около {{count}} часа"
-  actionview_datehelper_time_in_words_minute: 1 минута
-  actionview_datehelper_time_in_words_minute_half: полминуты
-  actionview_datehelper_time_in_words_minute_less_than: менее минуты
-  actionview_datehelper_time_in_words_minute_plural2: "{{count}} минуты"
-  actionview_datehelper_time_in_words_minute_plural5: "{{count}} минут"
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} минут"
-  actionview_datehelper_time_in_words_minute_single: 1 минуту
-  actionview_datehelper_time_in_words_second_less_than_plural2: "менее {{count}} секунд"
-  actionview_datehelper_time_in_words_second_less_than_plural5: "менее {{count}} секунд"
-  actionview_datehelper_time_in_words_second_less_than_plural: "менее {{count}} секунд"
-  actionview_datehelper_time_in_words_second_less_than: менее секунды
   actionview_instancetag_blank_option: Выберите
   
   button_activate: Активировать
Index: sandbox/rails-2.2/config/locales/sk.yml
===================================================================
--- sandbox/rails-2.2/config/locales/sk.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/sk.yml	(revision 2409)
@@ -94,18 +94,6 @@
 
   # SK translation by Stanislav Pach | stano.pach@seznam.cz
   
-  actionview_datehelper_time_in_words_day: 1 deň
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dní/dňami"
-  actionview_datehelper_time_in_words_hour_about: asi hodinou
-  actionview_datehelper_time_in_words_hour_about_plural: "asi {{count}} hodinami"
-  actionview_datehelper_time_in_words_hour_about_single: asi hodinou
-  actionview_datehelper_time_in_words_minute: 1 minútou
-  actionview_datehelper_time_in_words_minute_half: pol minútou
-  actionview_datehelper_time_in_words_minute_less_than: menej ako minútou
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minútami"
-  actionview_datehelper_time_in_words_minute_single: 1 minútou
-  actionview_datehelper_time_in_words_second_less_than: menej ako sekundou
-  actionview_datehelper_time_in_words_second_less_than_plural: "menej ako {{count}} sekundami"
   actionview_instancetag_blank_option: Prosím vyberte
   
   general_text_No: 'Nie'
Index: sandbox/rails-2.2/config/locales/sl.yml
===================================================================
--- sandbox/rails-2.2/config/locales/sl.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/sl.yml	(revision 2409)
@@ -92,19 +92,6 @@
         not_same_project: "ne pripada istemu projektu"
         circular_dependency: "Ta odnos bi povzročil krožno odvisnost"
 
-  
-  actionview_datehelper_time_in_words_day: 1 dan
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dni"
-  actionview_datehelper_time_in_words_hour_about: kakšno uro
-  actionview_datehelper_time_in_words_hour_about_plural: "kakšnih {{count}} ur"
-  actionview_datehelper_time_in_words_hour_about_single: kakšno uro
-  actionview_datehelper_time_in_words_minute: 1 minuta
-  actionview_datehelper_time_in_words_minute_half: pol minute
-  actionview_datehelper_time_in_words_minute_less_than: manj kot minuta
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minut"
-  actionview_datehelper_time_in_words_minute_single: 1 minuta
-  actionview_datehelper_time_in_words_second_less_than: manj kot sekunda
-  actionview_datehelper_time_in_words_second_less_than_plural: "manj kot {{count}} sekund"
   actionview_instancetag_blank_option: Prosimo izberite
   
   general_text_No: 'Ne'
Index: sandbox/rails-2.2/config/locales/sr.yml
===================================================================
--- sandbox/rails-2.2/config/locales/sr.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/sr.yml	(revision 2409)
@@ -118,19 +118,6 @@
         not_same_project: "ne pripada istom projektu"
         circular_dependency: "Ova relacija bi napravila kružnu zavisnost"
 
-  
-  actionview_datehelper_time_in_words_day: 1 dan
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dana"
-  actionview_datehelper_time_in_words_hour_about: oko sat vremena
-  actionview_datehelper_time_in_words_hour_about_plural: "oko {{count}} sati"
-  actionview_datehelper_time_in_words_hour_about_single: oko sat vremena
-  actionview_datehelper_time_in_words_minute: 1 minut
-  actionview_datehelper_time_in_words_minute_half: pola minuta
-  actionview_datehelper_time_in_words_minute_less_than: manje od minut
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minuta"
-  actionview_datehelper_time_in_words_minute_single: 1 minut
-  actionview_datehelper_time_in_words_second_less_than: manje od sekunde
-  actionview_datehelper_time_in_words_second_less_than_plural: "manje od {{count}} sekundi"
   actionview_instancetag_blank_option: Molim izaberite
   
   general_text_No: 'Ne'
Index: sandbox/rails-2.2/config/locales/sv.yml
===================================================================
--- sandbox/rails-2.2/config/locales/sv.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/sv.yml	(revision 2409)
@@ -150,19 +150,6 @@
       sentence_connector: "och"
       skip_last_comma: true
 
-  
-  actionview_datehelper_time_in_words_day: 1 dag
-  actionview_datehelper_time_in_words_day_plural: "{{count}} dagar"
-  actionview_datehelper_time_in_words_hour_about: cirka en timme
-  actionview_datehelper_time_in_words_hour_about_plural: "cirka {{count}} timmar"
-  actionview_datehelper_time_in_words_hour_about_single: cirka en timme
-  actionview_datehelper_time_in_words_minute: 1 minut
-  actionview_datehelper_time_in_words_minute_half: en halv minut
-  actionview_datehelper_time_in_words_minute_less_than: mindre än en minut
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} minuter"
-  actionview_datehelper_time_in_words_minute_single: 1 minut
-  actionview_datehelper_time_in_words_second_less_than: mindre än en sekund
-  actionview_datehelper_time_in_words_second_less_than_plural: "mindre än {{count}} sekunder"
   actionview_instancetag_blank_option: Var god välj
   
   general_text_No: 'Nej'
Index: sandbox/rails-2.2/config/locales/th.yml
===================================================================
--- sandbox/rails-2.2/config/locales/th.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/th.yml	(revision 2409)
@@ -92,19 +92,6 @@
         not_same_project: "ไม่ได้อยู่ในโครงการเดียวกัน"
         circular_dependency: "ความสัมพันธ์อ้างอิงเป็นวงกลม"
 
-  
-  actionview_datehelper_time_in_words_day: 1 วัน
-  actionview_datehelper_time_in_words_day_plural: "{{count}} วัน"
-  actionview_datehelper_time_in_words_hour_about: ประมาณ 1 ชั่วโมง
-  actionview_datehelper_time_in_words_hour_about_plural: "ประมาณ {{count}} ชั่วโมง"
-  actionview_datehelper_time_in_words_hour_about_single: ประมาณ 1 ชั่วโมง
-  actionview_datehelper_time_in_words_minute: 1 นาที
-  actionview_datehelper_time_in_words_minute_half: ครึ่งนาที
-  actionview_datehelper_time_in_words_minute_less_than: ไม่ถึงนาที
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} นาที"
-  actionview_datehelper_time_in_words_minute_single: 1 นาที
-  actionview_datehelper_time_in_words_second_less_than: ไม่ถึงวินาที
-  actionview_datehelper_time_in_words_second_less_than_plural: "ไม่ถึง {{count}} วินาที"
   actionview_instancetag_blank_option: กรุณาเลือก
   
   general_text_No: 'ไม่'
Index: sandbox/rails-2.2/config/locales/tr.yml
===================================================================
--- sandbox/rails-2.2/config/locales/tr.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/tr.yml	(revision 2409)
@@ -131,18 +131,6 @@
         circular_dependency: "Bu ilişki döngüsel bağımlılık meydana getirecektir"
       models:
   
-  actionview_datehelper_time_in_words_day: 1 gün
-  actionview_datehelper_time_in_words_day_plural: "{{count}} gün"
-  actionview_datehelper_time_in_words_hour_about: yaklaşık 1 saat
-  actionview_datehelper_time_in_words_hour_about_plural: "yaklaşık {{count}} saat"
-  actionview_datehelper_time_in_words_hour_about_single: yaklaşık bir saat
-  actionview_datehelper_time_in_words_minute: 1 dakika
-  actionview_datehelper_time_in_words_minute_half: bir buçuk dakika
-  actionview_datehelper_time_in_words_minute_less_than: bir dakikadan az
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} dakika"
-  actionview_datehelper_time_in_words_minute_single: 1 dakika
-  actionview_datehelper_time_in_words_second_less_than: 1 saniyeden az
-  actionview_datehelper_time_in_words_second_less_than_plural: "{{count}} saniyeden az"
   actionview_instancetag_blank_option: Lütfen Seçin
   
   general_text_No: 'Hayır'
Index: sandbox/rails-2.2/config/locales/uk.yml
===================================================================
--- sandbox/rails-2.2/config/locales/uk.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/uk.yml	(revision 2409)
@@ -92,19 +92,6 @@
         not_same_project: "не відносяться до одного проекту"
         circular_dependency: "Такий зв'язок приведе до циклічної залежності"
 
-  
-  actionview_datehelper_time_in_words_day: 1 день
-  actionview_datehelper_time_in_words_day_plural: "{{count}} днів(я)"
-  actionview_datehelper_time_in_words_hour_about: близько години
-  actionview_datehelper_time_in_words_hour_about_plural: "близько {{count}} годин(и)"
-  actionview_datehelper_time_in_words_hour_about_single: близько години
-  actionview_datehelper_time_in_words_minute: 1 хвилина
-  actionview_datehelper_time_in_words_minute_half: півхвилини
-  actionview_datehelper_time_in_words_minute_less_than: менше хвилини
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} хвилин(и)"
-  actionview_datehelper_time_in_words_minute_single: 1 хвилина
-  actionview_datehelper_time_in_words_second_less_than: менше секунди
-  actionview_datehelper_time_in_words_second_less_than_plural: "менше {{count}} секунд(и)"
   actionview_instancetag_blank_option: Оберіть
   
   general_text_No: 'Ні'
Index: sandbox/rails-2.2/config/locales/vi.yml
===================================================================
--- sandbox/rails-2.2/config/locales/vi.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/vi.yml	(revision 2409)
@@ -161,18 +161,6 @@
       two_words_connector: " và "
       last_word_connector: ", và "
   
-  actionview_datehelper_time_in_words_day: 1 ngày
-  actionview_datehelper_time_in_words_day_plural: "{{count}} ngày"
-  actionview_datehelper_time_in_words_hour_about: khoảng 1 giờ
-  actionview_datehelper_time_in_words_hour_about_plural: "khoảng {{count}} giờ"
-  actionview_datehelper_time_in_words_hour_about_single: khoảng 1 giờ
-  actionview_datehelper_time_in_words_minute: 1 phút
-  actionview_datehelper_time_in_words_minute_half: nửa phút
-  actionview_datehelper_time_in_words_minute_less_than: dưới một phút
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} phút"
-  actionview_datehelper_time_in_words_minute_single: 1 phút
-  actionview_datehelper_time_in_words_second_less_than: cách vài giây
-  actionview_datehelper_time_in_words_second_less_than_plural: "cách {{count}} giấy"
   actionview_instancetag_blank_option: Vui lòng chọn
   
   general_text_No: 'Không'
Index: sandbox/rails-2.2/config/locales/zh-TW.yml
===================================================================
--- sandbox/rails-2.2/config/locales/zh-TW.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/zh-TW.yml	(revision 2409)
@@ -123,18 +123,6 @@
         not_same_project: "不屬於同一個專案"
         circular_dependency: "這個關聯會導致環狀相依"
 
-  actionview_datehelper_time_in_words_day: 1 天
-  actionview_datehelper_time_in_words_day_plural: "{{count}} 天"
-  actionview_datehelper_time_in_words_hour_about: 約 1 小時
-  actionview_datehelper_time_in_words_hour_about_plural: "約 {{count}} 小時"
-  actionview_datehelper_time_in_words_hour_about_single: 約 1 小時
-  actionview_datehelper_time_in_words_minute: 1 分鐘
-  actionview_datehelper_time_in_words_minute_half: 半分鐘
-  actionview_datehelper_time_in_words_minute_less_than: 小於 1 分鐘
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} 分鐘"
-  actionview_datehelper_time_in_words_minute_single: 1 分鐘
-  actionview_datehelper_time_in_words_second_less_than: 小於 1 秒
-  actionview_datehelper_time_in_words_second_less_than_plural: "小於 {{count}} 秒"
   actionview_instancetag_blank_option: 請選擇
   
   general_text_No: '否'
Index: sandbox/rails-2.2/config/locales/zh.yml
===================================================================
--- sandbox/rails-2.2/config/locales/zh.yml	(revision 2408)
+++ sandbox/rails-2.2/config/locales/zh.yml	(revision 2409)
@@ -123,19 +123,6 @@
         not_same_project: "不属于同一个项目"
         circular_dependency: "此关联将导致循环依赖"
 
-  
-  actionview_datehelper_time_in_words_day: 1 天
-  actionview_datehelper_time_in_words_day_plural: "{{count}} 天"
-  actionview_datehelper_time_in_words_hour_about: 约 1 小时
-  actionview_datehelper_time_in_words_hour_about_plural: "约 {{count}} 小时"
-  actionview_datehelper_time_in_words_hour_about_single: 约 1 小时
-  actionview_datehelper_time_in_words_minute: 1 分钟
-  actionview_datehelper_time_in_words_minute_half: 半分钟
-  actionview_datehelper_time_in_words_minute_less_than: 1 分钟以内
-  actionview_datehelper_time_in_words_minute_plural: "{{count}} 分钟"
-  actionview_datehelper_time_in_words_minute_single: 1 分钟
-  actionview_datehelper_time_in_words_second_less_than: 1 秒以内
-  actionview_datehelper_time_in_words_second_less_than_plural: "{{count}} 秒以内"
   actionview_instancetag_blank_option: 请选择
   
   general_text_No: '否'
