From: Dan Brown <redacted>
Date: Sat, 26 Jun 2021 10:19:21 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/arjvand/BookStack into arjvand-master
X-Git-Tag: v21.08~1^2~33
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/8a9505bf8cf0b6d7c7ac0fa5c72b5ac25e4f7b92?ds=inline;hp=-c

Merge branch 'master' of https://github.com/arjvand/BookStack into arjvand-master
---

8a9505bf8cf0b6d7c7ac0fa5c72b5ac25e4f7b92
diff --combined resources/lang/en/settings.php
index 8a7946b12,63d08e0e8..b04ea01cd
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@@ -92,6 -92,7 +92,7 @@@ return 
      'recycle_bin' => 'Recycle Bin',
      'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
      'recycle_bin_deleted_item' => 'Deleted Item',
+     'recycle_bin_deleted_parent' => 'Parent',
      'recycle_bin_deleted_by' => 'Deleted By',
      'recycle_bin_deleted_at' => 'Deletion Time',
      'recycle_bin_permanently_delete' => 'Permanently Delete',
@@@ -241,7 -242,6 +242,7 @@@
          'es_AR' => 'Español Argentina',
          'fr' => 'Français',
          'he' => 'עברית',
 +        'hr' => 'Hrvatski',
          'hu' => 'Magyar',
          'id' => 'Bahasa Indonesia',
          'it' => 'Italian',