New extension added, minor fixes, new author added

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index d182a81d8651ea971791df70e87917056b85dd68..23ff93abc8ff9e13a6d342559722d39fdb8be27c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -106,6 +106,7 @@ inc/extensions/ext-bank.php -text
 inc/extensions/ext-beg.php -text
 inc/extensions/ext-birthday.php -text
 inc/extensions/ext-bonus.php -text
+inc/extensions/ext-booking.php -text
 inc/extensions/ext-cache.php -text
 inc/extensions/ext-country.php -text
 inc/extensions/ext-debug.php -text
@@ -113,6 +114,7 @@ inc/extensions/ext-demo.php -text
 inc/extensions/ext-doubler.php -text
 inc/extensions/ext-holiday.php -text
 inc/extensions/ext-html_mail.php -text
+inc/extensions/ext-iso3166.php -text
 inc/extensions/ext-mailid.php -text
 inc/extensions/ext-maintenance.php -text
 inc/extensions/ext-mediadata.php -text
@@ -157,6 +159,7 @@ inc/install-inc.php -text
 inc/js/.htaccess -text
 inc/language.php -text
 inc/language/.htaccess -text
+inc/language/_de.php -text
 inc/language/active_de.php -text
 inc/language/admins_de.php -text
 inc/language/autopurge_de.php -text
@@ -164,6 +167,7 @@ inc/language/bank_de.php -text
 inc/language/beg_de.php -text
 inc/language/birthday_de.php -text
 inc/language/bonus_de.php -text
+inc/language/booking_de.php -text
 inc/language/cache_de.php -text
 inc/language/country_de.php -text
 inc/language/de.php -text
@@ -207,6 +211,7 @@ inc/libs/admins_functions.php -text
 inc/libs/autopurge_functions.php -text
 inc/libs/beg_functions.php -text
 inc/libs/bonus_functions.php -text
+inc/libs/booking_functions.php -text
 inc/libs/cache_functions.php -text
 inc/libs/country_functions.php -text
 inc/libs/debug_functions.php -text
@@ -615,8 +620,10 @@ install/tables.sql -text
 /surfbar.php -text
 templates/.htaccess -text
 templates/de/.htaccess -text
+templates/de/emails/.htaccess -text
 templates/de/emails/add-points.tpl -text
 templates/de/emails/admin-del_links.tpl -text
+templates/de/emails/admin/.htaccess -text
 templates/de/emails/admin/admin_autopurge_del_mails.tpl -text
 templates/de/emails/admin/admin_autopurge_delete.tpl -text
 templates/de/emails/admin/admin_autopurge_inactive.tpl -text
@@ -629,7 +636,7 @@ templates/de/emails/admin/admin_edit_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_holiday_deactivated.tpl -text
 templates/de/emails/admin/admin_holiday_request.tpl -text
 templates/de/emails/admin/admin_holiday_unlock.tpl -text
-templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl -text
+templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_mydata_notify.tpl -text
 templates/de/emails/admin/admin_newsletter_request.tpl -text
@@ -653,15 +660,28 @@ templates/de/emails/admin/admin_support-order.tpl -text
 templates/de/emails/admin/admin_support-ordr.tpl -text
 templates/de/emails/admin/admin_support-reflink.tpl -text
 templates/de/emails/admin/admin_support-unconfirmed.tpl -text
+templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_active_pending.tpl -text
+templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl -text
 templates/de/emails/admin/admin_surfbar_url_confirmed.tpl -text
 templates/de/emails/admin/admin_surfbar_url_depleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_migrate.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_pending.tpl -text
+templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl -text
 templates/de/emails/admin/admin_surfbar_url_reg.tpl -text
 templates/de/emails/admin/admin_surfbar_url_rejected.tpl -text
+templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl -text
+templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_unlock.tpl -text
 templates/de/emails/admin/admin_transfer_ap.tpl -text
 templates/de/emails/admin/admin_transfer_points.tpl -text
+templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_wernis_request.tpl -text
 templates/de/emails/admins/.htaccess -text
 templates/de/emails/admins/admins_mail_contct_admin.tpl -text
@@ -685,10 +705,12 @@ templates/de/emails/del-user.tpl -text
 templates/de/emails/del_sponsor.tpl -text
 templates/de/emails/done-admin.tpl -text
 templates/de/emails/done-member.tpl -text
+templates/de/emails/guest/.htaccess -text
 templates/de/emails/guest/guest_request_confirm.tpl -text
 templates/de/emails/header.tpl -text
 templates/de/emails/lock-user.tpl -text
 templates/de/emails/lock_sponsor.tpl -text
+templates/de/emails/member/.htaccess -text
 templates/de/emails/member/member_autopurge_delete.tpl -text
 templates/de/emails/member/member_autopurge_inactive.tpl -text
 templates/de/emails/member/member_autopurge_points.tpl -text
@@ -705,7 +727,7 @@ templates/de/emails/member/member_holiday_activated.tpl -text
 templates/de/emails/member/member_holiday_removed.tpl -text
 templates/de/emails/member/member_holiday_request.tpl -text
 templates/de/emails/member/member_holiday_unlock.tpl -text
-templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl -text
+templates/de/emails/member/member_lock_active_surfbar_urls.tpl -text
 templates/de/emails/member/member_lock_locked_surfbar_urls.tpl -text
 templates/de/emails/member/member_mydata_notify.tpl -text
 templates/de/emails/member/member_newsletter_done.tpl -text
@@ -727,15 +749,28 @@ templates/de/emails/member/member_support-ordr.tpl -text
 templates/de/emails/member/member_support-reflink.tpl -text
 templates/de/emails/member/member_support-unconfirmed.tpl -text
 templates/de/emails/member/member_surfbar_low_points.tpl -text
+templates/de/emails/member/member_surfbar_url_active_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_active_pending.tpl -text
+templates/de/emails/member/member_surfbar_url_active_stopped.tpl -text
 templates/de/emails/member/member_surfbar_url_confirmed.tpl -text
 templates/de/emails/member/member_surfbar_url_depleted.tpl -text
+templates/de/emails/member/member_surfbar_url_locked_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_locked_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_migrate.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_pending.tpl -text
+templates/de/emails/member/member_surfbar_url_pending_deleted.tpl -text
 templates/de/emails/member/member_surfbar_url_reg.tpl -text
 templates/de/emails/member/member_surfbar_url_rejected.tpl -text
+templates/de/emails/member/member_surfbar_url_stopped_continued.tpl -text
+templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_stopped_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_unlock.tpl -text
 templates/de/emails/member/member_transfer_recipient.tpl -text
 templates/de/emails/member/member_transfer_sender.tpl -text
+templates/de/emails/member/member_undelete_active_surfbar_urls.tpl -text
 templates/de/emails/member/member_wernis_accepted.tpl -text
 templates/de/emails/member/member_wernis_rejected.tpl -text
 templates/de/emails/member/member_wernis_request.tpl -text
@@ -751,6 +786,7 @@ templates/de/emails/order-reject.tpl -text
 templates/de/emails/profile-updte.tpl -text
 templates/de/emails/register-admin.tpl -text
 templates/de/emails/register-member.tpl -text
+templates/de/emails/sponsor/.htaccess -text
 templates/de/emails/sponsor/sponsor_activate.tpl -text
 templates/de/emails/sponsor/sponsor_add_points.tpl -text
 templates/de/emails/sponsor/sponsor_change_data.tpl -text
@@ -1168,6 +1204,7 @@ templates/de/html/ext/ext_bank.tpl -text
 templates/de/html/ext/ext_beg.tpl -text
 templates/de/html/ext/ext_birthday.tpl -text
 templates/de/html/ext/ext_bonus.tpl -text
+templates/de/html/ext/ext_booking.tpl -text
 templates/de/html/ext/ext_cache.tpl -text
 templates/de/html/ext/ext_country.tpl -text
 templates/de/html/ext/ext_debug.tpl -text
@@ -1388,6 +1425,8 @@ templates/de/html/member/member_support_form.tpl -text
 templates/de/html/member/member_surfbar_book_dynamic.tpl -text
 templates/de/html/member/member_surfbar_book_static.tp -text
 templates/de/html/member/member_surfbar_book_static.tpl -text
+templates/de/html/member/member_surfbar_delete_action_form.tpl -text
+templates/de/html/member/member_surfbar_edit_action_form.tpl -text
 templates/de/html/member/member_surfbar_link.tpl -text
 templates/de/html/member/member_surfbar_list.tpl -text
 templates/de/html/member/member_surfbar_list_row.tpl -text