diff --git a/src/assets/js/wishlist.js b/src/assets/js/wishlist.js
index 7bb2522c..3b9c176a 100644
--- a/src/assets/js/wishlist.js
+++ b/src/assets/js/wishlist.js
@@ -33,25 +33,25 @@ $(function() {
     }
 
     /**
-     * Fulfill wish
+     * fulfil wish
      */
-    $(document).on('click', '.ui.button.fulfill', function() {
+    $(document).on('click', '.ui.button.fulfil', function() {
         var button = $(this);
         var card   = button.closest('.ui.card');
         var column = card.closest('.column');
 
         $('body')
         .modal({
-            title   : text.modal_wish_fulfill_title,
-            content : text.modal_wish_fulfill,
+            title   : text.modal_wish_fulfil_title,
+            content : text.modal_wish_fulfil,
             class   : 'tiny',
             actions : [
                 {
-                    text : text.modal_wish_fulfill_approve,
+                    text : text.modal_wish_fulfil_approve,
                     class: 'approve primary'
                 },
                 {
-                    text : text.modal_wish_fulfill_deny,
+                    text : text.modal_wish_fulfil_deny,
                     class: ''
                 }
             ],
diff --git a/src/classes/page.php b/src/classes/page.php
index fb4a4ef2..ea2b400f 100644
--- a/src/classes/page.php
+++ b/src/classes/page.php
@@ -245,10 +245,10 @@ class Page
                     modal_wishlist_delete_approve  : '<?= __('Yes, delete') ?>',
                     modal_wishlist_delete_deny     : '<?= __('No, keep') ?>',
 
-                    modal_wish_fulfill_title   : '<?= __('Really fulfill wish?') ?>',
-                    modal_wish_fulfill         : '<?= __('Would you really like to fulfill this wish? It will no longer appear in the wishlist for others anymore.') ?>',
-                    modal_wish_fulfill_approve : '<?= __('Yes, fulfill wish') ?>',
-                    modal_wish_fulfill_deny    : '<?= __('Cancel') ?>',
+                    modal_wish_fulfil_title   : '<?= __('Really fulfil wish?') ?>',
+                    modal_wish_fulfil         : '<?= __('Would you really like to fulfil this wish? It will no longer appear in the wishlist for others anymore.') ?>',
+                    modal_wish_fulfil_approve : '<?= __('Yes, fulfil wish') ?>',
+                    modal_wish_fulfil_deny    : '<?= __('Cancel') ?>',
                     modal_wish_delete_title   : '<?= __('Really delete?') ?>',
                     modal_wish_delete         : '<?= __('Would you really like to delete to this wish? It will be gone forever.') ?>',
                     modal_wish_delete_approve : '<?= __('Yes, delete') ?>',
@@ -277,14 +277,14 @@ class Page
                     form_prompt_integer              : '<?= __('{name} must be an integer') ?>',
                     form_prompt_decimal              : '<?= __('{name} must be a decimal number') ?>',
                     form_prompt_number               : '<?= __('{name} must be set to a number') ?>',
-                    form_prompt_is                   : '<?= __(addslashes('{name} must be \'{ruleValue}\'')) ?>',
-                    form_prompt_isExactly            : '<?= __(addslashes('{name} must be exactly \'{ruleValue}\'')) ?>',
-                    form_prompt_not                  : '<?= __(addslashes('{name} cannot be set to \'{ruleValue}\'')) ?>',
-                    form_prompt_notExactly           : '<?= __(addslashes('{name} cannot be set to exactly \'{ruleValue}\'')) ?>',
-                    form_prompt_contain              : '<?= __(addslashes('{name} cannot contain \'{ruleValue}\'')) ?>',
-                    form_prompt_containExactly       : '<?= __(addslashes('{name} cannot contain exactly \'{ruleValue}\'')) ?>',
-                    form_prompt_doesntContain        : '<?= __(addslashes('{name} must contain \'{ruleValue}\'')) ?>',
-                    form_prompt_doesntContainExactly : '<?= __(addslashes('{name} must contain exactly \'{ruleValue}\'')) ?>',
+                    form_prompt_is                   : '<?= __('{name} must be "{ruleValue}"') ?>',
+                    form_prompt_isExactly            : '<?= __('{name} must be exactly "{ruleValue}"') ?>',
+                    form_prompt_not                  : '<?= __('{name} cannot be set to "{ruleValue}"') ?>',
+                    form_prompt_notExactly           : '<?= __('{name} cannot be set to exactly "{ruleValue}"') ?>',
+                    form_prompt_contain              : '<?= __('{name} cannot contain "{ruleValue}"') ?>',
+                    form_prompt_containExactly       : '<?= __('{name} cannot contain exactly "{ruleValue}"') ?>',
+                    form_prompt_doesntContain        : '<?= __('{name} must contain "{ruleValue}"') ?>',
+                    form_prompt_doesntContainExactly : '<?= __('{name} must contain exactly "{ruleValue}"') ?>',
                     form_prompt_minLength            : '<?= __('{name} must be at least {ruleValue} characters') ?>',
                     form_prompt_length               : '<?= __('{name} must be at least {ruleValue} characters') ?>',
                     form_prompt_exactLength          : '<?= __('{name} must be exactly {ruleValue} characters') ?>',
diff --git a/src/classes/wish.php b/src/classes/wish.php
index db102d94..9e14707c 100644
--- a/src/classes/wish.php
+++ b/src/classes/wish.php
@@ -155,11 +155,11 @@ class Wish
 
             <div class="extra content buttons">
                 <?php if (!$userIsCurrent) { ?>
-                    <a class="ui small primary labeled icon button fulfill"
-                       title="<?= __('Fulfill wish') ?>"
+                    <a class="ui small primary labeled icon button fulfil"
+                       title="<?= __('fulfil wish') ?>"
                     >
                         <i class="gift icon"></i>
-                        <?= __('Fulfill wish') ?>
+                        <?= __('fulfil wish') ?>
                     </a>
                 <?php } ?>
 
diff --git a/src/pages/home.php b/src/pages/home.php
index ec59af2c..7f79f58a 100644
--- a/src/pages/home.php
+++ b/src/pages/home.php
@@ -63,7 +63,7 @@ $page->navigation();
 
         <div class="ui segment">
             <h2 class="ui header"><?= __('Use case') ?></h2>
-            <p><?= __('Your birthday is coming up and you just created a wishlist with all the cool stuff you want. Your friends and family want to make sure you get something you are happy with so you send them your wishlist link and if anybody decides to fulfill one of your wishes, it will disappear for everybody else.') ?></p>
+            <p><?= __('Your birthday is coming up and you just created a wishlist with all the cool stuff you want. Your friends and family want to make sure you get something you are happy with so you send them your wishlist link and if anybody decides to fulfil one of your wishes, it will disappear for everybody else.') ?></p>
         </div>
 
         <div class="ui segment">
diff --git a/src/pages/wishlist.php b/src/pages/wishlist.php
index 8eea8dc7..6a02d3bf 100644
--- a/src/pages/wishlist.php
+++ b/src/pages/wishlist.php
@@ -41,7 +41,7 @@ $page->navigation();
                         <?= __('Careful') ?>
                     </div>
                     <div class="text">
-                        <p><?= __('You are viewing your own wishlist! You will be able to see which wishes have already been fulfilled for you. Don\'t you want to be surprised?') ?></p>
+                        <p><?= __('You are viewing your own wishlist! You will be able to see which wishes have already been fulfiled for you. Don\'t you want to be surprised?') ?></p>
                         <p><?= __('It\'s probably best to just close this tab.') ?></p>
                     </div>
                 </div>
@@ -52,8 +52,8 @@ $page->navigation();
             <div class="ui segment">
                 <h2 class="ui header"><?= __('What to do?') ?></h2>
                 <p><?= sprintf(
-                    __('If you found a wish you would like to fulfill, click the %s button and it will become unavailable for others.'),
-                    '<span class="ui primary tiny horizontal label"><i class="gift icon"></i> ' . __('Fulfill wish') . '</span>'
+                    __('If you found a wish you would like to fulfil, click the %s button and it will become unavailable for others.'),
+                    '<span class="ui primary tiny horizontal label"><i class="gift icon"></i> ' . __('fulfil wish') . '</span>'
                 ) ?></p>
             </div>
         </div>