Merge changes made in en.yml:

* imported activerecord stuff, still untranslated
 * view_history -> view_details
 * upload -> upload_trace

Found with my lang-diff.pl tool

config/locales/is.yml

@@ -1,4 +1,75 @@
 is:
+  activerecord:
+    # Translates all the model names, which is used in error handling on the web site
+    models:
+      acl: "Access Control List"
+      changeset: "Changeset"
+      changeset_tag: "Changeset Tag"
+      country: "Country"
+      diary_comment: "Diary Comment"
+      diary_entry: "Diary Entry"
+      friend: "Friend"
+      language: "Language"
+      message: "Message"
+      node: "Node"
+      node_tag: "Node Tag"
+      notifier: "Notifier"
+      old_node: "Old Node"
+      old_node_tag: "Old Node Tag"
+      old_relation: "Old Relation"
+      old_relation_member: "Old Relation Member"
+      old_relation_tag: "Old Relation Tag"
+      old_way: "Old Way"
+      old_way_node: "Old Way Node"
+      old_way_tag: "Old Way Tag"
+      relation: "Relation"
+      relation_member: "Relation Member"
+      relation_tag: "Relation Tag"
+      session: "Session"
+      trace: "Trace"
+      tracepoint: "Trace Point"
+      tracetag: "Trace Tag"
+      user: "User"
+      user_preference: "User Preference"
+      user_token: "User Token"
+      way: "Way"
+      way_node: "Way Node"
+      way_tag: "Way Tag"
+    # Translates all the model attributes, which is used in error handling on the web site
+    # Only the ones that are used on the web site are translated at the moment
+    attributes:
+      diary_comment:
+        body: "Body"
+      diary_entry:
+        user: "User"
+        title: "Title"
+        latitude: "Latitude"
+        longitude: "Longitude"
+        language: "Language"
+      friend:
+        user: "User"
+        friend: "Friend"
+      trace:
+        user: "User"
+        visible: "Visible"
+        name: "Name"
+        size: "Size"
+        latitude: "Latitude"
+        longitude: "Longitude"
+        public: "Public"
+        description: "Description"
+      message:
+        sender: "Sender"
+        title: "Title"
+        body: "Body"
+        recipient: "Recipient"
+      user:
+        email: "Email"
+        active: "Active"
+        display_name: "Display Name"
+        description: "Description"
+        languages: "Languages"
+        pass_crypt: "Password"
   map:
     view: "Kort"
     edit: "Breyta"
@@ -97,7 +168,7 @@ is:
       way_history_title: "Breytingarskrá vegs: {{way_name}}"
       download: "{{download_xml_link}} eða {{view_history_link}}"
       download_xml: "Hala niður á XML sniði"
-      view_history: "sýna breytingarsögu"
+      view_details: "sýna breytingarsögu"
     way:
       way: "Veginum"
       way_title: "Vegur: {{way_name}}"
@@ -349,7 +420,7 @@ is:
       map_key: "Map key"
   trace:
     create:
-      upload: "Upphala GPS feril"
+      upload_trace: "Upphala GPS feril"
     edit:
       filename: "Filename:"
       uploaded_at: "Uploaded at:"