From c8c269e66a75d987f23fac3dec8a6e4732f475a3 Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Fri, 22 Feb 2013 00:51:58 +0100
Subject: [PATCH] update en translation after small additions

---
 config/locales/en/en.defaults.yml    | 11 +++++++++++
 config/locales/en/en.simple_form.yml |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/config/locales/en/en.defaults.yml b/config/locales/en/en.defaults.yml
index 5a1dd331..3d421ad1 100644
--- a/config/locales/en/en.defaults.yml
+++ b/config/locales/en/en.defaults.yml
@@ -120,6 +120,8 @@ en:
       year: years
   errors: &errors
     general: 'A problem has occured.'
+    general_msg: 'A problem has occured: %{msg}'
+    general_again: 'A problem has occured. Please try again.'
     format: ! '%{attribute} %{message}'
     messages:
       accepted: has to be accepted
@@ -265,6 +267,15 @@ en:
       invite:
         create: send invitation
 
+  # general user-interface
+  ui:
+    close: 'Close'
+    edit: 'Edit'
+    delete: 'Delete'
+    show: 'Show'
+    marks:
+      close: 'x'
+
   # Simple form i18n is used to build the forms
   simple_form:
     "yes": 'yes'
diff --git a/config/locales/en/en.simple_form.yml b/config/locales/en/en.simple_form.yml
index e442d5ea..fa6175b3 100644
--- a/config/locales/en/en.simple_form.yml
+++ b/config/locales/en/en.simple_form.yml
@@ -93,7 +93,14 @@ en:
         delivered_on: 'Delivery date'
       user:
         nick: 'Username'
+        name: "Name"
         last_name: 'Last name'
+        email: 'Email'
+        phone: "Telephone"
+        ordergroup: 'Ordergroup'
+        workgroup:
+          one: 'Workgroup'
+          other: 'Workgroups'
       order_comment:
         text: Comment to this order ...
       order: