diff --git a/app/Locale/cake.pot b/app/Locale/cake.pot
index d0da93f..7ea7a09 100644
--- a/app/Locale/cake.pot
+++ b/app/Locale/cake.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2014-03-30 10:34+0200\n"
+"POT-Creation-Date: 2014-04-13 19:15+0200\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
diff --git a/app/Locale/cake_dev.pot b/app/Locale/cake_dev.pot
index 56f336d..2343168 100644
--- a/app/Locale/cake_dev.pot
+++ b/app/Locale/cake_dev.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2014-03-30 10:34+0200\n"
+"POT-Creation-Date: 2014-04-13 19:15+0200\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
diff --git a/app/Locale/default.pot b/app/Locale/default.pot
index 2fe6dbc..ea24c84 100644
--- a/app/Locale/default.pot
+++ b/app/Locale/default.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2014-03-30 10:34+0200\n"
+"POT-Creation-Date: 2014-04-13 19:15+0200\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -14,35 +14,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: Controller/UserController.php:95;104;179;226;298;332;417
-msgid "dreamjob.error.page.notFound"
-msgstr ""
-
-#: Controller/UserController.php:197
-msgid "dreamjob.error.page.order.saved"
-msgstr ""
-
-#: Controller/UserController.php:200
-msgid "dreamjob.error.page.order.error"
-msgstr ""
-
-#: Controller/UserController.php:270
+#: Controller/RegistrationController.php:61;118
+#: Controller/UserController.php:290
 msgid "dreamjob.error.password.notEqual"
 msgstr ""
 
-#: Controller/UserController.php:327;389
+#: Controller/UserController.php:96;105;199;246;318;352;437
+msgid "dreamjob.error.page.notFound"
+msgstr ""
+
+#: Controller/UserController.php:217
+msgid "dreamjob.error.page.order.saved"
+msgstr ""
+
+#: Controller/UserController.php:220
+msgid "dreamjob.error.page.order.error"
+msgstr ""
+
+#: Controller/UserController.php:347;409
 msgid "dreamjob.page.save.error"
 msgstr ""
 
-#: Controller/UserController.php:375
+#: Controller/UserController.php:395
 msgid "dreamjob.page.oneType"
 msgstr ""
 
-#: Controller/UserController.php:395
+#: Controller/UserController.php:415
 msgid "dreamjob.page.save"
 msgstr ""
 
-#: View/Elements/barleft.ctp:50
+#: View/Elements/barleft.ctp:54
 #: View/Job/opening.ctp:20
 msgid "dreamjob.company.to"
 msgstr ""
@@ -59,16 +60,17 @@ msgstr ""
 #: View/Elements/job_opening_head_extra.ctp:9
 #: View/Elements/job_opening_item.ctp:67
 #: View/Job/opening_edit.ctp:35
+#: View/Registration/company.ctp:23
 #: View/User/company.ctp:71
 #: View/User/settings_account.ctp:67
-#: View/User/settings_isearch.ctp:30
+#: View/User/settings_isearch.ctp:29
 msgid "dreamjob.branch"
 msgstr ""
 
 #: View/Elements/job_opening_head_extra.ctp:10
 #: View/Elements/job_opening_item.ctp:69
 #: View/Job/opening_edit.ctp:33
-#: View/User/settings_isearch.ctp:32
+#: View/User/settings_isearch.ctp:31
 msgid "dreamjob.kindofjob"
 msgstr ""
 
@@ -83,16 +85,20 @@ msgid "dreamjob.company.titleinfo"
 msgstr ""
 
 #: View/Elements/job_opening_head_extra.ctp:16
+#: View/Registration/company.ctp:18
+#: View/Registration/main.ctp:11
 #: View/User/settings_account.ctp:62
 msgid "dreamjob.company"
 msgstr ""
 
 #: View/Elements/job_opening_head_extra.ctp:17
+#: View/Registration/company.ctp:24
 #: View/User/settings_account.ctp:68
 msgid "dreamjob.headcount"
 msgstr ""
 
 #: View/Elements/job_opening_head_extra.ctp:18
+#: View/Registration/company.ctp:22
 #: View/User/company.ctp:67
 #: View/User/settings_account.ctp:66
 msgid "dreamjob.owner"
@@ -107,6 +113,8 @@ msgstr ""
 #: View/Elements/job_opening_item.ctp:68
 #: View/Elements/user_worker_item.ctp:41
 #: View/Job/opening_edit.ctp:45
+#: View/Registration/company.ctp:31
+#: View/Registration/worker.ctp:31
 #: View/User/settings_account.ctp:76
 msgid "dreamjob.city"
 msgstr ""
@@ -136,7 +144,7 @@ msgid "dreamjob.applicated"
 msgstr ""
 
 #: View/Elements/job_opening_item.ctp:98
-#: View/Job/opening.ctp:49
+#: View/Job/opening.ctp:50
 msgid "dreamjob.applicate"
 msgstr ""
 
@@ -164,12 +172,16 @@ msgstr ""
 
 #: View/Elements/navbar.ctp:24
 #: View/Elements/user_worker_header.ctp:36
+#: View/Registration/company.ctp:14
+#: View/Registration/worker.ctp:14
 #: View/User/company.ctp:35;58
 #: View/User/settings_account.ctp:36
 msgid "dreamjob.mail"
 msgstr ""
 
 #: View/Elements/navbar.ctp:26
+#: View/Registration/company.ctp:15
+#: View/Registration/worker.ctp:15
 #: View/User/settings_account.ctp:38
 msgid "dreamjob.password"
 msgstr ""
@@ -178,35 +190,48 @@ msgstr ""
 msgid "dreamjob.login"
 msgstr ""
 
-#: View/Elements/user_worker_cv.ctp:7
-#: View/Elements/user_worker_cv_edit.ctp:9
+#: View/Elements/user_worker_cv.ctp:9
+#: View/Elements/user_worker_cv_edit.ctp:12
 #: View/Job/application.ctp:67
 #: View/User/worker.ctp:23;25
 msgid "dreamjob.cv"
 msgstr ""
 
-#: View/Elements/user_worker_cv_edit.ctp:9
+#: View/Elements/user_worker_cv.ctp:11
 msgid "dreamjob.edit"
 msgstr ""
 
-#: View/Elements/user_worker_cv_edit.ctp:9
-#: View/Job/application.ctp:131
-#: View/Job/opening_edit.ctp:49
-msgid "dreamjob.save"
+#: View/Elements/user_worker_cv_edit.ctp:13
+msgid "dreamjob.edit.end"
+msgstr ""
+
+#: View/Elements/user_worker_cv_edit.ctp:32;60;91;119
+msgid "dreamjob.between"
+msgstr ""
+
+#: View/Elements/user_worker_cv_edit.ctp:32;38;42;60;64;68;91;97;101;119;123;127
+msgid "dreamjob.chooseOne.date"
+msgstr ""
+
+#: View/Elements/user_worker_cv_edit.ctp:32;60;91;119
+msgid "dreamjob.between.till"
 msgstr ""
 
 #: View/Elements/user_worker_header.ctp:32
+#: View/Registration/worker.ctp:24
 #: View/User/settings_account.ctp:49
 msgid "dreamjob.iam"
 msgstr ""
 
 #: View/Elements/user_worker_header.ctp:43
+#: View/Registration/worker.ctp:23
 #: View/User/settings_account.ctp:48
 msgid "dreamjob.bday"
 msgstr ""
 
 #: View/Elements/user_worker_header.ctp:52
 #: View/Elements/user_worker_item.ctp:44
+#: View/Registration/worker.ctp:26
 #: View/User/settings_account.ctp:51
 msgid "dreamjob.workexperience"
 msgstr ""
@@ -221,6 +246,7 @@ msgstr ""
 
 #: View/Elements/user_worker_item.ctp:42
 #: View/Job/opening_edit.ctp:34
+#: View/Registration/worker.ctp:25
 #: View/User/settings_account.ctp:50
 msgid "dreamjob.graducation"
 msgstr ""
@@ -233,6 +259,17 @@ msgstr ""
 msgid "dreamjob.details"
 msgstr ""
 
+#: View/Emails/html/job_application.ctp:2
+#: View/Emails/html/job_application_msg.ctp:2
+#: View/Job/application.ctp:39
+msgid "dreamjob.message.send"
+msgstr ""
+
+#: View/Emails/html/registration.ctp:2
+#: View/User/test.ctp:12
+msgid "dreamjob.regisration.active.link"
+msgstr ""
+
 #: View/Home/home.ctp:22
 msgid "dreamjob.registration.to"
 msgstr ""
@@ -264,14 +301,15 @@ msgstr ""
 msgid "dreamjob.opening"
 msgstr ""
 
-#: View/Job/application.ctp:39
-msgid "dreamjob.message.send"
-msgstr ""
-
 #: View/Job/application.ctp:128
 msgid "dreamjob.message"
 msgstr ""
 
+#: View/Job/application.ctp:131
+#: View/Job/opening_edit.ctp:49
+msgid "dreamjob.save"
+msgstr ""
+
 #: View/Job/applicationCompany_list.ctp:13
 msgid "dreamjob.application.archiv.activ"
 msgstr ""
@@ -297,9 +335,18 @@ msgid "dreamjob.application.addPages"
 msgstr ""
 
 #: View/Job/application_send.ctp:33
+#: View/Registration/company.ctp:37
+#: View/Registration/worker.ctp:38
 msgid "dreamjob.agb.accept"
 msgstr ""
 
+#: View/Job/application_send.ctp:33
+#: View/Layouts/default.ctp:116
+#: View/Registration/company.ctp:37
+#: View/Registration/worker.ctp:38
+msgid "dreamjob.agb"
+msgstr ""
+
 #: View/Job/application_send.ctp:36
 msgid "dreamjob.application.send"
 msgstr ""
@@ -325,11 +372,15 @@ msgid "dreamjob.opening.active"
 msgstr ""
 
 #: View/Job/opening_edit.ctp:43
+#: View/Registration/company.ctp:30
+#: View/Registration/worker.ctp:30
 #: View/User/settings_account.ctp:75
 msgid "dreamjob.street"
 msgstr ""
 
 #: View/Job/opening_edit.ctp:44
+#: View/Registration/company.ctp:32
+#: View/Registration/worker.ctp:32
 #: View/User/settings_account.ctp:77
 msgid "dreamjob.postcode"
 msgstr ""
@@ -350,51 +401,137 @@ msgstr ""
 msgid "dreamjob"
 msgstr ""
 
-#: View/Layouts/default.ctp:82
-msgid "dreamjob.help"
-msgstr ""
-
-#: View/Layouts/default.ctp:83
-msgid "dreamjob.faq"
-msgstr ""
-
-#: View/Layouts/default.ctp:88
-msgid "dreamjob.sponsorus"
-msgstr ""
-
-#: View/Layouts/default.ctp:89
-msgid "dreamjob.cooperators"
-msgstr ""
-
-#: View/Layouts/default.ctp:90
-msgid "dreamjob.advertisers"
+#: View/Layouts/default.ctp:26
+msgid "dreamjob.close"
 msgstr ""
 
 #: View/Layouts/default.ctp:96
-msgid "dreamjob.contact"
+msgid "dreamjob.help"
 msgstr ""
 
 #: View/Layouts/default.ctp:97
-msgid "dreamjob.uscompany"
+msgid "dreamjob.faq"
 msgstr ""
 
 #: View/Layouts/default.ctp:102
-msgid "dreamjob.agb"
+msgid "dreamjob.sponsorus"
 msgstr ""
 
 #: View/Layouts/default.ctp:103
-msgid "dreamjob.impressum"
+msgid "dreamjob.cooperators"
 msgstr ""
 
 #: View/Layouts/default.ctp:104
+msgid "dreamjob.advertisers"
+msgstr ""
+
+#: View/Layouts/default.ctp:110
+msgid "dreamjob.contact"
+msgstr ""
+
+#: View/Layouts/default.ctp:111
+msgid "dreamjob.uscompany"
+msgstr ""
+
+#: View/Layouts/default.ctp:117
+msgid "dreamjob.impressum"
+msgstr ""
+
+#: View/Layouts/default.ctp:118
 msgid "dreamjob.advbyus"
 msgstr ""
 
+#: View/Registration/active.ctp:4
+msgid "dreamjob.active"
+msgstr ""
+
+#: View/Registration/active.ctp:7
+msgid "dreamjob.active.done"
+msgstr ""
+
+#: View/Registration/active.ctp:9
+msgid "dreamjob.active.error"
+msgstr ""
+
+#: View/Registration/company.ctp:7
+msgid "dreamjob.registration.company"
+msgstr ""
+
+#: View/Registration/company.ctp:12
+#: View/Registration/worker.ctp:12
+#: View/User/settings_account.ctp:34
+msgid "dreamjob.account"
+msgstr ""
+
+#: View/Registration/company.ctp:16
+#: View/Registration/worker.ctp:16
+#: View/User/settings_account.ctp:39
+msgid "dreamjob.password2"
+msgstr ""
+
+#: View/Registration/company.ctp:20
+#: View/User/settings_account.ctp:64
+msgid "dreamjob.company.nickname"
+msgstr ""
+
+#: View/Registration/company.ctp:21
+#: View/User/settings_account.ctp:65
+msgid "dreamjob.corporateform"
+msgstr ""
+
+#: View/Registration/company.ctp:26
 #: View/User/company.ctp:28;51
 #: View/User/settings_account.ctp:70
 msgid "dreamjob.website"
 msgstr ""
 
+#: View/Registration/company.ctp:28
+#: View/Registration/worker.ctp:28
+#: View/User/settings_account.ctp:73
+msgid "dreamjob.addresse"
+msgstr ""
+
+#: View/Registration/company.ctp:40
+#: View/Registration/worker.ctp:41
+#: View/User/settings_account.ctp:82
+#: View/User/settings_pages.ctp:94
+msgid "dreamjob.settings.save"
+msgstr ""
+
+#: View/Registration/main.ctp:7
+msgid "dreamjob.registration"
+msgstr ""
+
+#: View/Registration/main.ctp:9
+#: View/Registration/worker.ctp:18
+#: View/User/settings_account.ctp:43
+msgid "dreamjob.worker"
+msgstr ""
+
+#: View/Registration/worker.ctp:7
+msgid "dreamjob.registration.worker"
+msgstr ""
+
+#: View/Registration/worker.ctp:20
+#: View/User/settings_account.ctp:45
+msgid "dreamjob.mannerofaddress"
+msgstr ""
+
+#: View/Registration/worker.ctp:21
+#: View/User/settings_account.ctp:46
+msgid "dreamjob.first_name"
+msgstr ""
+
+#: View/Registration/worker.ctp:22
+#: View/User/settings_account.ctp:47
+msgid "dreamjob.last_name"
+msgstr ""
+
+#: View/Registration/worker.ctp:33
+#: View/User/settings_account.ctp:79
+msgid "dreamjob.country"
+msgstr ""
+
 #: View/User/settings_account.ctp:18;29
 #: View/User/settings_isearch.ctp:17
 #: View/User/settings_pages.ctp:35
@@ -413,64 +550,19 @@ msgstr ""
 msgid "dreamjob.settings.isearch"
 msgstr ""
 
-#: View/User/settings_account.ctp:34
-msgid "dreamjob.account"
-msgstr ""
-
-#: View/User/settings_account.ctp:39
-msgid "dreamjob.password2"
-msgstr ""
-
-#: View/User/settings_account.ctp:43
-msgid "dreamjob.worker"
-msgstr ""
-
-#: View/User/settings_account.ctp:45
-msgid "dreamjob.mannerofaddress"
-msgstr ""
-
-#: View/User/settings_account.ctp:46
-msgid "dreamjob.first_name"
-msgstr ""
-
-#: View/User/settings_account.ctp:47
-msgid "dreamjob.last_name"
-msgstr ""
-
 #: View/User/settings_account.ctp:54;56
 msgid "dreamjob.searchhidden"
 msgstr ""
 
-#: View/User/settings_account.ctp:64
-msgid "dreamjob.company.nickname"
-msgstr ""
-
-#: View/User/settings_account.ctp:65
-msgid "dreamjob.corporateform"
-msgstr ""
-
-#: View/User/settings_account.ctp:73
-msgid "dreamjob.addresse"
-msgstr ""
-
-#: View/User/settings_account.ctp:79
-msgid "dreamjob.country"
-msgstr ""
-
-#: View/User/settings_account.ctp:82
-#: View/User/settings_pages.ctp:94
-msgid "dreamjob.settings.save"
-msgstr ""
-
-#: View/User/settings_isearch.ctp:31
+#: View/User/settings_isearch.ctp:30
 msgid "dreamjob.job"
 msgstr ""
 
-#: View/User/settings_isearch.ctp:33
+#: View/User/settings_isearch.ctp:32
 msgid "dreamjob.options"
 msgstr ""
 
-#: View/User/settings_isearch.ctp:42;43;45;46;53;54;55
+#: View/User/settings_isearch.ctp:42;44;45;52;53;54
 msgid "dreamjob.form.chooseOne"
 msgstr ""
 
@@ -501,7 +593,6 @@ msgstr ""
 
 #: Model/AppUser.php:validation for field user_id
 #: Model/DreamjobCompany.php:validation for field djaccount_ptr_id;validation for field branch_id;validation for field pro_user
-#: Model/DreamjobCvCategory.php:validation for field id;validation for field worker_id;validation for field category_id
 #: Model/DreamjobCvEntry.php:validation for field category_id
 #: Model/DreamjobISearch.php:validation for field worker_id;validation for field branch_id;validation for field job_id;validation for field kindofjob_id
 #: Model/DreamjobJobApplication.php:validation for field id;validation for field stars;validation for field worker_id;validation for field opening_id
@@ -571,6 +662,10 @@ msgstr ""
 msgid "date"
 msgstr ""
 
+#: Model/DreamjobCvEntry.php:validation for field startdate
+msgid "compare"
+msgstr ""
+
 #: Model/DreamjobPageImage.php:validation for field image
 msgid "Something went wrong with the file upload"
 msgstr ""