Merge branch 'master' into 2334-remove-que

config/locales/en.yml

@@ -8,8 +8,11 @@ en:
       date_long: "%d. %B %Y"
       filename: "%Y-%m-%d_%H.%M"
   date:
+    month_names:
+      [~, January, February, March, April, May, June, July, August, September, October, November, December]
     formats:
       default: "%Y-%m-%d"
+      month_year: "%B, %Y"
 
   activerecord:
     errors:
@@ -96,13 +99,16 @@ en:
             contact:
               blank: 'Contact was not found'
               taken: 'Contact already exists on this domain'
-            contact_code_cache:
-              taken: 'Contact already exists on this domain'
 
         domain_status:
           attributes:
             value:
               taken: 'Status already exists on this domain'
+        
+        invoice:
+          attributes:
+            base:
+              invoice_status_prohibits_operation: 'Invoice status prohibits operation'
 
         user:
           attributes:
@@ -189,6 +195,7 @@ en:
   log_out: 'Log out (%{user})'
   system: 'System'
   domains: 'Domains'
+  auctions: 'Auctions'
   registrars: 'Registrars'
   valid_to: 'Valid to'
   name: 'Name'
@@ -371,7 +378,7 @@ en:
   sim_error: 'SIM application error'
   internal_error: 'Internal error'
   client_side_status_editing_error: 'Parameter value policy error. Client-side object status management not supported'
-  parameter_value_syntax_error: 'Parameter value syntax error: '
+  parameter_value_syntax_error: 'Parameter value syntax error:'
 
   # DEPP
   activemodel:
@@ -480,6 +487,8 @@ en:
   invoice:
     title: 'Invoice'
     already_paid: " (already paid)"
+    monthly_invoice: " (monthly invoice)"
+    monthly_invoice_description: 'Monthly invoice'
   bank_statements: 'Bank statements'
   back_to_bank_statements: 'Back to bank statements'
   back_to_bank_statement: 'Back to bank statement'
@@ -627,7 +636,7 @@ en:
   contact_ident: 'Contact ident'
   results_per_page: 'Results per page'
   nameserver_hostname: 'Nameserver hostname'
-  result_count: 
+  result_count:
     zero: 'No results'
     other: '%{count} results'
     one: '1 result'

config/locales/et.yml

@@ -3,9 +3,14 @@ et:
   password: 'Parool'
 
   date:
-    # Don't forget the nil at the beginning; there's no such thing as a 0th month
-    month_names: [~, Jaanuar, Veebruar, Märts, Aprill, Mai, Juuni, Juuli, August, September, Oktoober, November, Detsember]
+    month_names:
+      [~, Jaanuar, Veebruar, Märts, April, Mai, Juuni, Juuli, August, September, Oktoober, November, Detsember]
+    formats:
+      default: "%Y-%m-%d"
+      month_year: "%B, %Y"
   emails: "Meillaadressid"
   invoice:
     title: 'Arve'
     already_paid: " (juba makstud)"
+    monthly_invoice: " (kuuaruanne)"
+    monthly_invoice_description: 'Kuuaruanne'

config/locales/registrar/domains.en.yml

@@ -1,6 +1,8 @@
 en:
   registrar:
     domains:
+      email_error_message: 'Check contacts emails'
+
       index:
         header: Domains
         new_btn: New domain