Merge commit 'sven/i18n'

Conflicts:
	activesupport/lib/active_support.rb

1 files changed, 0 insertions, 12 deletions

diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
index 9e347d94e9..0988ea8f44 100755
--- a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
@@ -49,13 +49,6 @@ module I18n
       @@exception_handler = exception_handler
     end
     
-    # Allow client libraries to pass a block that populates the translation
-    # storage. Decoupled for backends like a db backend that persist their
-    # translations, so the backend can decide whether/when to yield or not.
-    def populate(&block)
-      backend.populate(&block)
-    end
-    
     # Allows client libraries to pass arguments that specify a source for 
     # translation data to be loaded by the backend. The backend defines
     # acceptable sources. 
@@ -66,11 +59,6 @@ module I18n
       backend.load_translations(*args)
     end
     
-    # Stores translations for the given locale in the backend. 
-    def store_translations(locale, data)
-      backend.store_translations locale, data
-    end
-    
     # Translates, pluralizes and interpolates a given key using a given locale, 
     # scope, and default, as well as interpolation values.
     #