From f4fd9e5a15526662832382a19e0935674798c15e Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 25 Jan 2020 06:08:56 +0100
Subject: [PATCH] Update email address

---
 app/Events/AdminRequestedTestMessage.php                    | 2 +-
 app/Events/Event.php                                        | 2 +-
 app/Events/RegisteredUser.php                               | 2 +-
 app/Events/RequestedNewPassword.php                         | 2 +-
 app/Events/RequestedReportOnJournals.php                    | 2 +-
 app/Events/RequestedVersionCheckStatus.php                  | 2 +-
 app/Events/StoredTransactionGroup.php                       | 2 +-
 app/Events/UpdatedTransactionGroup.php                      | 2 +-
 app/Events/UserChangedEmail.php                             | 2 +-
 resources/assets/js/app.js                                  | 2 +-
 resources/assets/js/bootstrap.js                            | 2 +-
 resources/assets/js/components/ExampleComponent.vue         | 2 +-
 resources/assets/js/components/SomeTestComponent.vue        | 2 +-
 resources/assets/js/components/bills/Index.vue              | 2 +-
 .../assets/js/components/passport/AuthorizedClients.vue     | 2 +-
 resources/assets/js/components/passport/Clients.vue         | 2 +-
 .../assets/js/components/passport/PersonalAccessTokens.vue  | 2 +-
 resources/assets/js/components/profile/ProfileOptions.vue   | 2 +-
 .../assets/js/components/transactions/AccountSelect.vue     | 2 +-
 resources/assets/js/components/transactions/Amount.vue      | 2 +-
 resources/assets/js/components/transactions/Budget.vue      | 2 +-
 resources/assets/js/components/transactions/Category.vue    | 2 +-
 .../assets/js/components/transactions/CreateTransaction.vue | 2 +-
 .../assets/js/components/transactions/CustomAttachments.vue | 2 +-
 resources/assets/js/components/transactions/CustomDate.vue  | 2 +-
 .../assets/js/components/transactions/CustomString.vue      | 2 +-
 .../assets/js/components/transactions/CustomTextarea.vue    | 2 +-
 .../js/components/transactions/CustomTransactionFields.vue  | 2 +-
 .../assets/js/components/transactions/EditTransaction.vue   | 2 +-
 .../js/components/transactions/ForeignAmountSelect.vue      | 2 +-
 .../assets/js/components/transactions/GroupDescription.vue  | 2 +-
 resources/assets/js/components/transactions/PiggyBank.vue   | 2 +-
 .../assets/js/components/transactions/StandardDate.vue      | 2 +-
 resources/assets/js/components/transactions/Tags.vue        | 2 +-
 .../js/components/transactions/TransactionDescription.vue   | 2 +-
 .../assets/js/components/transactions/TransactionType.vue   | 2 +-
 resources/assets/js/create_transaction.js                   | 2 +-
 resources/assets/js/edit_transaction.js                     | 2 +-
 resources/assets/js/profile.js                              | 2 +-
 resources/assets/sass/_variables.scss                       | 2 +-
 resources/assets/sass/app.scss                              | 2 +-
 resources/lang/en_US/api.php                                | 2 +-
 resources/lang/en_US/auth.php                               | 2 +-
 resources/lang/en_US/bank.php                               | 2 +-
 resources/lang/en_US/breadcrumbs.php                        | 2 +-
 resources/lang/en_US/components.php                         | 2 +-
 resources/lang/en_US/config.php                             | 2 +-
 resources/lang/en_US/csv.php                                | 2 +-
 resources/lang/en_US/demo.php                               | 2 +-
 resources/lang/en_US/firefly.php                            | 6 +++++-
 resources/lang/en_US/form.php                               | 2 +-
 resources/lang/en_US/import.php                             | 2 +-
 resources/lang/en_US/intro.php                              | 2 +-
 resources/lang/en_US/list.php                               | 2 +-
 resources/lang/en_US/pagination.php                         | 2 +-
 resources/lang/en_US/passwords.php                          | 2 +-
 resources/lang/en_US/validation.php                         | 2 +-
 resources/views/v1/emails/error-html.twig                   | 2 +-
 resources/views/v1/emails/error-text.twig                   | 2 +-
 resources/views/v1/error.twig                               | 2 +-
 60 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/app/Events/AdminRequestedTestMessage.php b/app/Events/AdminRequestedTestMessage.php
index ece312467f..78f90858c8 100644
--- a/app/Events/AdminRequestedTestMessage.php
+++ b/app/Events/AdminRequestedTestMessage.php
@@ -2,7 +2,7 @@
 
 /**
  * AdminRequestedTestMessage.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Events/Event.php b/app/Events/Event.php
index 5499c81cf2..2ab5509c44 100644
--- a/app/Events/Event.php
+++ b/app/Events/Event.php
@@ -2,7 +2,7 @@
 
 /**
  * Event.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Events/RegisteredUser.php b/app/Events/RegisteredUser.php
index b98338ec68..a49d099f88 100644
--- a/app/Events/RegisteredUser.php
+++ b/app/Events/RegisteredUser.php
@@ -2,7 +2,7 @@
 
 /**
  * RegisteredUser.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Events/RequestedNewPassword.php b/app/Events/RequestedNewPassword.php
index 8424b0d3e6..1706faa15c 100644
--- a/app/Events/RequestedNewPassword.php
+++ b/app/Events/RequestedNewPassword.php
@@ -2,7 +2,7 @@
 
 /**
  * RequestedNewPassword.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Events/RequestedReportOnJournals.php b/app/Events/RequestedReportOnJournals.php
index a9f64c9d40..b02b29d3ff 100644
--- a/app/Events/RequestedReportOnJournals.php
+++ b/app/Events/RequestedReportOnJournals.php
@@ -2,7 +2,7 @@
 
 /**
  * RequestedReportOnJournals.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Events/RequestedVersionCheckStatus.php b/app/Events/RequestedVersionCheckStatus.php
index 9fb026cd59..692f825d24 100644
--- a/app/Events/RequestedVersionCheckStatus.php
+++ b/app/Events/RequestedVersionCheckStatus.php
@@ -2,7 +2,7 @@
 
 /**
  * RequestedVersionCheckStatus.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Events/StoredTransactionGroup.php b/app/Events/StoredTransactionGroup.php
index 7b70043491..701733b184 100644
--- a/app/Events/StoredTransactionGroup.php
+++ b/app/Events/StoredTransactionGroup.php
@@ -2,7 +2,7 @@
 
 /**
  * StoredTransactionGroup.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Events/UpdatedTransactionGroup.php b/app/Events/UpdatedTransactionGroup.php
index 2cbb9b8285..1ab814ec14 100644
--- a/app/Events/UpdatedTransactionGroup.php
+++ b/app/Events/UpdatedTransactionGroup.php
@@ -2,7 +2,7 @@
 
 /**
  * UpdatedTransactionGroup.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/app/Events/UserChangedEmail.php b/app/Events/UserChangedEmail.php
index 7470b1030b..8f4f70090d 100644
--- a/app/Events/UserChangedEmail.php
+++ b/app/Events/UserChangedEmail.php
@@ -2,7 +2,7 @@
 
 /**
  * UserChangedEmail.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 0e00fad03d..8ee4fe8266 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -1,6 +1,6 @@
 /*
  * app.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js
index 0e6f5613fa..b446b668f5 100644
--- a/resources/assets/js/bootstrap.js
+++ b/resources/assets/js/bootstrap.js
@@ -1,6 +1,6 @@
 /*
  * bootstrap.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/assets/js/components/ExampleComponent.vue b/resources/assets/js/components/ExampleComponent.vue
index 381bcd86a5..52dab78f56 100644
--- a/resources/assets/js/components/ExampleComponent.vue
+++ b/resources/assets/js/components/ExampleComponent.vue
@@ -1,6 +1,6 @@
 <!--
   - ExampleComponent.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/SomeTestComponent.vue b/resources/assets/js/components/SomeTestComponent.vue
index f6ba592af3..85010621dc 100644
--- a/resources/assets/js/components/SomeTestComponent.vue
+++ b/resources/assets/js/components/SomeTestComponent.vue
@@ -1,6 +1,6 @@
 <!--
   - SomeTestComponent.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/bills/Index.vue b/resources/assets/js/components/bills/Index.vue
index 9614348b05..3c702e6183 100644
--- a/resources/assets/js/components/bills/Index.vue
+++ b/resources/assets/js/components/bills/Index.vue
@@ -1,6 +1,6 @@
 <!--
   - Index.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/passport/AuthorizedClients.vue b/resources/assets/js/components/passport/AuthorizedClients.vue
index 2fed3215ca..b8e60e4e49 100644
--- a/resources/assets/js/components/passport/AuthorizedClients.vue
+++ b/resources/assets/js/components/passport/AuthorizedClients.vue
@@ -1,6 +1,6 @@
 <!--
   - AuthorizedClients.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/passport/Clients.vue b/resources/assets/js/components/passport/Clients.vue
index 527ee18362..8603740eac 100644
--- a/resources/assets/js/components/passport/Clients.vue
+++ b/resources/assets/js/components/passport/Clients.vue
@@ -1,6 +1,6 @@
 <!--
   - Clients.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/passport/PersonalAccessTokens.vue b/resources/assets/js/components/passport/PersonalAccessTokens.vue
index 4eb585eba0..4b173696e4 100644
--- a/resources/assets/js/components/passport/PersonalAccessTokens.vue
+++ b/resources/assets/js/components/passport/PersonalAccessTokens.vue
@@ -1,6 +1,6 @@
 <!--
   - PersonalAccessTokens.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/profile/ProfileOptions.vue b/resources/assets/js/components/profile/ProfileOptions.vue
index 70980f558d..e52fc8284e 100644
--- a/resources/assets/js/components/profile/ProfileOptions.vue
+++ b/resources/assets/js/components/profile/ProfileOptions.vue
@@ -1,6 +1,6 @@
 <!--
   - ProfileOptions.vue
-  - Copyright (c) 2020 thegrumpydictator@gmail.com
+  - Copyright (c) 2020 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/AccountSelect.vue b/resources/assets/js/components/transactions/AccountSelect.vue
index b4ad937d2c..c0e85ba876 100644
--- a/resources/assets/js/components/transactions/AccountSelect.vue
+++ b/resources/assets/js/components/transactions/AccountSelect.vue
@@ -1,6 +1,6 @@
 <!--
   - AccountSelect.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/Amount.vue b/resources/assets/js/components/transactions/Amount.vue
index 6d93981c00..35f4d0c41b 100644
--- a/resources/assets/js/components/transactions/Amount.vue
+++ b/resources/assets/js/components/transactions/Amount.vue
@@ -1,6 +1,6 @@
 <!--
   - Amount.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/Budget.vue b/resources/assets/js/components/transactions/Budget.vue
index 44a06ef334..89e7f14ccc 100644
--- a/resources/assets/js/components/transactions/Budget.vue
+++ b/resources/assets/js/components/transactions/Budget.vue
@@ -1,7 +1,7 @@
 
 <!--
   - Budget.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/Category.vue b/resources/assets/js/components/transactions/Category.vue
index 7c503839c2..0867ce349d 100644
--- a/resources/assets/js/components/transactions/Category.vue
+++ b/resources/assets/js/components/transactions/Category.vue
@@ -1,6 +1,6 @@
 <!--
   - Category.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/CreateTransaction.vue b/resources/assets/js/components/transactions/CreateTransaction.vue
index 2e8bd0fc1e..99df35dbc8 100644
--- a/resources/assets/js/components/transactions/CreateTransaction.vue
+++ b/resources/assets/js/components/transactions/CreateTransaction.vue
@@ -1,6 +1,6 @@
 <!--
   - CreateTransaction.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/CustomAttachments.vue b/resources/assets/js/components/transactions/CustomAttachments.vue
index 5244bb5de3..0fa039b733 100644
--- a/resources/assets/js/components/transactions/CustomAttachments.vue
+++ b/resources/assets/js/components/transactions/CustomAttachments.vue
@@ -1,6 +1,6 @@
 <!--
   - CustomAttachments.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/CustomDate.vue b/resources/assets/js/components/transactions/CustomDate.vue
index 1296d66bb2..ef3f71f346 100644
--- a/resources/assets/js/components/transactions/CustomDate.vue
+++ b/resources/assets/js/components/transactions/CustomDate.vue
@@ -1,6 +1,6 @@
 <!--
   - CustomDate.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/CustomString.vue b/resources/assets/js/components/transactions/CustomString.vue
index 31192ae718..f04d230e45 100644
--- a/resources/assets/js/components/transactions/CustomString.vue
+++ b/resources/assets/js/components/transactions/CustomString.vue
@@ -1,6 +1,6 @@
 <!--
   - CustomString.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/CustomTextarea.vue b/resources/assets/js/components/transactions/CustomTextarea.vue
index 121a55ead4..772575a921 100644
--- a/resources/assets/js/components/transactions/CustomTextarea.vue
+++ b/resources/assets/js/components/transactions/CustomTextarea.vue
@@ -1,6 +1,6 @@
 <!--
   - CustomTextarea.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/CustomTransactionFields.vue b/resources/assets/js/components/transactions/CustomTransactionFields.vue
index c2bedbece0..53420e988e 100644
--- a/resources/assets/js/components/transactions/CustomTransactionFields.vue
+++ b/resources/assets/js/components/transactions/CustomTransactionFields.vue
@@ -1,6 +1,6 @@
 <!--
   - CustomTransactionFields.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/EditTransaction.vue b/resources/assets/js/components/transactions/EditTransaction.vue
index 968ba9eaaa..c93341b1e2 100644
--- a/resources/assets/js/components/transactions/EditTransaction.vue
+++ b/resources/assets/js/components/transactions/EditTransaction.vue
@@ -1,6 +1,6 @@
 <!--
   - EditTransaction.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/ForeignAmountSelect.vue b/resources/assets/js/components/transactions/ForeignAmountSelect.vue
index a742737768..33a461db05 100644
--- a/resources/assets/js/components/transactions/ForeignAmountSelect.vue
+++ b/resources/assets/js/components/transactions/ForeignAmountSelect.vue
@@ -1,6 +1,6 @@
 <!--
   - ForeignAmountSelect.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/GroupDescription.vue b/resources/assets/js/components/transactions/GroupDescription.vue
index 3455fddb45..8d30178632 100644
--- a/resources/assets/js/components/transactions/GroupDescription.vue
+++ b/resources/assets/js/components/transactions/GroupDescription.vue
@@ -1,6 +1,6 @@
 <!--
   - GroupDescription.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/PiggyBank.vue b/resources/assets/js/components/transactions/PiggyBank.vue
index 82ff653a74..dd60890b58 100644
--- a/resources/assets/js/components/transactions/PiggyBank.vue
+++ b/resources/assets/js/components/transactions/PiggyBank.vue
@@ -1,6 +1,6 @@
 <!--
   - PiggyBank.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/StandardDate.vue b/resources/assets/js/components/transactions/StandardDate.vue
index 348bfed098..fe446ba1b4 100644
--- a/resources/assets/js/components/transactions/StandardDate.vue
+++ b/resources/assets/js/components/transactions/StandardDate.vue
@@ -1,6 +1,6 @@
 <!--
   - StandardDate.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/Tags.vue b/resources/assets/js/components/transactions/Tags.vue
index 7471fbbe59..cd408454a7 100644
--- a/resources/assets/js/components/transactions/Tags.vue
+++ b/resources/assets/js/components/transactions/Tags.vue
@@ -1,6 +1,6 @@
 <!--
   - Tags.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/TransactionDescription.vue b/resources/assets/js/components/transactions/TransactionDescription.vue
index a33b5ae6a0..419ca84788 100644
--- a/resources/assets/js/components/transactions/TransactionDescription.vue
+++ b/resources/assets/js/components/transactions/TransactionDescription.vue
@@ -1,6 +1,6 @@
 <!--
   - TransactionDescription.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/components/transactions/TransactionType.vue b/resources/assets/js/components/transactions/TransactionType.vue
index 7eef5e18b2..f94f7d1be2 100644
--- a/resources/assets/js/components/transactions/TransactionType.vue
+++ b/resources/assets/js/components/transactions/TransactionType.vue
@@ -1,6 +1,6 @@
 <!--
   - TransactionType.vue
-  - Copyright (c) 2019 thegrumpydictator@gmail.com
+  - Copyright (c) 2019 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -
diff --git a/resources/assets/js/create_transaction.js b/resources/assets/js/create_transaction.js
index 21ed130a89..84b836e93a 100644
--- a/resources/assets/js/create_transaction.js
+++ b/resources/assets/js/create_transaction.js
@@ -1,6 +1,6 @@
 /*
  * app.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/assets/js/edit_transaction.js b/resources/assets/js/edit_transaction.js
index 908afd0459..bf96941812 100644
--- a/resources/assets/js/edit_transaction.js
+++ b/resources/assets/js/edit_transaction.js
@@ -1,6 +1,6 @@
 /*
  * app.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/assets/js/profile.js b/resources/assets/js/profile.js
index 2028c412ce..4fdc155819 100644
--- a/resources/assets/js/profile.js
+++ b/resources/assets/js/profile.js
@@ -1,6 +1,6 @@
 /*
  * app.js
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss
index a3ad4169a2..b94b9657e1 100644
--- a/resources/assets/sass/_variables.scss
+++ b/resources/assets/sass/_variables.scss
@@ -1,6 +1,6 @@
 /*!
  * _variables.scss
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
index 74101a2f70..6aeba80aa1 100644
--- a/resources/assets/sass/app.scss
+++ b/resources/assets/sass/app.scss
@@ -1,6 +1,6 @@
 /*!
  * app.scss
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/api.php b/resources/lang/en_US/api.php
index c0daaf8ad9..6d7ccef9fc 100644
--- a/resources/lang/en_US/api.php
+++ b/resources/lang/en_US/api.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * api.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/auth.php b/resources/lang/en_US/auth.php
index 35fe5e1cb5..fffa04545c 100644
--- a/resources/lang/en_US/auth.php
+++ b/resources/lang/en_US/auth.php
@@ -2,7 +2,7 @@
 
 /**
  * auth.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/bank.php b/resources/lang/en_US/bank.php
index 7a950eab4c..5dd3af2232 100644
--- a/resources/lang/en_US/bank.php
+++ b/resources/lang/en_US/bank.php
@@ -2,7 +2,7 @@
 
 /**
  * bank.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/breadcrumbs.php b/resources/lang/en_US/breadcrumbs.php
index b8a411d4b0..5a122ee49f 100644
--- a/resources/lang/en_US/breadcrumbs.php
+++ b/resources/lang/en_US/breadcrumbs.php
@@ -2,7 +2,7 @@
 
 /**
  * breadcrumbs.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/components.php b/resources/lang/en_US/components.php
index 8e5d444956..0145ed8345 100644
--- a/resources/lang/en_US/components.php
+++ b/resources/lang/en_US/components.php
@@ -2,7 +2,7 @@
 
 /**
  * components.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/config.php b/resources/lang/en_US/config.php
index 16926e4f98..7c7c143ae9 100644
--- a/resources/lang/en_US/config.php
+++ b/resources/lang/en_US/config.php
@@ -2,7 +2,7 @@
 
 /**
  * config.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/csv.php b/resources/lang/en_US/csv.php
index 982b606e63..135701aba3 100644
--- a/resources/lang/en_US/csv.php
+++ b/resources/lang/en_US/csv.php
@@ -2,7 +2,7 @@
 
 /**
  * csv.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/demo.php b/resources/lang/en_US/demo.php
index a9329f2f42..c7f4532c56 100644
--- a/resources/lang/en_US/demo.php
+++ b/resources/lang/en_US/demo.php
@@ -2,7 +2,7 @@
 
 /**
  * demo.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 45178bdcbe..7acb166d26 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -2,7 +2,7 @@
 
 /**
  * firefly.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -309,6 +309,7 @@ return [
     'make_new_rule'                              => 'Make a new rule in rule group ":title"',
     'make_new_rule_no_group'                     => 'Make a new rule',
     'instructions_rule_from_bill'                => 'In order to match transactions to your new bill ":name", Firefly III can create a rule that will automatically be checked against any transactions you store. Please verify the details below and store the rule to have Firefly III automatically match transactions to your new bill.',
+    'instructions_rule_from_journal'             => 'Create a rule based on one of your transactions. Complement or submit the form below.',
     'rule_is_strict'                             => 'strict rule',
     'rule_is_not_strict'                         => 'non-strict rule',
     'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
@@ -493,6 +494,9 @@ return [
     'new_rule_for_bill_title'         => 'Rule for bill ":name"',
     'new_rule_for_bill_description'   => 'This rule marks transactions for bill ":name".',
 
+    'new_rule_for_journal_title'         => 'Rule based on transaction ":description"',
+    'new_rule_for_journal_description'   => 'This rule is based on transaction ":description". It will match transactions that are exactly the same.',
+
     // tags
     'store_new_tag'                   => 'Store new tag',
     'update_tag'                      => 'Update tag',
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index 6af86e4968..7b994976c6 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -2,7 +2,7 @@
 
 /**
  * form.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/import.php b/resources/lang/en_US/import.php
index f7c4887566..40829eea08 100644
--- a/resources/lang/en_US/import.php
+++ b/resources/lang/en_US/import.php
@@ -2,7 +2,7 @@
 
 /**
  * import.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/intro.php b/resources/lang/en_US/intro.php
index 696c6ceb36..feea13d10c 100644
--- a/resources/lang/en_US/intro.php
+++ b/resources/lang/en_US/intro.php
@@ -2,7 +2,7 @@
 
 /**
  * intro.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php
index fbd669bf5e..ef42efe246 100644
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -2,7 +2,7 @@
 
 /**
  * list.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/pagination.php b/resources/lang/en_US/pagination.php
index 9a97e1889e..4c7a5bfb50 100644
--- a/resources/lang/en_US/pagination.php
+++ b/resources/lang/en_US/pagination.php
@@ -2,7 +2,7 @@
 
 /**
  * pagination.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/passwords.php b/resources/lang/en_US/passwords.php
index e9055bd2db..b464dd986e 100644
--- a/resources/lang/en_US/passwords.php
+++ b/resources/lang/en_US/passwords.php
@@ -2,7 +2,7 @@
 
 /**
  * passwords.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php
index e8c654c283..f339d2502e 100644
--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -2,7 +2,7 @@
 
 /**
  * validation.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
diff --git a/resources/views/v1/emails/error-html.twig b/resources/views/v1/emails/error-html.twig
index 0e0f2004f0..402f5e0784 100644
--- a/resources/views/v1/emails/error-html.twig
+++ b/resources/views/v1/emails/error-html.twig
@@ -32,7 +32,7 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     The full stacktrace is below. If you think this is a bug in Firefly III, you
     can forward this message to
-    <a href="mailto:thegrumpydictator@gmail.com?subject=BUG!">thegrumpydictator@gmail.com</a>.
+    <a href="mailto:james@firefly-iii.org?subject=BUG!">james@firefly-iii.org</a>.
     This can help fix the bug you just encountered.
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
diff --git a/resources/views/v1/emails/error-text.twig b/resources/views/v1/emails/error-text.twig
index 6cc100d81a..4942b102ee 100644
--- a/resources/views/v1/emails/error-text.twig
+++ b/resources/views/v1/emails/error-text.twig
@@ -18,7 +18,7 @@ URL is: {{ url }}
 User agent: {{ userAgent }}
 
 The full stacktrace is below. If you think this is a bug in Firefly III, you
-can forward this message to thegrumpydictator@gmail.com. This can help fix
+can forward this message to james@firefly-iii.org. This can help fix
 the bug you just encountered.
 
 If you prefer, you can also open a new issue here:
diff --git a/resources/views/v1/error.twig b/resources/views/v1/error.twig
index ec415e2296..05f883edf0 100644
--- a/resources/views/v1/error.twig
+++ b/resources/views/v1/error.twig
@@ -19,7 +19,7 @@
             <p>
                 If you do not know how to handle this error, please open an issue on
                 <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>
-                or <a href="mailto:thegrumpydictator@gmail.com">send me a message</a>.
+                or <a href="mailto:james@firefly-iii.org">send me a message</a>.
             </p>
         </div>
     </div>