diff --git modules/system/system.module modules/system/system.module
index 980a960..7f444e0 100644
--- modules/system/system.module
+++ modules/system/system.module
@@ -2272,6 +2272,7 @@ function system_update_files_database(&$files, $type) {
   // Add all files that need to be deleted to a DatabaseCondition.
   $delete = db_or();
   foreach ($result as $file) {
+    // @todo Files should be keyed by filename; name is insufficient.
     if (isset($files[$file->name]) && is_object($files[$file->name])) {
       // Keep the old filename from the database in case the file has moved.
       $old_filename = $file->filename;
@@ -2292,6 +2293,13 @@ function system_update_files_database(&$files, $type) {
         }
       }
 
+      // Make sure that there is no filename record in case the file was moved
+      // (unique index on filename).
+      if (isset($updated_fields['filename']) && $updated_fields['filename'] != $old_filename) {
+        db_delete('system')
+          ->condition('filename', $updated_fields['filename'])
+          ->execute();
+      }
       // Update the record.
       if (count($updated_fields)) {
         db_update('system')
diff --git sites/all/modules/translation/translation.info sites/all/modules/translation/translation.info
new file mode 100644
index 0000000..3c2e521
--- /dev/null
+++ sites/all/modules/translation/translation.info
@@ -0,0 +1,8 @@
+; $Id: translation.info,v 1.5 2009/06/08 09:23:54 dries Exp $
+name = Content translation
+description = Allows content to be translated into different languages.
+dependencies[] = locale
+package = Core
+version = VERSION
+core = 7.x
+files[] = translation.test
diff --git sites/all/modules/translation/translation.module sites/all/modules/translation/translation.module
new file mode 100644
index 0000000..d510bd0
--- /dev/null
+++ sites/all/modules/translation/translation.module
@@ -0,0 +1,3 @@
+<?php
+// $Id: translation.module,v 1.91 2010/11/27 20:25:44 dries Exp $
+
diff --git sites/all/modules/translation/translation.test sites/all/modules/translation/translation.test
new file mode 100644
index 0000000..d688efa
--- /dev/null
+++ sites/all/modules/translation/translation.test
@@ -0,0 +1,3 @@
+<?php
+// $Id: translation.test,v 1.34 2010/11/23 05:53:49 webchick Exp $
+