Changeset 3030151

Timestamp:

02/01/2024 02:27:01 PM (2 years ago)

Author:

planetshaker

Message:

fix issues with gallery and compatibility

Location:

emergencywp/trunk

Files:

• Readme.txt (modified) (2 diffs)
• ajax/resetAliveStatus.php (modified) (1 diff)
• changelog.txt (modified) (1 diff)
• cron/jobController.php (modified) (5 diffs)
• emergencywp.php (modified) (4 diffs)
• jobs/dead.php (modified) (1 diff)
• languages/emergencyWP.pot (modified) (75 diffs)
• languages/emergencywp-de_DE.mo (added)
• languages/emergencywp-de_DE.po (added)
• lib/class.emergencyWPAdmin.php (modified) (9 diffs)
• lib/class.emergencyWPDeactivate.php (modified) (1 diff)
• lib/class.emergencyWPJobController.php (modified) (2 diffs)
• lib/class.emergencyWPMessages.php (modified) (2 diffs)
• lib/class.emergencyWPShortcodes.php (modified) (3 diffs)
• lib/class.emergencyWPSystemEmails.php (modified) (1 diff)
• lib/class.emergencyWPUninstall.php (modified) (1 diff)
• pages/emergencywp/setting_tabs/dashboard.php (modified) (3 diffs)
• pages/emergencywp/setting_tabs/email_templates.php (modified) (1 diff)
• pages/emergencywp/setting_tabs/settings_main.php (modified) (1 diff)

emergencywp/trunk/Readme.txt

@@ -6 +6 @@
 Tags: digital legacy, future messages, digital insurance, information passing, death handling
 Requires at least: 4.9
-Tested up to: 6.0.1
-Stable tag: 1.3.10
+Tested up to: 5.8.2
+Stable tag: 1.3.8
 License: GNU Version 2 or Any Later Version
 License URI: http://www.gnu.org/licenses/gpl-3.0.txt
@@ -75 +75 @@
 
 == Changelog ==
-= 1.3.10, 2021/12/08 =
-* Fix email receipients and logs
-
 = 1.3.8, 2021/12/13 =
 * Fix compatibility with EWP-Pro

emergencywp/trunk/ajax/resetAliveStatus.php

@@ -56 +56 @@
     );
 
-    $messages = emergencyWPAdmin::getWpPost($args);
+    $_messages = emergencyWPAdmin::getWpPost($args);
 
-    if (count($messages)) {
-        foreach ($messages as $message) {
+    if (count($_messages)) {
+        foreach ($_messages as $message) {
             update_post_meta(
                 $message->ID,

emergencywp/trunk/changelog.txt

@@ +1 @@
+*** 08.12.2021, v.1.3.5 ***
+- Fixes compatibility with wordpress free plugin
+
 *** 08.12.2021, v.1.3.5 ***
 - Fixes compatibility with wordpress free plugin

emergencywp/trunk/cron/jobController.php

@@ -2 +2 @@
 require_once("./wp-load.php");
 
-if( !defined('EMERGENCY_WP_PLUGIN_URL') ) define( 'EMERGENCY_WP_PLUGIN_URL', str_replace( '/cron', '/', dirname( __FILE__ ) ) );
-if( !defined('EMERGENCY_WP_PLUGIN_DIR') ) define( 'EMERGENCY_WP_PLUGIN_DIR', str_replace( '/cron', '/', dirname( __FILE__ ) ) );
-require_once EMERGENCY_WP_PLUGIN_DIR ."main.functions.php";
+if (!defined('EMERGENCY_WP_PLUGIN_URL')) define('EMERGENCY_WP_PLUGIN_URL', str_replace('/cron', '/', dirname(__FILE__)));
+if (!defined('EMERGENCY_WP_PLUGIN_DIR')) define('EMERGENCY_WP_PLUGIN_DIR', str_replace('/cron', '/', dirname(__FILE__)));
+require_once EMERGENCY_WP_PLUGIN_DIR . "main.functions.php";
 
 $debugMode = 1;
 $secret = emergencywp_option('cron_secret', '', true);
-$getSecret ='';
-if(isset($_GET['secret'])) {
+$getSecret = '';
+if (isset($_GET['secret'])) {
     $getSecret = sanitize_text_field($_GET['secret']);
 }
@@ -21 +21 @@
     }
 
-    require_once EMERGENCY_WP_PLUGIN_DIR ."cron/cron_config.php";
+    require_once EMERGENCY_WP_PLUGIN_DIR . "cron/cron_config.php";
 
 
@@ -122 +122 @@
                 'suppress_filters' => true
             );
-            $messages = emergencyWPAdmin::getWpPost($args);
-            if (count($messages)) {
-                foreach ($messages as $message) {
+            $_messages = emergencyWPAdmin::getWpPost($args);
+            if (count($_messages)) {
+                foreach ($_messages as $message) {
                     $messageNotificationSent = get_post_meta($message->ID, emergencyWPMessages::$postTypeSlug . '_notification_sent', true);
                     if ($messageNotificationSent != '1') {
@@ -222 +222 @@
                 if (isset($trusty['postMeta']['emergencywp_trustees_approved'])) {
                     echo "<pre>";
-                    print_r("\n".esc_attr($trusty['postMeta']['emergencywp_trustees_email']) ."\n");
+                    print_r("\n" . esc_attr($trusty['postMeta']['emergencywp_trustees_email']) . "\n");
                     echo "</pre>";
                     $jobSettings = emergencyWPJobController::getJobSettings();
                     $trustees_email_verification_date = new DateTime($trusty['postMeta']['emergencywp_trustees_approved']);
                     if (is_object($trustees_email_verification_date)) {
-                        if ($trustees_email_verification_date->getTimestamp() + $jobSettings['trustees_email_verification_interval'] <= time() ) {
+//                        var_dump($trustees_email_verification_date->getTimestamp());
+//                        var_dump($jobSettings);
+//                        var_dump(($trustees_email_verification_date->getTimestamp() + $jobSettings['trustees_email_verification_interval']));
+//                        var_dump(time());
+                        if (($trustees_email_verification_date->getTimestamp() + $jobSettings['trustees_email_verification_interval']) <= time()) {
                             //Trustee send confirmation email
                             $hasEmailConfirmationSent = get_post_meta($trusty['post']->ID, 'emergencywp_trustees_confirm_email_sent');
-                            if($hasEmailConfirmationSent == false) {
+                            $hasEmailConfirmationSentDate = DateTime::createFromFormat('Y-m-d H:i:s', $hasEmailConfirmationSent);
+
+                            $resendConfirmation = false;
+                            if (is_object($hasEmailConfirmationSentDate) &&
+                                $hasEmailConfirmationSentDate->getTimestamp() + $jobSettings['trustees_email_verification_interval'] <= time()
+                            ) {
+                                $resendConfirmation = true;
+                            }
+                            if ($hasEmailConfirmationSent == false || $resendConfirmation) {
                                 update_post_meta($trusty['post']->ID, 'emergencywp_trustees_confirm_email_sent', date('Y-m-d H:i:s', time()));
+                                update_post_meta($trusty['post']->ID, 'emergencywp_trustees_status', 'pending_email_changed');
                                 //EmergencyWPTrusteesSystemEmails::setEmail($trustees_email_verification_date);
                                 EmergencyWPTrusteesSystemEmails::verifyTrusteeEmailLink($trusty['post']->ID);
                             } else {
                                 echo "<pre>";
-                                print_r('trustee verification email already sent'."\n");
+                                print_r('trustee verification email already sent' . "\n");
                                 echo "</pre>";
                             }
                         } else {
                             echo "<pre>";
-                            print_r('do not send trustee verification email'."\n");
+                            print_r('do not send trustee verification email' . "\n");
                             echo "</pre>";
                         }
                     } else {
                         echo "<pre>";
-                        print_r('error 1'."\n");
+                        print_r('error 1' . "\n");
                         echo "</pre>";
                     }
                 }
-
-                if(isset($trusty['postMeta']['emergencywp_trustees_confirm_email_sent'])) {
+            }
+        }
+
+        $pendingTrustees = emergencyWPJobController::getPendingTrustees();
+        if (count($pendingTrustees) >0) {
+            $i =0;
+            foreach ($pendingTrustees AS $tId => $trusty) {
+                if (isset($trusty['postMeta']['emergencywp_trustees_confirm_email_sent'])) {
                     $trustees_email_verification_date = new DateTime($trusty['postMeta']['emergencywp_trustees_confirm_email_sent']);
+
                     if (is_object($trustees_email_verification_date)) {
-                        if ($trustees_email_verification_date->getTimestamp() + $jobSettings['live_status_finalHoldB_reactionTimeTrustees'] <= time() ) {
+                        if (($trustees_email_verification_date->getTimestamp() + $jobSettings['live_status_finalHoldB_reactionTimeTrustees']) <= time()) {
                             //Trustee didn't confirm his email
                             $hasEmailNotificationSent = get_post_meta($trusty['post']->ID, 'emergencywp_trustees_email_changed_notification_sent');
                             //$hasEmailConfirmationSent = false;
-                            if($hasEmailNotificationSent == false) {
+                            if ($hasEmailNotificationSent == false) {
                                 update_post_meta($trusty['post']->ID, 'emergencywp_trustees_email_changed_notification_sent', date('Y-m-d H:i:s', time()));
                                 EmergencyWPTrusteesSystemEmails::notifyMandatoryAboutPossibleTrusteeEmailChanged($trusty['post']->ID);
-                            }else {
+                            } else {
                                 echo "<pre>";
-                                print_r('trustee email changed notification already sent'."\n");
+                                print_r('trustee email changed notification already sent' . "\n");
                                 echo "</pre>";
                             }
                         } else {
                             echo "<pre>";
-                            print_r('do not send email to mandator about trustee email change'."\n");
+                            print_r('do not send email to mandator about trustee email change' . "\n");
                             echo "</pre>";
                         }
                     } else {
                         echo "<pre>";
-                        print_r('error 2'."\n\r");
+                        print_r('error 2' . "\n\r");
                         echo "</pre>";
                     }
@@ -279 +299 @@
 
                 echo "<pre>";
-                print_r('----------------'."\n\r");
+                print_r('----------------' . "\n\r");
                 echo "</pre>";
             }

emergencywp/trunk/emergencywp.php

@@ -4 +4 @@
 Plugin URI: https://emergencyWP.net/
 Description: EmergencyWP helps you plan processes for the case of personal emergencies right from your WordPress Dashboard. Pass over information to coworkers or clients automatically if you can't do it manually anymore (e.g. accidants, death, etc.). Plan life checks, setup contacts and messages and more. See our addons for more functionalities.
-Version: 1.3.10
+Version: 1.4.1
 Author: EmergencyWP Team, Albert Brückmann
 Author URI: https://emergencywp.net/
@@ -15 +15 @@
 define('EMERGENCY_WP_PLUGIN_PATH', 'emergencywp/emergencywp.php');
 define('EMERGENCY_WP_PLUGIN_NAME', 'emergencywp');
-define('EMERGENCY_WP_VERSION', '1.3.10');
+define('EMERGENCY_WP_VERSION', '1.4.1');
 define('EMERGENCY_WP_PLUGIN_URL', plugin_dir_url(__FILE__));
 define('EMERGENCY_WP_PLUGIN_DIR', plugin_dir_path(__FILE__));
@@ -132 +132 @@
     function emergencywp_admin_notices()
     {
-        $ewpNotices = ewp_get_option('emergencyWP_notices');
+        $ewpNotices = ewp_get_option('emergencywp_notices');
         if (isset($_GET['emergencywp_remove_notice']) && isset($ewpNotices[sanitize_key($_GET['emergencywp_remove_notice'])])) {
             unset($ewpNotices[sanitize_key($_GET['emergencywp_remove_notice'])]);
@@ -247 +247 @@
 $cron = new emergencyWPCron();
 $schedules = wp_get_schedules();
-$messages = new emergencyWPMessages();
+$_messages = new emergencyWPMessages();
 
 ?>

emergencywp/trunk/jobs/dead.php

@@ -86 +86 @@
         'suppress_filters' => true
     );
-    $messages = emergencyWPAdmin::getWpPost($args);
+    $_messages = emergencyWPAdmin::getWpPost($args);
 
-    if (count($messages)) {
-        foreach ($messages as $message) {
+    if (count($_messages)) {
+        foreach ($_messages as $message) {
             $messageSent = get_post_meta($message->ID, emergencyWPMessages::$postTypeSlug . '_sent', true);
             if ($messageSent != '1') {

emergencywp/trunk/languages/emergencyWP.pot

@@ -4 +4 @@
 "Project-Id-Version: EmergencyWP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-01 16:19+0000\n"
+"POT-Creation-Date: 2022-12-29 08:58+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -14 +14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Loco https://localise.biz/\n"
-"X-Loco-Version: 2.3.0; wp-5.2.3"
-
-#: pages/emergencywp/setting_tabs/debug.php:12
+"X-Loco-Version: 2.6.3; wp-6.1.1\n"
+"X-Domain: emergencywp"
+
+#: pages/emergencywp/setting_tabs/debug.php:10
 msgid ""
 "\n"
@@ -22 +23 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:168
+#: pages/emergencywp/setting_tabs/debug.php:170
 #, php-format
 msgid ""
@@ -30 +31 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:45
+#: pages/emergencywp/setting_tabs/debug.php:42
 msgid ""
 "\n"
@@ -36 +37 @@
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:499
+#: lib/class.emergencyWPAdmin.php:661
 msgid " EmergencyWP Custom Post Type"
 msgstr ""
@@ -52 +53 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:477
+#: lib/class.emergencyWPAdmin.php:1601
 #, php-format
 msgid "%s contact"
@@ -59 +60 @@
 msgstr[1] ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:567
-#: pages/emergencywp/setting_tabs/dashboard.php:605
+#: lib/class.emergencyWPAdmin.php:1699 lib/class.emergencyWPAdmin.php:1742
 #, php-format
 msgid "%s day ago"
@@ -74 +74 @@
 msgstr[1] ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:507
+#: lib/class.emergencyWPAdmin.php:1632
 #, php-format
 msgid "%s message"
@@ -81 +81 @@
 msgstr[1] ""
 
-#: views/messages/overview.php:10
-#, php-format
-msgid "%s messages found"
-msgid_plural "%s Messages found"
-msgstr[0] ""
-msgstr[1] ""
-
-#: pages/emergencywp/setting_tabs/dashboard.php:537
+#: lib/class.emergencyWPAdmin.php:1663
 #, php-format
 msgid "%s person"
@@ -95 +88 @@
 msgstr[1] ""
 
-#: pages/emergencywp/setting_tabs/debug.php:208
+#: lib/class.emergencyWPShortcodes.php:53
+#, php-format
+msgid ""
+"%s, a life check was detected and recorded in the confirmation log for e-"
+"mail address: %s Confirmation method: %s"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:210
 msgid "(or set status to 'unknown' and no emails will be sent!)"
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:73
+#: lib/class.emergencyWPAdmin.php:69
 msgid "1 hour (for testing purposes)"
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:67
+#: lib/class.emergencyWPAdmin.php:63
 msgid "1 hour minimum (for testing purposes!)"
+msgstr ""
+
+#: main.functions.php:85
+msgid "1 Month"
 msgstr ""
 
@@ -111 +115 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:25
+#: pages/emergencywp/setting_tabs/instruction.php:26
 msgid "1b. Optional, if you own the Trustees Add-On"
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:74
+#: lib/class.emergencyWPAdmin.php:70
 msgid "2 minutes (for testing purposes)"
 msgstr ""
 
+#: lib/class.emergencyWPAdmin.php:64
+msgid "2 minutes minimum (for testing purposes!)"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/instruction.php:33
+msgid "2. Configure cronjob"
+msgstr ""
+
+#: main.functions.php:79
+msgid "24 hours"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/instruction.php:39
+msgid "3. Check the latest auto-generated page with shortcode"
+msgstr ""
+
 #: lib/class.emergencyWPAdmin.php:68
-msgid "2 minutes minimum (for testing purposes!)"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/instruction.php:32
-msgid "2. Configure cronjob"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/instruction.php:38
-msgid "3. Check the latest auto-generated page with shortcode"
-msgstr ""
-
-#: lib/class.emergencyWPAdmin.php:72
 msgid "4 days"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:44
+#: pages/emergencywp/setting_tabs/instruction.php:45
 msgid "4. Check E-Mail templates"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:49
+#: pages/emergencywp/setting_tabs/instruction.php:50
 msgid "4b. Optional, if you own the Trustees Add-On"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:54
+#: pages/emergencywp/setting_tabs/instruction.php:55
 msgid "5. Test your settings"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:59
+#: pages/emergencywp/setting_tabs/instruction.php:60
 msgid "6. Add recipients and messages"
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:66
+#: lib/class.emergencyWPAdmin.php:61
 msgid "7 days"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:64
+#: pages/emergencywp/setting_tabs/instruction.php:65
 msgid "7. Recommended: Secure your WordPress installation"
 msgstr ""
@@ -172 +180 @@
 msgstr ""
 
-#: lib/class.emergencyWPActivate.php:43
-msgid ""
-"<p>This page was automatically generated by <strong>EmergencyWP</strong>.</p>"
-"<p>Feel free to edit the text. Please leave only the following WP shortcode "
-"unchanged:</p><br /><br />"
-msgstr ""
-
-#: lib/class.emergencyWPContacts.php:247
+#: lib/class.emergencyWPActivate.php:85
+msgid "<p></p>"
+msgstr ""
+
+#: lib/class.emergencyWPContacts.php:245
 msgid "A new contact has been created."
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:285
+#: lib/class.emergencyWPMessages.php:352
 msgid "A new message has been created"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:59
+#: pages/emergencywp/setting_tabs/cron.php:58
 msgid "a secret hash which is required to execute the cron"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:43
+#: lib/class.emergencyWPAdmin.php:1354
+#: pages/emergencywp/setting_tabs/debug.php:40
 msgid "Abort "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:228
-#: pages/emergencywp/setting_tabs/dashboard.php:274
-#: pages/emergencywp/setting_tabs/dashboard.php:326
+#: pages/emergencywp/setting_tabs/dashboard.php:230
+#: pages/emergencywp/setting_tabs/dashboard.php:279
+#: pages/emergencywp/setting_tabs/dashboard.php:332
+#: pages/emergencywp/setting_tabs/dashboard.php:392
+#: pages/emergencywp/setting_tabs/dashboard.php:453
 msgid "Activate"
 msgstr ""
 
-#: emergencywp.php:121
+#: pages/emergencywp/setting_tabs/dashboard.php:224
+#: pages/emergencywp/setting_tabs/dashboard.php:273
+#: pages/emergencywp/setting_tabs/dashboard.php:325
+#: pages/emergencywp/setting_tabs/dashboard.php:386
+#: pages/emergencywp/setting_tabs/dashboard.php:447
+msgid "Activate license now"
+msgstr ""
+
+#: emergencywp.php:150
 msgid "activate your copy"
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:123 lib/class.emergencyWPMessages.php:155
-#: views/messages/overview.php:11 views/contacts/overview.php:16
+#: lib/class.emergencyWPAdmin.php:270
+msgid "Active Trustees"
+msgstr ""
+
+#: lib/class.emergencyWPContacts.php:124 lib/class.emergencyWPMessages.php:211
+#: views/contacts/overview.php:16
 msgid "Add New"
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:124
+#: lib/class.emergencyWPContacts.php:125
 msgid "Add New Contact"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:156
+#: lib/class.emergencyWPMessages.php:212
 msgid "Add New Message"
 msgstr ""
 
-#: pages/emergencywp/emails.php:411
+#: pages/emergencywp/emails.php:384
 msgid "Additional Messagefield"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:10
+#: pages/emergencywp/settings.php:168
+msgid "Advanced display (debug)"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:8
 msgid "Alive (All well)"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:190
+#: pages/emergencywp/setting_tabs/debug.php:192
 #, php-format
 msgid "alive: %d | dead: %d | all: %d "
 msgstr ""
 
-#: pages/emergencywp/settings.php:161
-msgid "Allow traking"
-msgstr ""
-
-#: pages/emergencywp/settings.php:161
-msgid "Allow traking desc"
-msgstr ""
-
-#: emergencywp.php:265 emergencywp.php:294 emergencywp.php:383
-#: emergencywp.php:461 emergencywp.php:491 emergencywp.php:550
-#: emergencywp.php:627 emergencywp.php:657 emergencywp.php:716
-msgid "An error occurred, please try again."
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/dashboard.php:392
+#: pages/emergencywp/setting_tabs/dashboard.php:11
+msgid "All well"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/settings_main.php:363
+#: pages/emergencywp/setting_tabs/settings_main.php:367
+#, php-format
+msgid "An obligatory page, where you need to place the [%s] shortcode"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:520
 msgid "Asset Management"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:378
+#: pages/emergencywp/setting_tabs/dashboard.php:506
 msgid "Asset management Add-On"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:83
-msgid "Attachments "
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/dashboard.php:174
+#: pages/emergencywp/setting_tabs/dashboard.php:172
 msgid "Available add-ons"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:218
+#: pages/emergencywp/setting_tabs/dashboard.php:37
+msgid "Awaiting trustees consensus"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/email_templates.php:150
+msgid "Cancel"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:1773
+msgid "Confirm your life checks within this time."
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/settings_main.php:338
 msgid "Confirmation page"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:625
+#: lib/class.emergencyWPAdmin.php:264
+msgid "Confirmation Timeframe"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:1762
 msgid "Confirmation timeframe"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:27
+#: pages/emergencywp/setting_tabs/instruction.php:28
 msgid ""
 "Congratulations, you have a 2-factor-security layer installed! <br />\n"
@@ -281 +313 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:419
+#: pages/emergencywp/setting_tabs/dashboard.php:547
 msgid ""
 "Connect EmergencyWP to more than a thousand other apps to run processes "
@@ -288 +320 @@
 msgstr ""
 
+#: pages/emergencywp/setting_tabs/dashboard.php:373
+msgid ""
+"Connect EmergencyWP with more than a thousand apps to confirm life checks "
+"with habitual actions and run 3rd party processes in case of an emergency."
+msgstr ""
+
 #: lib/class.emergencyWPContactsTables.php:20
-#: lib/class.emergencyWPContacts.php:122
+#: lib/class.emergencyWPContacts.php:123
 msgid "Contact"
 msgstr ""
 
 #: lib/class.emergencyWPContactsTables.php:21
-#: lib/class.emergencyWPContacts.php:30 lib/class.emergencyWPContacts.php:31
-#: lib/class.emergencyWPContacts.php:38 lib/class.emergencyWPContacts.php:39
-#: lib/class.emergencyWPContacts.php:121
+#: lib/class.emergencyWPContacts.php:31 lib/class.emergencyWPContacts.php:32
+#: lib/class.emergencyWPContacts.php:39 lib/class.emergencyWPContacts.php:40
+#: lib/class.emergencyWPContacts.php:122 lib/class.emergencyWPAdmin.php:266
 msgid "Contacts"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:136
+#: lib/class.emergencyWPMessages.php:178
 msgid "Contacts "
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:734
+msgid "Copied!"
 msgstr ""
 
@@ -316 +358 @@
 msgstr ""
 
-#: views/messages/detail.php:24 views/contacts/detail.php:23
+#: views/contacts/detail.php:24
 msgid "Create"
 msgstr ""
 
-#: views/contacts/detail.php:24
+#: views/contacts/detail.php:25
 msgid "Create contact"
 msgstr ""
 
-#: views/messages/detail.php:25
-msgid "Create message"
-msgstr ""
-
-#: pages/emergencywp/settings.php:94
+#: pages/emergencywp/setting_tabs/settings_main.php:367
+msgid "create it right now"
+msgstr ""
+
+#: pages/emergencywp/settings.php:86
 msgid "Cron"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:28
+#: pages/emergencywp/setting_tabs/cron.php:27
 msgid "Cron job"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:37
+#: pages/emergencywp/setting_tabs/cron.php:36
 msgid "Cron Service"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:51
+#: pages/emergencywp/setting_tabs/cron.php:50
 msgid "Cron Settings"
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:467 lib/class.emergencyWPAdmin.php:468
-#: pages/emergencywp/settings.php:91
+#: lib/class.emergencyWPAdmin.php:622 lib/class.emergencyWPAdmin.php:623
+#: pages/emergencywp/settings.php:83
 #: pages/emergencywp/setting_tabs/dashboard.php:1
 msgid "Dashboard"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:328
-msgid "Dead"
-msgstr ""
-
-#: pages/emergencywp/settings.php:106
+#: pages/emergencywp/setting_tabs/settings_main.php:378
+msgid "Date Format"
+msgstr ""
+
+#: main.functions.php:81
+msgid "days"
+msgstr ""
+
+#: pages/emergencywp/settings.php:98
 msgid "Debug-Ansicht"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:7
+#: pages/emergencywp/setting_tabs/debug.php:5
 msgid "Debug-Info"
 msgstr ""
 
-#: lib/class.emergencyWPContactsTables.php:38
-#: lib/class.emergencyWPContactsTables.php:136
+#: lib/class.emergencyWPContactsTables.php:37
+#: lib/class.emergencyWPContactsTables.php:123
 msgid "Delete"
 msgstr ""
@@ -371 +417 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:306
+#: lib/class.emergencyWPMessages.php:163
+#: pages/emergencywp/setting_tabs/dashboard.php:312
 msgid "Delivery Conditions"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:297
+#: pages/emergencywp/setting_tabs/dashboard.php:302
 msgid "Delivery Conditions Add-On"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/email_templates.php:101
+#: pages/emergencywp/setting_tabs/email_templates.php:112
 msgid "Description"
 msgstr ""
 
-#: emergencywp.php:125
+#: emergencywp.php:155 emergencywp.php:172
 msgid "Dismiss"
 msgstr ""
 
-#: emergencywp.php:123
+#: emergencywp.php:153 emergencywp.php:170
 msgid "Dismiss this notice"
 msgstr ""
 
-#: emergencywp.php:126
+#: emergencywp.php:156 emergencywp.php:173
 msgid "Dismiss this notice "
 msgstr ""
 
-#: pages/emergencywp/settings.php:172
-msgid "Do not allow traking"
-msgstr ""
-
-#: pages/emergencywp/settings.php:172
-msgid "Do not allow traking desc"
-msgstr ""
-
-#: views/contacts/overview.php:27
+#: lib/class.emergencyWPLicences.php:23
+msgid ""
+"Do not use your bundle license - but individual license keys for each product"
+msgstr ""
+
+#: views/contacts/overview.php:29
 #, php-format
 msgid "Do you like to select all %s contacts?"
 msgstr ""
 
-#: views/messages/overview.php:21
-#, php-format
-msgid "Do you like to select all %s messages?"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/instruction.php:40
+#: pages/emergencywp/setting_tabs/instruction.php:41
 msgid ""
 "During the activation of the plugin, we've created a new page with the "
@@ -421 +460 @@
 msgstr ""
 
-#: pages/emergencywp/settings.php:96
+#: pages/emergencywp/settings.php:88
 msgid "E-Mail-Log"
 msgstr ""
 
-#: emergencywp.php:397
-msgid "EDD Bundle EmergencyWP + PRO Licencing"
-msgstr ""
-
-#: emergencywp.php:563
-msgid "EDD Bundle EmergencyWP + PRO Licencing Description"
-msgstr ""
-
-#: emergencywp.php:140
-msgid "EDD EmergencyWP Licencing"
-msgstr ""
-
-#: lib/class.emergencyWPContactsTables.php:135
-#: lib/class.emergencyWPContactsTables.php:140
-#: lib/class.emergencyWPContacts.php:125 lib/class.emergencyWPMessages.php:157
+#: lib/class.emergencyWPContactsTables.php:122
+#: lib/class.emergencyWPContactsTables.php:127
+#: lib/class.emergencyWPContacts.php:126 lib/class.emergencyWPMessages.php:213
 msgid "Edit"
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:126
+#: pages/emergencywp/setting_tabs/settings_main.php:364
+msgid "edit"
+msgstr ""
+
+#: lib/class.emergencyWPContacts.php:127
 msgid "Edit Contact"
 msgstr ""
 
-#: views/contacts/detail.php:27
+#: views/contacts/detail.php:28
 msgid "Edit contact"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:158
+#: lib/class.emergencyWPMessages.php:214
 msgid "Edit Message"
 msgstr ""
 
-#: views/messages/detail.php:28
-msgid "Edit message"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/email_templates.php:261
-#: pages/emergencywp/setting_tabs/email_templates.php:278
+#: pages/emergencywp/setting_tabs/email_templates.php:282
 msgid "Edit Template"
 msgstr ""
 
-#: lib/class.emergencyWPContactsTables.php:80 views/contacts/detail.php:86
+#: lib/class.emergencyWPContactsTables.php:65 views/contacts/detail.php:91
 msgid "Email"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:165
+#: pages/emergencywp/setting_tabs/settings_main.php:239
 msgid "Email address for life checks"
 msgstr ""
@@ -476 +502 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/email_templates.php:234
+#: pages/emergencywp/setting_tabs/email_templates.php:245
 msgid "Email Management"
 msgstr ""
 
-#: pages/emergencywp/settings.php:95
+#: pages/emergencywp/settings.php:87
 msgid "Email Templates"
 msgstr ""
 
 #. Name of the plugin
-#: lib/class.emergencyWPAdmin.php:461
+#: lib/class.emergencyWPAdmin.php:619
 msgid "EmergencyWP"
 msgstr ""
 
-#: pages/emergencywp/settings.php:192
+#: pages/emergencywp/settings.php:123
 msgid "EmergencyWP Administration"
 msgstr ""
@@ -497 +523 @@
 msgstr ""
 
-#: pages/emergencywp/emails.php:300
+#: pages/emergencywp/emails.php:271
 msgid "EmergencyWP Emails"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:1279
+msgid "EmergencyWP Feedback"
 msgstr ""
 
@@ -525 +555 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:191
-#: pages/emergencywp/setting_tabs/dashboard.php:200
+#: lib/class.emergencyWPAdmin.php:401
+msgid "EmergencyWP life check page"
+msgstr ""
+
+#: lib/class.emergencyWPShortcodes.php:47
+msgid "EmergencyWP Lifecheck confirmation"
+msgstr ""
+
+#: lib/class.emergencyWPShortcodes.php:163
+msgid "EmergencyWP Lifecheck confirmation FAILED"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:189
+#: pages/emergencywp/setting_tabs/dashboard.php:199
 msgid "EmergencyWP PRO"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:267
+msgid "EmergencyWP Settings"
 msgstr ""
 
@@ -534 +580 @@
 msgstr ""
 
-#: lib/class.emergencyWPActivate.php:39
+#: pages/emergencywp/setting_tabs/dashboard.php:431
+msgid "EmergencyWP Vault"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:370
+msgid "EmergencyWP Zapier connection"
+msgstr ""
+
+#: lib/class.emergencyWPActivate.php:81
 msgid "emergencyWP_job-response"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/email_templates.php:100
-#: pages/emergencywp/setting_tabs/email_templates.php:105
+#: pages/emergencywp/setting_tabs/re_captcha.php:47
+msgid "Enable for External Trigger"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/re_captcha.php:55
+msgid "Enable for Vault Account Verification"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/email_templates.php:111
+#: pages/emergencywp/setting_tabs/email_templates.php:116
 msgid "Enter description here"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:71 views/messages/detail.php:49
-#: views/messages/detail.php:51
-#: pages/emergencywp/setting_tabs/email_templates.php:85
-#: pages/emergencywp/setting_tabs/email_templates.php:90
+#: lib/class.emergencyWPMessages.php:93
+#: pages/emergencywp/setting_tabs/email_templates.php:96
+#: pages/emergencywp/setting_tabs/email_templates.php:101
 msgid "Enter subject here"
 msgstr ""
 
-#: emergencywp.php:167
-#, php-format
-msgid ""
-"Enter Your Purchase Code To Register (Don't have one for this site? <a "
-"href=\"%s\" target=\"_blank\">Buy Now!</a>)"
-msgstr ""
-
-
-#: pages/emergencywp/setting_tabs/dashboard.php:454
+#: pages/emergencywp/setting_tabs/settings_main.php:437
+msgid "Erase my data"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:1577
 msgid "every"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:45
+#: pages/emergencywp/setting_tabs/instruction.php:46
 msgid ""
 "Every process uses a specific e-mail template. Go there to see if the layout "
@@ -570 +627 @@
 msgstr ""
 
-#: views/contactDetail.php:112
-msgid "Female"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:76
+#: pages/emergencywp/setting_tabs/debug.php:125
+msgid "External Trigger:  "
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:73
 msgid "Final Hold A (= Last call (urgent))"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:83
+#: pages/emergencywp/setting_tabs/debug.php:80
 msgid "Final Hold A Help"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:107
+#: pages/emergencywp/setting_tabs/debug.php:104
 msgid "Final Hold B "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:135
+#: pages/emergencywp/setting_tabs/debug.php:137
 msgid "Final Hold B Reaction Time Help "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:214
+#: pages/emergencywp/setting_tabs/debug.php:216
 msgid "Final Hold C"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:247
+#: pages/emergencywp/setting_tabs/debug.php:249
 msgid "Final Hold C Iteration:  "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:286
+#: pages/emergencywp/setting_tabs/debug.php:288
 msgid "Final Hold D"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:297
+#: pages/emergencywp/setting_tabs/debug.php:299
 msgid "Final Hold D Help "
 msgstr ""
 
-#: views/contacts/detail.php:72
+#: pages/emergencywp/setting_tabs/dashboard.php:42
+msgid "Final verification after trustees confirmation"
+msgstr ""
+
+#: views/contacts/detail.php:77
 msgid "First Name"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:151
+#: pages/emergencywp/setting_tabs/settings_main.php:225
 msgid "Firstname"
 msgstr ""
 
 #: pages/emergencywp/emails.php:60 pages/emergencywp/emails.php:72
-#: pages/emergencywp/emails.php:84 pages/emergencywp/emails.php:95
-#: pages/emergencywp/emails.php:109 pages/emergencywp/emails.php:127
-#: pages/emergencywp/emails.php:139 pages/emergencywp/emails.php:179
+#: pages/emergencywp/emails.php:84 pages/emergencywp/emails.php:96
+#: pages/emergencywp/emails.php:110 pages/emergencywp/emails.php:128
+#: pages/emergencywp/emails.php:140 pages/emergencywp/emails.php:182
 msgid "Firstname of your trusted person"
 msgstr ""
@@ -625 +686 @@
 msgstr ""
 
-#: pages/emergencywp/emails.php:152 pages/emergencywp/emails.php:181
+#: pages/emergencywp/emails.php:153 pages/emergencywp/emails.php:184
 msgid "Frequency of your life status mails in days"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:232
-#: pages/emergencywp/setting_tabs/dashboard.php:278
-#: pages/emergencywp/setting_tabs/dashboard.php:330
+#: views/contacts/overview.php:18
+#: pages/emergencywp/setting_tabs/settings_main.php:291
+msgid "Get EmergencyWP PRO"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:202
+msgid ""
+"Get extra life check frequencies, unlimited contacts, confirmation logs and "
+"many more features with EmergencyWP Pro."
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:235
+#: pages/emergencywp/setting_tabs/dashboard.php:283
+#: pages/emergencywp/setting_tabs/dashboard.php:336
+#: pages/emergencywp/setting_tabs/dashboard.php:396
+#: pages/emergencywp/setting_tabs/dashboard.php:457
 msgid "Get it now"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:60
+#: pages/emergencywp/setting_tabs/instruction.php:61
 msgid ""
 "Go to recipients and add some contacts. You can use them later in your "
@@ -653 +727 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:50
+#: pages/emergencywp/setting_tabs/instruction.php:51
 msgid ""
 "Go to Trustees and add at least three trustworthy persons of your choice to "
@@ -661 +735 @@
 msgstr ""
 
-#: lib/class.emergencyWPShortcodes.php:38
-#, php-format
-msgid ""
-"Hallo %s, <br />We are pleased to hear that you are alive. ..... the "
-"JobStatus is already 'dead' and we had send your emails ...<br /> "
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/cron.php:53
+#: pages/emergencywp/setting_tabs/re_captcha.php:31
+#: pages/emergencywp/setting_tabs/re_captcha.php:39
+msgid ""
+"Google V2\n"
+"            reCAPTCHA"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/settings_main.php:444
+msgid "Grant Access level..."
+msgstr ""
+
+#: lib/class.emergencyWPShortcodes.php:21
+#, php-format
+msgid ""
+"Hallo %s, <br />Great to hear that you are alive. But... the JobStatus is "
+"already 'Finished' and we had to send your future messages ...<br /> "
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/cron.php:52
 msgid "here"
 msgstr ""
 
-#: emergencywp.php:121
+#: emergencywp.php:150
 #, php-format
 msgid ""
@@ -678 +763 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:54
-msgid "Hold A"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:60
+#: emergencywp.php:168
+msgid ""
+"Hey! You are running a multisite. EmergencyWP will not work properly without "
+"the EmergencyWP MultiSite Addon."
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:51
+msgid "Hold A (= Pending)"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:57
 msgid "Hold A Help"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:255
+#: pages/emergencywp/setting_tabs/debug.php:257
 msgid "Hold B"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:266
+#: pages/emergencywp/setting_tabs/debug.php:268
 msgid "Hold B Help"
 msgstr ""
@@ -698 +789 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:180
+#: pages/emergencywp/setting_tabs/settings_main.php:284
+#: pages/emergencywp/setting_tabs/settings_main.php:290
 msgid "How often do you want to receive a life check?"
 msgstr ""
@@ -710 +802 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:219
+#: pages/emergencywp/setting_tabs/debug.php:221
 #, php-format
 msgid ""
@@ -725 +817 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:607
+#: lib/class.emergencyWPContactsTables.php:64
+msgid "Image"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/settings_main.php:340
+msgid "Important ! Select..."
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:1744
 #, php-format
 msgid "in %s day"
@@ -736 +836 @@
 msgstr ""
 
-#: pages/emergencywp/settings.php:92
+#: pages/emergencywp/settings.php:84
 msgid "Instructions"
 msgstr ""
@@ -744 +844 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:30
+#: pages/emergencywp/setting_tabs/cron.php:29
 msgid "Interval for sending life checks and mails"
-msgstr ""
-
-#: emergencywp.php:281 emergencywp.php:478 emergencywp.php:644
-msgid "Invalid license."
 msgstr ""
 
@@ -766 +862 @@
 msgstr ""
 
+#: pages/emergencywp/setting_tabs/settings_main.php:436
+msgid "Keep my data"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:21
+msgid "Last call (urgent)"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:32
+msgid "Last call for trustees"
+msgstr ""
+
 #: pages/emergencywp/setting_tabs/cron.php:103
 msgid "Last hit"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:557
+#: lib/class.emergencyWPAdmin.php:261 lib/class.emergencyWPAdmin.php:1688
 msgid "Last Lifecheck"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:20
+#: pages/emergencywp/setting_tabs/debug.php:18
 msgid "Last Mandator Response: "
 msgstr ""
 
-#: views/contacts/detail.php:78
+#: views/contacts/detail.php:83
 msgid "Last Name"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:157
+#: pages/emergencywp/setting_tabs/settings_main.php:231
 msgid "Lastname"
 msgstr ""
 
 #: pages/emergencywp/emails.php:61 pages/emergencywp/emails.php:73
-#: pages/emergencywp/emails.php:85 pages/emergencywp/emails.php:96
-#: pages/emergencywp/emails.php:110 pages/emergencywp/emails.php:128
-#: pages/emergencywp/emails.php:140 pages/emergencywp/emails.php:180
+#: pages/emergencywp/emails.php:85 pages/emergencywp/emails.php:97
+#: pages/emergencywp/emails.php:111 pages/emergencywp/emails.php:129
+#: pages/emergencywp/emails.php:141 pages/emergencywp/emails.php:183
 msgid "Lastname of your trusted person"
 msgstr ""
@@ -797 +905 @@
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:485 lib/class.emergencyWPAdmin.php:486
+#: lib/class.emergencyWPAdmin.php:646 lib/class.emergencyWPAdmin.php:647
 msgid "Licenses"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:171
+#: lib/class.emergencyWPAdmin.php:1479 lib/class.emergencyWPAdmin.php:1495
+#: pages/emergencywp/setting_tabs/settings_main.php:272
 msgid "Life check frequency"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:289
+#: pages/emergencywp/setting_tabs/debug.php:291
 msgid ""
 "Life status is 'deadIncomplete'. <br /> This means that not all Trustees "
@@ -815 +924 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:446
+#: pages/emergencywp/setting_tabs/settings_main.php:324
+msgid "Lifecheck for login"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:263
+msgid "Lifecheck Frequency"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:1569
 msgid "Lifecheck frequency"
 msgstr ""
 
 #: pages/emergencywp/emails.php:28 pages/emergencywp/emails.php:46
-#: pages/emergencywp/emails.php:97
+#: pages/emergencywp/emails.php:98
 msgid "Link for Trustie do accept invitation"
 msgstr ""
 
 #: pages/emergencywp/emails.php:62 pages/emergencywp/emails.php:74
-#: pages/emergencywp/emails.php:111
+#: pages/emergencywp/emails.php:112
 msgid "Link for Trustie do approve that you are still alive"
 msgstr ""
 
 #: pages/emergencywp/emails.php:29 pages/emergencywp/emails.php:47
-#: pages/emergencywp/emails.php:98
+#: pages/emergencywp/emails.php:99
 msgid "Link for Trustie do decline invitation"
 msgstr ""
 
 #: pages/emergencywp/emails.php:63 pages/emergencywp/emails.php:75
-#: pages/emergencywp/emails.php:112
+#: pages/emergencywp/emails.php:113
 msgid "Link for Trustie to confirm that you have passed away"
 msgstr ""
@@ -847 +964 @@
 msgstr ""
 
-#: views/contactDetail.php:106
-msgid "Male"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:279
+#: pages/emergencywp/setting_tabs/debug.php:281
 msgid "Mandator confirm period expires: "
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:380
+#: lib/class.emergencyWPAdmin.php:542
 msgid "Mandator email is not a valid email address"
 msgstr ""
 
+#: pages/emergencywp/setting_tabs/debug.php:243
+msgid "Mandator Feedback expires:  "
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:66
+msgid "Mandator feedback period expires: "
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:119
+msgid "Mandator feedback period expires:  "
+msgstr ""
+
 #: pages/emergencywp/setting_tabs/debug.php:241
-msgid "Mandator Feedback expires:  "
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:69
-msgid "Mandator feedback period expires: "
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:122
-msgid "Mandator feedback period expires:  "
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:239
 msgid "Mandator Feedback sends:  "
 msgstr ""
@@ -879 +992 @@
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:154 pages/emergencywp/emails.php:368
+#: lib/class.emergencyWPMessages.php:210 pages/emergencywp/emails.php:341
 msgid "Message"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:23 lib/class.emergencyWPMessages.php:24
-#: lib/class.emergencyWPMessages.php:153
-#: pages/emergencywp/setting_tabs/dashboard.php:498
+#: lib/class.emergencyWPAdmin.php:265 lib/class.emergencyWPAdmin.php:1622
+#: lib/class.emergencyWPMessages.php:29 lib/class.emergencyWPMessages.php:30
+#: lib/class.emergencyWPMessages.php:209
 msgid "Messages"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:366
+#: pages/emergencywp/setting_tabs/dashboard.php:494
 msgid ""
 "Messages and information can be password protected, so recipients need to "
@@ -895 +1008 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:343
+#: pages/emergencywp/setting_tabs/debug.php:345
 msgid "Messages send:  "
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:372
+#: main.functions.php:77
+msgid "Minutes"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:47
+msgid "Missing information"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:534
 msgid "Missing mandator data on mandator data update"
 msgstr ""
 
-#: views/contacts/detail.php:98
+#: views/contacts/detail.php:103
 msgid "Mobile"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:239
-#: pages/emergencywp/setting_tabs/dashboard.php:285
-#: pages/emergencywp/setting_tabs/dashboard.php:337
+#: main.functions.php:87
+msgid "Months"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:242
+#: pages/emergencywp/setting_tabs/dashboard.php:290
+#: pages/emergencywp/setting_tabs/dashboard.php:343
+#: pages/emergencywp/setting_tabs/dashboard.php:403
+#: pages/emergencywp/setting_tabs/dashboard.php:464
 msgid "More Information"
 msgstr ""
@@ -917 +1044 @@
 msgstr ""
 
-#: lib/class.emergencyWPContactsTables.php:141
+#: lib/class.emergencyWPContactsTables.php:128
 msgid "Move to trash"
 msgstr ""
 
-#: lib/class.emergencyWPContactsTables.php:79 views/contacts/detail.php:67
+#: lib/class.emergencyWPContactsTables.php:63 views/contacts/detail.php:72
 msgid "Name"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:135
+#: views/contacts/overview.php:18
+msgid "Need more contacts?"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/settings_main.php:291
+msgid "Need more options?"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/cron.php:132
 msgid "never"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:483
-#: pages/emergencywp/setting_tabs/dashboard.php:512
+#: lib/class.emergencyWPAdmin.php:1607 lib/class.emergencyWPAdmin.php:1637
 msgid "New"
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:127
+#: lib/class.emergencyWPContacts.php:128
 msgid "New Contact"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:159
+#: lib/class.emergencyWPMessages.php:215
 msgid "New Message"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:594
+#: lib/class.emergencyWPAdmin.php:262 lib/class.emergencyWPAdmin.php:1730
 msgid "Next Lifecheck"
 msgstr ""
 
-#: pages/emergencywp/emails.php:340
+#: pages/emergencywp/emails.php:312
 msgid "No Accordion Title set"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:105
+#: lib/class.emergencyWPMessages.php:147
 msgid "no contacts (!) "
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:222 views/messages/detail.php:99
+#: lib/class.emergencyWPMessages.php:292
 msgid "No contacts available"
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:131
+#: lib/class.emergencyWPContacts.php:132
 msgid "No Contacts Found"
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:132
+#: lib/class.emergencyWPContacts.php:133
 msgid "No Contacts Found in trash"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:320
+#: pages/emergencywp/setting_tabs/debug.php:322
 msgid ""
 "No further jobs will be executed. The process is at rest until the mandator "
@@ -972 +1106 @@
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:163
+#: lib/class.emergencyWPMessages.php:219
 msgid "No Messages Found"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:164
+#: lib/class.emergencyWPMessages.php:220
 msgid "No Messages Found in trash"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:162
+#: pages/emergencywp/setting_tabs/debug.php:164
 msgid "No Reaction A "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:197
+#: pages/emergencywp/setting_tabs/debug.php:199
 msgid "No Reaction B "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:175
+#: pages/emergencywp/setting_tabs/debug.php:177
 msgid "No Reactions A Reminder Time Help "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:83
+#: pages/emergencywp/setting_tabs/settings_main.php:151
 msgid "No setting has been changed by you."
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:338
+#: lib/class.emergencyWPJobController.php:394
 msgid "No Status transmitted "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:199
+#: pages/emergencywp/setting_tabs/debug.php:201
 msgid ""
 "None of the trustees reported on the Reminder email (JobStatus: noReactionA)."
@@ -1008 +1142 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:64
-#: pages/emergencywp/setting_tabs/debug.php:88
-#: pages/emergencywp/setting_tabs/debug.php:89
-#: pages/emergencywp/setting_tabs/debug.php:225
+#: pages/emergencywp/setting_tabs/debug.php:61
+#: pages/emergencywp/setting_tabs/debug.php:85
+#: pages/emergencywp/setting_tabs/debug.php:86
 #: pages/emergencywp/setting_tabs/debug.php:227
 #: pages/emergencywp/setting_tabs/debug.php:229
 #: pages/emergencywp/setting_tabs/debug.php:231
 #: pages/emergencywp/setting_tabs/debug.php:233
-#: pages/emergencywp/setting_tabs/debug.php:270
-#: pages/emergencywp/setting_tabs/debug.php:271
+#: pages/emergencywp/setting_tabs/debug.php:235
+#: pages/emergencywp/setting_tabs/debug.php:272
+#: pages/emergencywp/setting_tabs/debug.php:273
 msgid "not send yet"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:115
-#: pages/emergencywp/setting_tabs/debug.php:159
-#: pages/emergencywp/setting_tabs/debug.php:182
-#: pages/emergencywp/setting_tabs/debug.php:301
-#: pages/emergencywp/setting_tabs/debug.php:302
+#: pages/emergencywp/setting_tabs/debug.php:112
+#: pages/emergencywp/setting_tabs/debug.php:161
+#: pages/emergencywp/setting_tabs/debug.php:184
+#: pages/emergencywp/setting_tabs/debug.php:303
+#: pages/emergencywp/setting_tabs/debug.php:304
 msgid "not send yet "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:337
+#: pages/emergencywp/setting_tabs/debug.php:339
 msgid "not send yet! "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:336
+#: pages/emergencywp/setting_tabs/debug.php:338
 msgid "not set yet! "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:17
+#: pages/emergencywp/setting_tabs/debug.php:15
 msgid "not set!"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:274
-msgid "On deactivation..."
-msgstr ""
-
-#: lib/class.emergencyWPJobController.php:368
+#: pages/emergencywp/setting_tabs/settings_main.php:433
+msgid "On uninstalling..."
+msgstr ""
+
+#: lib/class.emergencyWPJobController.php:424
 msgid "Oops, there is unfortunately a technical error occurred.<br /><br />"
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:338
-#: lib/class.emergencyWPJobController.php:340
-#: lib/class.emergencyWPJobController.php:342
-#: lib/class.emergencyWPJobController.php:344
-#: lib/class.emergencyWPJobController.php:346
-#: lib/class.emergencyWPJobController.php:348
-#: lib/class.emergencyWPJobController.php:360
+#: lib/class.emergencyWPJobController.php:394
+#: lib/class.emergencyWPJobController.php:396
+#: lib/class.emergencyWPJobController.php:398
+#: lib/class.emergencyWPJobController.php:400
+#: lib/class.emergencyWPJobController.php:402
+#: lib/class.emergencyWPJobController.php:404
+#: lib/class.emergencyWPJobController.php:416
 msgid "Oops, there is unfortunately a technical error occurred.<br /><br /> "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/email_templates.php:229
+#: pages/emergencywp/setting_tabs/email_templates.php:240
 msgid "Opss template not found. Please try again!"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:32
+#: pages/emergencywp/setting_tabs/cron.php:31
 msgid "Optional if a real cron service is used"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/settings_main.php:365
+msgid "or"
 msgstr ""
 
@@ -1071 +1209 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:396
+#: pages/emergencywp/setting_tabs/dashboard.php:524
 msgid ""
 "Organize your licenses, codes  in one place and define who will get access "
@@ -1083 +1221 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:362
+#: pages/emergencywp/setting_tabs/dashboard.php:490
 msgid "Password Protection"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:347
+#: pages/emergencywp/setting_tabs/dashboard.php:475
 msgid "Password Protection Add-On"
 msgstr ""
 
-#: pages/emergencywp/emails.php:384 pages/emergencywp/emails.php:427
+#: lib/class.emergencyWPAdmin.php:62
+msgid "Pause (not recommended)"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:16
+msgid "Pending confirmation"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:27
+msgid "Pending trustees confirmation"
+msgstr ""
+
+#: pages/emergencywp/emails.php:357 pages/emergencywp/emails.php:401
 msgid "Placeholder"
 msgstr ""
 
-#: pages/emergencywp/emails.php:385 pages/emergencywp/emails.php:428
+#: pages/emergencywp/emails.php:358 pages/emergencywp/emails.php:402
 msgid "Placeholder-Desc"
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:55 lib/class.emergencyWPContacts.php:220
+#: lib/class.emergencyWPContacts.php:56 lib/class.emergencyWPContacts.php:217
 msgid "Please add a last name (min. 2 characters)"
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:360
+#: lib/class.emergencyWPJobController.php:416
 msgid ""
 "Please contact our support! <span class=\"error-code\">[ErrorCode: ERR-JOB-0]"
@@ -1109 +1259 @@
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:340
+#: lib/class.emergencyWPJobController.php:396
 msgid ""
 "Please contact our support! <span class=\"error-code\">[ErrorCode: ERR-JOB-"
@@ -1115 +1265 @@
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:348
+#: lib/class.emergencyWPJobController.php:404
 msgid ""
 "Please contact our support! <span class=\"error-code\">[ErrorCode: ERR-JOB-6]"
@@ -1121 +1271 @@
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:344
+#: lib/class.emergencyWPJobController.php:400
 msgid ""
 "Please contact our support! <span class=\"error-code\">[ErrorCode: ERR-JOB-8]"
@@ -1127 +1277 @@
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:368
+#: lib/class.emergencyWPJobController.php:424
 msgid ""
 "Please contact our support! <span class=\"error-code\">[ErrorCode: ERR-JOB-"
@@ -1133 +1283 @@
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:342
+#: lib/class.emergencyWPJobController.php:398
 msgid ""
 "Please contact our support! <span class=\"error-code\">[ErrorCode: ERR-JOB-9]"
@@ -1139 +1289 @@
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:62 lib/class.emergencyWPContacts.php:232
+#: lib/class.emergencyWPContacts.php:63 lib/class.emergencyWPContacts.php:230
 msgid "Please provide a valid e-mail address."
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:224
-#: pages/emergencywp/setting_tabs/dashboard.php:270
-#: pages/emergencywp/setting_tabs/dashboard.php:322
+#: pages/emergencywp/setting_tabs/dashboard.php:226
+#: pages/emergencywp/setting_tabs/dashboard.php:275
+#: pages/emergencywp/setting_tabs/dashboard.php:328
+#: pages/emergencywp/setting_tabs/dashboard.php:388
+#: pages/emergencywp/setting_tabs/dashboard.php:449
 msgid "Plugin active"
 msgstr ""
 
 #: pages/emergencywp/setting_tabs/dashboard.php:222
-#: pages/emergencywp/setting_tabs/dashboard.php:268
-#: pages/emergencywp/setting_tabs/dashboard.php:320
+#: pages/emergencywp/setting_tabs/dashboard.php:271
+#: pages/emergencywp/setting_tabs/dashboard.php:326
+#: pages/emergencywp/setting_tabs/dashboard.php:384
+#: pages/emergencywp/setting_tabs/dashboard.php:445
 msgid "Plugin active but unlicensed"
 msgstr ""
@@ -1159 +1313 @@
 msgstr ""
 
+#: pages/emergencywp/setting_tabs/dashboard.php:58
+msgid "Process finished"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:330
+msgid "Process finished (= Dead)"
+msgstr ""
+
 #: views/messages/submit.php:44
 msgid "Publish"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:82
+#: pages/emergencywp/settings.php:107
+msgid "Recaptcha"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/re_captcha.php:2
+msgid "reCAPTCHA"
+msgstr ""
+
+#: lib/class.emergencyWPMessages.php:104
 msgid "Recipient "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:46
+#: pages/emergencywp/setting_tabs/cron.php:45
 msgid "recommended if not much traffic on site"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:97
+#: pages/emergencywp/setting_tabs/debug.php:94
 msgid "Reminder period expires:  "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:132
-msgid "Reset"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:36
+#: pages/emergencywp/setting_tabs/debug.php:34
 msgid "Reset Alive Status "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:25
+#: pages/emergencywp/setting_tabs/debug.php:23
 msgid "Reset to alive status"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:32
+#: pages/emergencywp/setting_tabs/cron.php:31
 #, php-format
 msgid "Run EmergencyWP cron at a maximum of %1$s minutes"
@@ -1193 +1359 @@
 
 #: views/messages/submit.php:46 views/messages/submit.php:51
+#: pages/emergencywp/setting_tabs/re_captcha.php:62
 msgid "Save"
 msgstr ""
@@ -1200 +1367 @@
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:130
+#: pages/emergencywp/setting_tabs/email_templates.php:147
+msgid "Save Changes"
+msgstr ""
+
+#: lib/class.emergencyWPContacts.php:131
 msgid "Search Contact"
 msgstr ""
 
-#: views/contacts/overview.php:24
+#: views/contacts/overview.php:26
 msgid "Search Contacts"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:162 views/messages/overview.php:18
+#: lib/class.emergencyWPMessages.php:218
 msgid "Search Messages"
 msgstr ""
 
-#: views/messages/overview.php:14 views/contacts/overview.php:20
+#: views/contacts/overview.php:22
 #, php-format
 msgid "Search result for %s"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:80
+#: pages/emergencywp/setting_tabs/re_captcha.php:35
+msgid "Secret Key"
+msgstr ""
+
+#: lib/class.emergencyWPMessages.php:102
 msgid "select all "
 msgstr ""
 
-#: views/messages/detail.php:71
-msgid "Select Contact Person(s) "
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/settings_main.php:204
-msgid "Send test email"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:203
+#: pages/emergencywp/setting_tabs/settings_main.php:439
+msgid ""
+"Select if all entries in the database related to EmergencyWP should be "
+"deleted on uninstalling of the plugin"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/settings_main.php:458
+msgid ""
+"Select the minimum role that a user must have to be able to use EmergencyWP"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/settings_main.php:257
+msgid "Send test email (save first!)"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:205
 msgid "Sending E-mails:"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:207
+#: pages/emergencywp/setting_tabs/settings_main.php:260
 msgid "Sending failed :-("
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:198
+#: pages/emergencywp/setting_tabs/settings_main.php:262
+msgid ""
+"Sending failed because license key not available or active. Please activate "
+"your license"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/settings_main.php:309
 msgid "Set the timeframe for your life check confirmation"
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:475 lib/class.emergencyWPAdmin.php:476
-#: pages/emergencywp/settings.php:93
-#: pages/emergencywp/setting_tabs/settings_main.php:145
+#: lib/class.emergencyWPAdmin.php:630 lib/class.emergencyWPAdmin.php:631
+#: pages/emergencywp/settings.php:85
+#: pages/emergencywp/setting_tabs/settings_main.php:219
 msgid "Settings"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:101
+#: pages/emergencywp/setting_tabs/settings_main.php:169
 msgid "Settings has been updated"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:108
+#: pages/emergencywp/setting_tabs/settings_main.php:176
 msgid "Settings have been updated"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:1488
+msgid "Settings updated successfully!"
 msgstr ""
 
@@ -1266 +1458 @@
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:419
-#: pages/emergencywp/setting_tabs/settings_main.php:92
+#: pages/emergencywp/setting_tabs/email_logs.php:42
+msgid "Show"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/re_captcha.php:27
+msgid "Site Key"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:1364
+msgid "Skip"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:581
+#: pages/emergencywp/setting_tabs/settings_main.php:160
 msgid "Something went wrong on updated mandator email address"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:341
+#: lib/class.emergencyWPShortcodes.php:153
+msgid "Sorry, but your response is out of time."
+msgstr ""
+
+#: lib/class.emergencyWPShortcodes.php:109
+msgid ""
+"Sorry, the key in your url is incorrect.<br />Please try again or contact "
+"our support! <span class=\"error-code\">[ErrorCode: ERR-JOB-999]</span> "
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:343
 msgid "Status Dead has been set: "
 msgstr ""
 
-#: pages/emergencywp/emails.php:356
-#: pages/emergencywp/setting_tabs/email_templates.php:86
+#: pages/emergencywp/emails.php:328
+#: pages/emergencywp/setting_tabs/email_templates.php:97
 msgid "Subject"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:208
+#: lib/class.emergencyWPAdmin.php:1360
+msgid "Submit"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/settings_main.php:261
 msgid "Successfully sent!"
 msgstr ""
@@ -1288 +1506 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:70
-#: pages/emergencywp/setting_tabs/debug.php:277
+#: pages/emergencywp/setting_tabs/debug.php:67
+#: pages/emergencywp/setting_tabs/debug.php:279
 msgid "System Email send: "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:99
+#: pages/emergencywp/setting_tabs/debug.php:96
 msgid "System Email send:  "
 msgstr ""
 
-#: lib/class.emergencyWPSystemEmails.php:201
+#: lib/class.emergencyWPSystemEmails.php:209
 msgid "System emails"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:124
+#: pages/emergencywp/setting_tabs/debug.php:121
 msgid "System emails to Trustees send:  "
 msgstr ""
@@ -1313 +1531 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:164
+#: pages/emergencywp/setting_tabs/debug.php:166
 #, php-format
 msgid ""
@@ -1321 +1539 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:109
+#: pages/emergencywp/setting_tabs/debug.php:106
 msgid ""
 "System sends email to trustees for response the livestatus of mandator, "
@@ -1327 +1545 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:78
+#: pages/emergencywp/setting_tabs/debug.php:75
 msgid ""
 "System sends reminder email for verification if the client does not report "
@@ -1333 +1551 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:258
+#: pages/emergencywp/setting_tabs/debug.php:260
 msgid ""
 "System sends verification e-mail to mandator to report back his alive "
@@ -1339 +1557 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:56
+#: pages/emergencywp/setting_tabs/debug.php:53
 msgid ""
 "System sends verification e-mail when the client does not report back to the "
@@ -1345 +1563 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:55
+#: pages/emergencywp/setting_tabs/instruction.php:56
 msgid ""
 "Take a look to the dashboard to see when your next life check will be send. "
@@ -1354 +1572 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:203
+#: pages/emergencywp/setting_tabs/settings_main.php:256
 msgid "Test mail settings"
 msgstr ""
 
-#: lib/class.emergencyWPActivate.php:38
+#: lib/class.emergencyWPActivate.php:80
 msgid "Thank you for your response!"
 msgstr ""
 
-#: lib/class.emergencyWPActivate.php:42
+#: lib/class.emergencyWPActivate.php:84
 msgid "thank-you-for-response"
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:249
+#: lib/class.emergencyWPContacts.php:247
 msgid "The contact was updated successfully."
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:386
+#: lib/class.emergencyWPAdmin.php:548
 msgid "The first name should consist of at least two letters"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:331
+#: pages/emergencywp/setting_tabs/debug.php:333
 msgid ""
 "The job workflow is now finished. All stored messages will be sent to the "
@@ -1384 +1602 @@
 msgstr ""
 
-#: lib/class.emergencyWPAdmin.php:392
+#: lib/class.emergencyWPAdmin.php:554
 msgid "The last name should consist of at least two letters"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:287
+#: lib/class.emergencyWPMessages.php:354
 msgid "The message was updated successfully."
 msgstr ""
 
-#: emergencywp.php:288 emergencywp.php:485 emergencywp.php:651
-#, php-format
-msgid "This appears to be an invalid license key for %s."
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/email_templates.php:164
+#: pages/emergencywp/setting_tabs/dashboard.php:434
+msgid ""
+"The Vault can hold secret information from more than 15 categories (and "
+"encrypt them securely in your database) to be sent to one or more contacts "
+"after an accident or death."
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/email_templates.php:175
 msgid "This is the explination"
+msgstr ""
+
+#: lib/class.emergencyWPMessages.php:152
+msgid "This message has conditions setup so will not be sent"
+msgstr ""
+
+#: lib/class.emergencyWPMessages.php:153
+msgid ""
+"This message has conditions setup, but EmergencyWP Conditions Addon is "
+"deactivated. Message will not be sent"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/re_captcha.php:56
+msgid ""
+"This will enable reCAPTCHA to block brute force attacks on account "
+"verification page"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/re_captcha.php:48
+msgid ""
+"This will enable reCAPTCHA to block brute force attacks on external trigger "
+"url"
 msgstr ""
 
@@ -1405 +1647 @@
 msgstr ""
 
-#: pages/emergencywp/emails.php:183
+#: pages/emergencywp/setting_tabs/settings_main.php:400
+msgid "Time Format"
+msgstr ""
+
+#: pages/emergencywp/emails.php:188
 msgid ""
 "Time in days that you have to react to the reminder mail before your "
@@ -1411 +1657 @@
 msgstr ""
 
-#: pages/emergencywp/emails.php:153 pages/emergencywp/emails.php:166
-#: pages/emergencywp/emails.php:182 pages/emergencywp/emails.php:197
-#: pages/emergencywp/emails.php:198
+#: pages/emergencywp/emails.php:155 pages/emergencywp/emails.php:169
+#: pages/emergencywp/emails.php:186 pages/emergencywp/emails.php:204
+#: pages/emergencywp/emails.php:206
 msgid ""
 "Time in days that you have to react to your live status mails before you "
@@ -1419 +1665 @@
 msgstr ""
 
-#: pages/emergencywp/emails.php:86
+#: pages/emergencywp/emails.php:87
 msgid ""
 "Time in days when trusty get confirm email, when mandator does not report "
@@ -1425 +1671 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:188
+#: lib/class.emergencyWPAdmin.php:1511
+#: pages/emergencywp/setting_tabs/settings_main.php:299
 msgid "Timeframe for confirmation (reaction time)"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:81
+#: lib/class.emergencyWPMessages.php:103
 msgid "Title"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:34
+#: pages/emergencywp/setting_tabs/instruction.php:35
 msgid ""
 "To run the life check process, a cronjob is needed. On a website with "
@@ -1441 +1688 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/settings_main.php:262
-msgid ""
-"Tracking disabled. We will try our best to improve the plugin even without "
-"tracking data"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/settings_main.php:257
-msgid "Tracking enabled for user improvements"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/settings_main.php:253
-msgid "Tracking setting"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/dashboard.php:254
-#: pages/emergencywp/setting_tabs/dashboard.php:529
+#: pages/emergencywp/setting_tabs/re_captcha.php:38
+msgid "To use this feature you need a free secret key and secret key from"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/re_captcha.php:30
+msgid "To use this feature you need a free site key and secret key from"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:1654
+#: pages/emergencywp/setting_tabs/dashboard.php:258
 msgid "Trustees"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:245
+#: pages/emergencywp/setting_tabs/dashboard.php:248
 msgid "Trustees Add-On"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:308
+#: pages/emergencywp/setting_tabs/debug.php:310
 msgid "Trustees confirm email send:  "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:257
+#: pages/emergencywp/setting_tabs/dashboard.php:261
 msgid ""
 "Trustees ensure that your processes won’t run too early. They’ll give "
@@ -1475 +1716 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:237
+#: pages/emergencywp/setting_tabs/debug.php:239
 msgid "Trustees information email sends:  "
 msgstr ""
 
+#: pages/emergencywp/setting_tabs/debug.php:191
+msgid "Trustees with reminder feedback:  "
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:131
+msgid "Trusty confirm period (alive/death) "
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/debug.php:148
+msgid "Trusty confirm period expires:  "
+msgstr ""
+
 #: pages/emergencywp/setting_tabs/debug.php:189
-msgid "Trustees with reminder feedback:  "
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:129
-msgid "Trusty confirm period (alive/death) "
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:146
-msgid "Trusty confirm period expires:  "
+msgid "Trusty confirm reminder expires:  "
 msgstr ""
 
 #: pages/emergencywp/setting_tabs/debug.php:187
-msgid "Trusty confirm reminder expires:  "
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:185
 msgid "Trusty confirm reminder send: "
 msgstr ""
 
+#: pages/emergencywp/setting_tabs/debug.php:247
+msgid "Trusty confirmation expires:  "
+msgstr ""
+
 #: pages/emergencywp/setting_tabs/debug.php:245
-msgid "Trusty confirmation expires:  "
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:243
 msgid "Trusty confirmation sends:  "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:310
+#: pages/emergencywp/setting_tabs/debug.php:312
 msgid "Trusty responsetime expires "
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/debug.php:317
+#: pages/emergencywp/setting_tabs/debug.php:319
+#: pages/emergencywp/setting_tabs/dashboard.php:52
 msgid "Unknown"
 msgstr ""
 
-#: views/messages/submit.php:38 views/messages/submit.php:50
-#: views/messages/detail.php:27 views/contacts/detail.php:26
+#: views/contacts/detail.php:27 views/messages/submit.php:38
+#: views/messages/submit.php:50
 msgid "Update"
 msgstr ""
 
-#: pages/emergencywp/emails.php:455
+#: pages/emergencywp/emails.php:429
 msgid "Update Message"
 msgstr ""
 
-#: pages/emergencywp/emails.php:154 pages/emergencywp/emails.php:167
-#: pages/emergencywp/emails.php:184 pages/emergencywp/emails.php:199
-#: pages/emergencywp/emails.php:214 pages/emergencywp/emails.php:216
+#: pages/emergencywp/emails.php:156 pages/emergencywp/emails.php:170
+#: pages/emergencywp/emails.php:190 pages/emergencywp/emails.php:207
+#: pages/emergencywp/emails.php:220 pages/emergencywp/emails.php:222
 msgid "URL to use in a link for the confirmation of your life"
 msgstr ""
 
-#: pages/emergencywp/emails.php:155 pages/emergencywp/emails.php:168
-#: pages/emergencywp/emails.php:185 pages/emergencywp/emails.php:200
-#: pages/emergencywp/emails.php:215
+#: pages/emergencywp/emails.php:157 pages/emergencywp/emails.php:171
+#: pages/emergencywp/emails.php:191 pages/emergencywp/emails.php:208
+#: pages/emergencywp/emails.php:221
 msgid "URL to your website"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:44
+#: pages/emergencywp/setting_tabs/cron.php:43
 msgid "Use a real cron to send emails"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:53
+#: pages/emergencywp/setting_tabs/cron.php:52
 #, php-format
 msgid ""
@@ -1547 +1789 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:41
+#: pages/emergencywp/setting_tabs/cron.php:40
 msgid "Use the wp_cron function to send mails and life checks"
 msgstr ""
 
-#: pages/emergencywp/emails.php:127 pages/emergencywp/emails.php:138
-#: pages/emergencywp/emails.php:151 pages/emergencywp/emails.php:165
-#: pages/emergencywp/emails.php:178 pages/emergencywp/emails.php:196
-#: pages/emergencywp/emails.php:213
+#: pages/emergencywp/emails.php:127 pages/emergencywp/emails.php:139
+#: pages/emergencywp/emails.php:152 pages/emergencywp/emails.php:167
+#: pages/emergencywp/emails.php:181 pages/emergencywp/emails.php:202
+#: pages/emergencywp/emails.php:219
 msgid "User Name (You!)"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:485
-#: pages/emergencywp/setting_tabs/dashboard.php:514
-#: pages/emergencywp/setting_tabs/dashboard.php:542
+#: lib/class.emergencyWPLicences.php:134
+msgid "Valid until: "
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/dashboard.php:419
+msgid "Vault Add-On"
+msgstr ""
+
+#: lib/class.emergencyWPAdmin.php:1609 lib/class.emergencyWPAdmin.php:1639
+#: lib/class.emergencyWPAdmin.php:1668
 msgid "View"
 msgstr ""
 
-#: lib/class.emergencyWPContacts.php:128 lib/class.emergencyWPContacts.php:129
+#: lib/class.emergencyWPContacts.php:129 lib/class.emergencyWPContacts.php:130
 msgid "View Contact"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:160 lib/class.emergencyWPMessages.php:161
+#: lib/class.emergencyWPMessages.php:216 lib/class.emergencyWPMessages.php:217
 msgid "View Message"
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:356
+#: pages/emergencywp/setting_tabs/settings_main.php:365
+msgid "visit"
+msgstr ""
+
+#: lib/class.emergencyWPJobController.php:412
 #, php-format
 msgid ""
@@ -1578 +1831 @@
 msgstr ""
 
-#: lib/class.emergencyWPShortcodes.php:42
+#: lib/class.emergencyWPAdmin.php:336 lib/class.emergencyWPShortcodes.php:31
 msgid "We are glad to hear that you are still alive. "
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:346
+#: lib/class.emergencyWPJobController.php:402
 msgid ""
 "We are sorry, but we could not identify your affiliation with reference to "
@@ -1589 +1842 @@
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:336
-#: lib/class.emergencyWPJobController.php:350
+#: lib/class.emergencyWPJobController.php:392
+#: lib/class.emergencyWPJobController.php:406
 msgid "We are sorry, but your response is out of time. "
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:358
+#: lib/class.emergencyWPJobController.php:414
 #, php-format
 msgid ""
@@ -1601 +1854 @@
 msgstr ""
 
-#: lib/class.emergencyWPShortcodes.php:71
-msgid ""
-"We are very sorry, but the key in your url is incorrect.<br />Please try "
-"again or contact our support! <span class=\"error-code\">[ErrorCode: ERR-JOB-"
-"999]</span> "
-msgstr ""
-
-#: lib/class.emergencyWPShortcodes.php:115
-msgid "We are very sorry, but your response is out of time."
-msgstr ""
-
 #: pages/emergencywp/setting_tabs/instruction.php:5
 msgid "What is EmergencyWP?"
@@ -1620 +1862 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:136
+#: pages/emergencywp/setting_tabs/cron.php:133
 msgid "why?"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:309
+#: pages/emergencywp/setting_tabs/dashboard.php:315
 msgid ""
 "With this add-on, messages and information can be send after a specific date "
@@ -1630 +1872 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:203
-msgid ""
-"With this add-on, you will have PRO access to features without limitations"
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/debug.php:39
+#: pages/emergencywp/setting_tabs/debug.php:37
 msgid ""
 "You are about to reset the life status, <br /> This means that the current "
@@ -1642 +1879 @@
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/cron.php:64
+#: pages/emergencywp/setting_tabs/cron.php:63
 msgid "You can keep a browser window open with following URL"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/email_templates.php:161
+#: pages/emergencywp/setting_tabs/email_templates.php:172
 msgid "You can use the following placeholders:"
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:352
+#: lib/class.emergencyWPJobController.php:408
 msgid "You have already confirmed the survival status (alive) "
 msgstr ""
 
-#: lib/class.emergencyWPJobController.php:354
+#: lib/class.emergencyWPJobController.php:410
 msgid "You have already confirmed the survival status (death) "
 msgstr ""
 
-#: pages/emergencywp/emails.php:235
+#: pages/emergencywp/emails.php:244
 msgid "You have no message specified!"
 msgstr ""
 
-#: pages/emergencywp/emails.php:234
+#: pages/emergencywp/emails.php:243
 msgid "You have not entered a subject!"
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:266
+#: lib/class.emergencyWPMessages.php:333
 msgid "You have not specified a message."
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:261
+#: lib/class.emergencyWPMessages.php:328
 msgid "You have not specified a subject."
 msgstr ""
 
-#: lib/class.emergencyWPMessages.php:271
+#: lib/class.emergencyWPMessages.php:338
 msgid "You have not specified contacts."
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/instruction.php:65
+#: lib/class.emergencyWPContacts.php:85 views/contacts/detail.php:50
+msgid ""
+"You have reached the maximum number of contacts. Please upgrade to PRO "
+"version to have unlimited contacts!"
+msgstr ""
+
+#: pages/emergencywp/setting_tabs/instruction.php:66
 msgid ""
 "You might store important or sensitive data here, so be sure to limit the "
@@ -1685 +1928 @@
 msgstr ""
 
-#: emergencywp.php:285 emergencywp.php:482 emergencywp.php:648
-msgid "Your license is not active for this URL."
-msgstr ""
-
-#: emergencywp.php:273 emergencywp.php:470 emergencywp.php:636
-#, php-format
-msgid "Your license key expired on %s."
-msgstr ""
-
-#: emergencywp.php:278 emergencywp.php:475 emergencywp.php:641
-msgid "Your license key has been disabled."
-msgstr ""
-
-#: emergencywp.php:291 emergencywp.php:488 emergencywp.php:654
-msgid "Your license key has reached its activation limit."
-msgstr ""
-
-#: emergencywp.php:164
-msgid "Your plugin is verified."
-msgstr ""
-
-#: pages/emergencywp/setting_tabs/dashboard.php:401
+#: pages/emergencywp/setting_tabs/dashboard.php:358
+#: pages/emergencywp/setting_tabs/dashboard.php:529
 msgid "Zapier Add-On"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:415
+#: pages/emergencywp/setting_tabs/dashboard.php:543
 msgid "Zapier Connection"
 msgstr ""
 
-#: pages/emergencywp/setting_tabs/dashboard.php:469
+#: lib/class.emergencyWPAdmin.php:1592
 msgid "Сontacts"
 msgstr ""

emergencywp/trunk/lib/class.emergencyWPAdmin.php

@@ -70 +70 @@
             '120' => __('2 minutes (for testing purposes)', 'emergencywp')
         );
+
+
+        $licenceDate = emergencywp_option(EWPSettingsData::LICENCE_DATE);
+        if (is_object($licenceDate)) {
+            $datetimeNow = new DateTime();
+            $interval = $datetimeNow->diff($licenceDate);
+            $value = $interval->format('%R%a');
+            if ($value > 10) {
+                emergencywp_update_option(EWPSettingsData::LICENCE_DATE, $datetimeNow->modify('-11 day'));
+                if (function_exists('emergencywp_edd_check_license')) {
+                    emergencywp_edd_check_license();
+                }
+            } else if ($value < -5) {
+                if (function_exists('emergencywp_edd_check_license')) {
+                    emergencywp_edd_check_license();
+                }
+            }
+        }
     }
 
@@ -816 +834 @@
     {
         $notices = get_option('emergencywp_' . $type . '_notices');
-        $notices = apply_filters('emergencywp_admin_notices', $type);
+
+        $notices = apply_filters('emergencywp_admin_notices', $notices);
 
         if (!empty($notices)) {
@@ -834 +853 @@
                     $wpNoticeClassName = '';
             }
+
             if (!empty($notices[$screen->post_type])) {
                 echo '<div class="notice ' . esc_html($wpNoticeClassName) . ' ' . esc_html($type) . '  is-dismissible">';
                 foreach ($notices[$screen->post_type] as $v) {
-                    echo '<p><strong>' . esc_html($v) . '</strong></p>';
+                    echo '<p><strong>' . $v . '</strong></p>';
                 }
                 echo '</div>';
@@ -845 +865 @@
                 echo '<div class="notice ' . esc_html($wpNoticeClassName) . ' ' . esc_html($type) . '  is-dismissible">';
                 foreach ($notices['emergencywp_settings'] as $v) {
-                    echo '<p><strong>' . esc_html($v) . '</strong></p>';
+                    echo '<p><strong>' . $v . '</strong></p>';
                 }
                 echo '</div>';
@@ -853 +873 @@
                 echo '<div class="notice ' . esc_html($wpNoticeClassName) . ' ' . esc_html($type) . '  is-dismissible">';
                 foreach ($notices['emergencywp_confirmation_page'] as $v) {
-                    echo '<p><strong>' . esc_html($v) . '</strong></p>';
+                    echo '<p><strong>' . $v . '</strong></p>';
                 }
                 echo '</div>';
@@ -861 +881 @@
                 echo '<div class="notice ' . esc_html($wpNoticeClassName) . ' ' . esc_html($type) . '  is-dismissible">';
                 foreach ($notices['emergencywp_contact_limit_exceeded'] as $v) {
-                    echo '<p><strong>' . esc_html($v) . '</strong></p>';
+                    echo '<p><strong>' . $v . '</strong></p>';
                 }
                 echo '</div>';
@@ -869 +889 @@
                 echo '<div class="notice ' . esc_html($wpNoticeClassName) . ' ' . esc_html($type) . '  is-dismissible">';
                 foreach ($notices['emergencywp_' . EmergencyWPZapierTriggers::$postTypeSlug] as $v) {
-                    echo '<p><strong>' . esc_html($v) . '</strong></p>';
+                    echo '<p><strong>' . $v . '</strong></p>';
                 }
                 echo '</div>';
@@ -877 +897 @@
                 echo '<div class="notice ' . esc_html($wpNoticeClassName) . ' ' . esc_html($type) . '  is-dismissible">';
                 foreach ($notices['emergencywp_' . emergencyWPContacts::$postTypeSlug] as $v) {
-                    echo '<p><strong>' . esc_html($v) . '</strong></p>';
+                    echo '<p><strong>' . $v . '</strong></p>';
                 }
                 echo '</div>';
@@ -1596 +1616 @@
             case DashboardWidgets::MESSAGES :
             {
-                $messages = get_posts('post_type=emergencywp_messages&post_status=any');
-                $messagesCount = count($messages);
+                $_messages = get_posts('post_type=emergencywp_messages&post_status=any');
+                $messagesCount = count($_messages);
                 ?>
                 <div class="info-box" id="ewp-messages">

emergencywp/trunk/lib/class.emergencyWPDeactivate.php

@@ -2 +2 @@
 class emergencyWPDeactivate {
 
-    function load(){
+    public static function load(){
     }
     

emergencywp/trunk/lib/class.emergencyWPJobController.php

@@ -192 +192 @@
         }
 
+        public static function getPendingTrustees($single = true)
+        {
+
+            $trustees = array();
+            $args = array(
+                'posts_per_page' => 20,
+                'offset' => 0,
+                'category' => '',
+                'category_name' => '',
+                'orderby' => 'post_date',
+                'order' => 'DESC',
+                'include' => '',
+                'exclude' => '',
+                'meta_key' => '',
+                'meta_value' => '',
+                'post_type' => 'emergencywp_trustees',
+                'post_mime_type' => '',
+                'post_parent' => '',
+                'suppress_filters' => true);
+
+            $trustyData = emergencyWPAdmin::getWpPost($args);
+            if ($trustyData !== false) {
+                foreach ($trustyData as $k => $trusty) {
+                    $trustyPostMeta = emergencyWPAdmin::getWpPostMeta($trusty->ID);
+
+                    if ($trustyPostMeta['emergencywp_trustees_status'][0] === "pending_email_changed") {
+                        $trustySinglePostMeta = array();
+                        if ($single === true) {
+                            foreach ($trustyPostMeta as $key => $v) {
+                                $trustySinglePostMeta[$key] = $v[0];
+                            }
+                        } else $trustySinglePostMeta = $trustyPostMeta;
+                        $trustees[] = array(
+                            'post' => $trusty,
+                            'postMeta' => $trustySinglePostMeta
+                        );
+                    }
+                }
+            } else {
+                echo "FALSE";
+            }
+            return $trustees;
+        }
+
         public static function getTrusteesWithResponse($jobStatus = null)
         {
@@ -244 +288 @@
             $aliveInfo = self::getAliveStatus();
 
+
             if ($aliveStatus === md5('alive')) $aliveStatus = 'alive';
             else if ($aliveStatus === md5('dead')) $aliveStatus = 'dead';
             else return -6;
+
 
             if (!is_array(@$aliveInfo['trustyFeedback'][$job])) return -8; // system Error aliveInfo array corrupted

emergencywp/trunk/lib/class.emergencyWPMessages.php

@@ -118 +118 @@
             'suppress_filters' => true
         );
-        $messages = emergencyWPAdmin::getWpPost($args);
-
-        if (count($messages)) {
-            foreach ($messages as $message) {
+        $_messages = emergencyWPAdmin::getWpPost($args);
+
+        if (count($_messages)) {
+            foreach ($_messages as $message) {
                 if (emergencyWPMessages::messageHasDeliveryConditionValues($message->ID)) {
                     $new_columns['delivery_conditions'] = __('Delivery Conditions', 'emergencywp-delivery-conditions');
@@ -156 +156 @@
                 break;
             case 'attachments':
-                $messages = emergencyWPAdmin::getWpPost($args);
-
-                if (count($messages)) {
-                    foreach ($messages as $message) {
+                $_messages = emergencyWPAdmin::getWpPost($args);
+
+                if (count($_messages)) {
+                    foreach ($_messages as $message) {
                         if (emergencyWPMessages::messageHasDeliveryConditionValues($message->ID)) {
                             $new_columns['delivery_conditions'] = __('Delivery Conditions', 'emergencywp');

emergencywp/trunk/lib/class.emergencyWPShortcodes.php

@@ -9 +9 @@
         $return = $error = $success = '';
         $aliveInfo = get_option('emergencyWP_alive_status');
+
 
         switch (sanitize_text_field(@$_REQUEST['type'])) {
@@ -27 +28 @@
                         }
                     }
-                } else if (sanitize_key(@$_REQUEST['mandatorKey']) === $aliveInfo['mandatorKey']) {
+                } else if (sanitize_key(@$_REQUEST['mandatorKey']) === $aliveInfo['mandatorKey'] || sanitize_key(@$_REQUEST['key']) === $aliveInfo['mandatorKey']) {
                     $success = __('We are glad to hear that you are still alive. ', 'emergencywp');
                     $confirmation_method = 'email';
@@ -115 +116 @@
             case md5('hold_d_conf'): // ??
             case md5('live_status_hold_d'):
+            case md5(UserStatus::EMERGENCY_TRUSTEE_EMAIL):
+
                 if (sanitize_key(@$_REQUEST['key']) === $aliveInfo['passThroughKey']) {
+                    //var_dump($aliveInfo['jobStatus']);
                     // Trusty response check
                     $check = emergencyWPJobController::checkTrustyResponse(sanitize_key(@$_REQUEST['hash']), $aliveInfo['jobStatus'], sanitize_text_field($_REQUEST['status']));
+                    //var_dump($check);
                     if ($check > 0) $success = emergencyWPJobController::getTrustyResponseText($check, $aliveInfo['jobStatus']);
-                    else $error = $error = emergencyWPJobController::getTrustyResponseText($check, $aliveInfo['jobStatus']);
+                    else $error = emergencyWPJobController::getTrustyResponseText($check, $aliveInfo['jobStatus']);
 
                     $last_hit = get_option('emergencywp_cron_lasthit');

emergencywp/trunk/lib/class.emergencyWPSystemEmails.php

@@ -119 +119 @@
             $responseUrlStart = '&';
         }
-
+        $urlJobResponse_options = emergencyWPAdmin::getPermalink('job_response_options');
+        if (strpos($urlJobResponse_options, '?') !== false) {
+            $responseUrlStart = '&';
+        }
         $responseUrl = emergencyWPAdmin::getPermalink('job_response_options') . $responseUrlStart . "type=" . md5(self::$postStatus) . "&mandatorKey=" . $aliveStatus['mandatorKey'];
 

emergencywp/trunk/lib/class.emergencyWPUninstall.php

@@ -2 +2 @@
 class emergencyWPUninstall {
 
-    function load(){
+    public static function load(){
         //self::deleteTrusteesActivatePage();
 

emergencywp/trunk/pages/emergencywp/setting_tabs/dashboard.php

@@ -9 +9 @@
         <li class="step-item <?php if ($aliveInfo['jobStatus'] === UserStatus::ALIVE) echo ' active'; ?>">
             <a href="#!" class="">
-                <span class="step-label">All well</span>
+                <span class="step-label"><?php echo __('All well', 'emergencywp'); ?></span>
             </a>
         </li>
         <li class="step-item <?php if ($aliveInfo['jobStatus'] === UserStatus::HOLD_A) echo ' active'; ?>">
             <a href="#!" class="">
-                <span class="step-label">Pending confirmation</span>
+                <span class="step-label"><?php echo __('Pending confirmation', 'emergencywp'); ?></span>
             </a>
         </li>
         <li class="step-item <?php if ($aliveInfo['jobStatus'] === UserStatus::FINAL_HOLD_A) echo ' active'; ?>">
             <a href="#!" class="">
-                <span class="step-label">Last call (urgent)</span>
+                <span class="step-label"><?php  echo __('Last call (urgent)', 'emergencywp'); ?></span>
             </a>
         </li>
@@ -25 +25 @@
             <li class="step-item <?php if ($aliveInfo['jobStatus'] === UserStatus::FINAL_HOLD_B) echo ' active'; ?>">
                 <a href="#!" class="">
-                    <span class="step-label">Pending trustees confirmation</span>
+                    <span class="step-label"><?php echo __('Pending trustees confirmation', 'emergencywp'); ?></span>
                 </a>
             </li>
             <li class="step-item <?php if ($aliveInfo['jobStatus'] === UserStatus::NO_REACTIONS_A) echo ' active'; ?>">
                 <a href="#!" class="">
-                    <span class="step-label">Last call for trustees</span>
+                    <span class="step-label"><?php  echo __('Last call for trustees', 'emergencywp'); ?></span>
                 </a>
             </li>
             <li class="step-item <?php if ($aliveInfo['jobStatus'] === UserStatus::FINAL_HOLD_C) echo ' active'; ?>">
                 <a href="#!" class="">
-                    <span class="step-label">Awaiting trustees consensus</span>
+                    <span class="step-label"><?php echo __('Awaiting trustees consensus', 'emergencywp'); ?></span>
                 </a>
             </li>
             <li class="step-item <?php if ($aliveInfo['jobStatus'] === UserStatus::HOLD_B) echo ' active'; ?>">
                 <a href="#!" class="">
-                    <span class="step-label">Final verification after trustees confirmation</span>
+                    <span class="step-label"><?php  echo __('Final verification after trustees confirmation', 'emergencywp'); ?></span>
                 </a>
             </li>
             <li class="step-item <?php if ($aliveInfo['jobStatus'] === UserStatus::FINAL_HOLD_D) echo ' active'; ?>">
                 <a href="#!" class="">
-                    <span class="step-label">Missing information</span>
+                    <span class="step-label"><?php echo __('Missing information', 'emergencywp'); ?></span>
                 </a>
             </li>
             <li class="step-item <?php if ($aliveInfo['jobStatus'] === UserStatus::UNKNOWN) echo ' active'; ?>">
                 <a href="#!" class="">
-                    <span class="step-label">Unknown</span>
+                    <span class="step-label"><?php  echo __('Unknown', 'emergencywp'); ?></span>
                 </a>
             </li>
@@ -56 +56 @@
         <li class="step-item <?php if ($aliveInfo['jobStatus'] === UserStatus::DEAD) echo ' active'; ?>">
             <a href="#!" class="">
-                <span class="step-label">Process finished</span>
+                <span class="step-label"><?php echo __('Process finished', 'emergencywp'); ?></span>
             </a>
         </li>

emergencywp/trunk/pages/emergencywp/setting_tabs/email_templates.php

@@ -28 +28 @@
         if ($emailAddOn == 'trustees') {
             EmergencyWPTrusteesSystemEmails::$aliveInfo = $emailFile;
-            EmergencyWPTrusteesSystemEmails::saveUserEmailTemplate(sanitize_text_field($_POST[emergencyWPSystemEmails::$postTypeSlug . "_message"]), $headers);
+            EmergencyWPTrusteesSystemEmails::saveUserEmailTemplate($_POST[emergencyWPSystemEmails::$postTypeSlug . "_message"], $headers);
         } else if ($emailAddOn == 'dc') {
             EmergencyWPDCSystemEmails::$aliveInfo = $emailFile;
-            EmergencyWPDCSystemEmails::saveUserEmailTemplate(sanitize_text_field($_POST[emergencyWPSystemEmails::$postTypeSlug . "_message"]), $headers);
+            EmergencyWPDCSystemEmails::saveUserEmailTemplate($_POST[emergencyWPSystemEmails::$postTypeSlug . "_message"], $headers);
         } else if ($emailAddOn == 'ewpVault') {
             EmergencyWPVaultSystemEmails::$aliveInfo = $emailFile;
-            EmergencyWPVaultSystemEmails::saveUserEmailTemplate(sanitize_text_field($_POST[emergencyWPSystemEmails::$postTypeSlug . "_message"]), $headers);
+            EmergencyWPVaultSystemEmails::saveUserEmailTemplate($_POST[emergencyWPSystemEmails::$postTypeSlug . "_message"], $headers);
         }  else {
             emergencyWPSystemEmails::$aliveInfo = $emailFile;
-            emergencyWPSystemEmails::saveUserEmailTemplate(sanitize_text_field($_POST[emergencyWPSystemEmails::$postTypeSlug . "_message"]), $headers);
+            emergencyWPSystemEmails::saveUserEmailTemplate($_POST[emergencyWPSystemEmails::$postTypeSlug . "_message"], $headers);
         }
     }

emergencywp/trunk/pages/emergencywp/setting_tabs/settings_main.php

@@ -361 +361 @@
             <?php
             if ($eWPJobConfirmationPage) {
-                echo '<span class="description">' . __("An obligatory page, where you need to place the [" . EWP_ShortCodes::JOB_HANDLER . "] shortcode", "emergencywp") . '
+                echo '<span class="description">' . sprintf(__("An obligatory page, where you need to place the [%s] shortcode", "emergencywp"),EWP_ShortCodes::JOB_HANDLER ) . '
                         <a href="post.php?post=' . (int)$eWPJobConfirmationPage . '&action=edit">' . __('edit', 'emergencywp') . '</a> ' .
                     __('or', 'emergencywp') . ' <a target="_blank" href="' . get_permalink($eWPJobConfirmationPage) . '" class="external">' . __('visit', 'emergencywp') . '</a></span>';
             } else {
-                echo '<span class="description">' . __("An obligatory page, where you need to place the [" . EWP_ShortCodes::JOB_HANDLER . "] shortcode", "emergencywp") . ' <a href="' . add_query_arg('ewp_create_confirmation_page', wp_create_nonce('ewp_create_confirmation_page'), admin_url()) . '">' . __('create it right now', 'emergencywp') . '</a></span>';
+                echo '<span class="description">' . sprintf(__("An obligatory page, where you need to place the [%s] shortcode", "emergencywp"),EWP_ShortCodes::JOB_HANDLER ) . ' <a href="' . add_query_arg('ewp_create_confirmation_page', wp_create_nonce('ewp_create_confirmation_page'), admin_url()) . '">' . __('create it right now', 'emergencywp') . '</a></span>';
             }
             ?>