X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=.gitattributes;h=ab19be6dcdbb9ad1ac5f43f417e803033483aecc;hb=50cec5fbac1b8b7427f016bf02c93cb1aa7bb9e1;hp=e29c0e11d59715ace53316b66c6463994073c391;hpb=80e2def8ef2125fd4d7d1312ee3993ab613f0846;p=mailer.git

diff --git a/.gitattributes b/.gitattributes
index e29c0e11d5..ab19be6dcd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -79,6 +79,7 @@ inc/.htaccess -text
 inc/.secret/.htaccess -text
 inc/autopurge.php -text
 inc/cache/.htaccess -text
+inc/check-reset.php -text
 inc/config.php -text
 inc/databases.php -text
 inc/db/.htaccess -text
@@ -403,7 +404,6 @@ inc/modules/guest/what-impressum.php -text
 inc/modules/guest/what-infos.php -text
 inc/modules/guest/what-login.php -text
 inc/modules/guest/what-mediadata.php -text
-inc/modules/guest/what-my_weblog.php -text
 inc/modules/guest/what-rallyes.php -text
 inc/modules/guest/what-register.php -text
 inc/modules/guest/what-sponsor_agb.php -text
@@ -595,6 +595,8 @@ 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_locked_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_mydata_notify.tpl -text
 templates/de/emails/admin/admin_new_ext.tpl -text
 templates/de/emails/admin/admin_newsletter_request.tpl -text
@@ -667,6 +669,8 @@ 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_locked_surfbar_urls.tpl -text
 templates/de/emails/member/member_mydata_notify.tpl -text
 templates/de/emails/member/member_newsletter_done.tpl -text
 templates/de/emails/member/member_newsletter_request.tpl -text
@@ -960,6 +964,8 @@ templates/de/html/admin/admin_list_user_sort_form.tpl -text
 templates/de/html/admin/admin_list_wernis_main.tpl -text
 templates/de/html/admin/admin_list_wernis_row.tpl -text
 templates/de/html/admin/admin_lock_sponsor.tpl -text
+templates/de/html/admin/admin_lock_surfbar_urls.tpl -text
+templates/de/html/admin/admin_lock_surfbar_urls_row.tpl -text
 templates/de/html/admin/admin_lock_user.tpl -text
 templates/de/html/admin/admin_login_form.tpl -text
 templates/de/html/admin/admin_login_msg.tpl -text
@@ -1271,11 +1277,9 @@ templates/de/html/member/member_points_row.tpl -text
 templates/de/html/member/member_points_upgrade.tpl -text
 templates/de/html/member/member_primera.tpl -text
 templates/de/html/member/member_primera_form.tpl -text
-templates/de/html/member/member_primera_mode_choose.tpl -text
 templates/de/html/member/member_primera_mode_list.tpl -text
 templates/de/html/member/member_primera_mode_list_row.tpl -text
 templates/de/html/member/member_primera_mode_pay.tpl -text
-templates/de/html/member/member_primera_mode_withdraw.tpl -text
 templates/de/html/member/member_receive_table.tpl -text
 templates/de/html/member/member_reflinks_row.tpl -text
 templates/de/html/member/member_reflinks_table.tpl -text
@@ -1301,11 +1305,9 @@ templates/de/html/member/member_welcome_footer.tpl -text
 templates/de/html/member/member_welcome_header.tpl -text
 templates/de/html/member/member_wernis.tpl -text
 templates/de/html/member/member_wernis_form.tpl -text
-templates/de/html/member/member_wernis_mode_choose.tpl -text
 templates/de/html/member/member_wernis_mode_list.tpl -text
 templates/de/html/member/member_wernis_mode_list_row.tpl -text
 templates/de/html/member/member_wernis_mode_pay.tpl -text
-templates/de/html/member/member_wernis_mode_withdraw.tpl -text
 templates/de/html/member/member_wernis_row.tpl -text
 templates/de/html/message.tpl -text
 templates/de/html/metadata.tpl -text