Merge branch 'registry-765' into registry-623

# Conflicts:
#	app/models/registrar.rb
#	config/locales/en.yml
#	spec/models/registrar_spec.rb
#	test/models/registrar_test.rb

config/locales/admin/registrars.en.yml

@@ -2,9 +2,16 @@ en:
   admin:
     registrars:
       index:
+        header: Registrars
         new_btn: New registrar
 
+      new:
+        header: New registrar
+
       show:
+        edit_btn: Edit
+        delete_btn: Delete
+        delete_btn_confirm: Are you sure you want delete registrar?
         new_api_use_btn: New API user
         active: Active
         api_users: API users
@@ -12,13 +19,20 @@ en:
         preferences:
           header: Preferences
 
+      edit:
+        header: Edit registrar
+
+      billing:
+        header: Billing
+
       create:
         created: Registrar has been successfully created
-        not_created: Unable to create registrar
 
       update:
         updated: Registrar has been successfully updated
-        not_updated: Unable to update registrar
+
+      destroy:
+        deleted: Registrar has been successfully deleted
 
       form:
         misc: Miscellaneous

config/locales/en.yml

@@ -199,7 +199,6 @@ en:
         alg: 'Algorithm'
         public_key: 'Public key'
       registrar:
-        billing_email: 'Billing e-mail'
         phone: 'Contact phone'
         email: 'Contact e-mail'
         state: 'State / Province'
@@ -315,13 +314,7 @@ en:
   edit_statuses: 'Edit statuses'
   history: 'History'
 
-  new_registrar: 'New registrar'
-  registrar_details: 'Registrar details'
-  vat_no: 'VAT no'
-  edit_registrar: 'Edit registrar'
   back_to_registrar: 'Back to registrar'
-  registrar_deleted: 'Registrar deleted'
-  failed_to_delete_registrar: 'Failed to delete registrar'
 
   users: 'Users'
   user_details: 'User details'
@@ -652,7 +645,6 @@ en:
   due_date_until: 'Due date until'
   minimum_total: 'Minimum total'
   maximum_total: 'Maximum total'
-  forbidden_code: 'is forbidden to use'
   unimplemented_object_service: 'Unimplemented object service'
   contact_email_update_subject: 'Teie domeenide kontakt epostiaadress on muutunud / Contact e-mail addresses of your domains have changed'
   object_status_prohibits_operation: 'Object status prohibits operation'
@@ -782,4 +774,5 @@ en:
         unit: €
 
   attributes:
+    vat_no: VAT number
     vat_rate: VAT rate

config/locales/registrars.en.yml

@@ -0,0 +1,8 @@
+en:
+  activerecord:
+    errors:
+      models:
+        registrar:
+          attributes:
+            code:
+              forbidden: is forbidden