Naming-inconsistency fixed #2

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index fdbcdc6c979fe9753eb4b5d5734c8dee09915490..6eb4d5ab7fc8a766f29b77144eec43e9a2660750 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -28,6 +28,7 @@ DOCS/de/country/countries-full.sql -text
 DOCS/de/country/countries-sorted.sql -text
 DOCS/de/doubler/README.txt -text
 DOCS/de/engine/README.txt -text
+DOCS/de/network/README.txt -text
 DOCS/de/promoter.txt -text
 DOCS/de/rallye/README.txt -text
 DOCS/de/rewrite/.htaccess -text
@@ -96,7 +97,7 @@ inc/autopurge/purge-tsks.php -text
 inc/autopurge/purge-unconfirmed.php -text
 inc/cache/.htaccess -text
 inc/cache/_compiled/.htaccess -text
-inc/cache/_compiled/templates/.htaccess -text
+inc/cache/_compiled/html/.htaccess -text
 inc/classes/.htaccess -text
 inc/classes/cachesystem.class.php -text
 inc/classes/rdf.class.php -text
@@ -112,6 +113,7 @@ inc/debug/client/.htaccess -text
 inc/debug/relay/.htaccess -text
 inc/debug/request_ -text
 inc/debug/server/.htaccess -text
+inc/expression-functions.php -text
 inc/extensions-functions.php -text
 inc/extensions/.htaccess -text
 inc/extensions/ext- -text
@@ -132,6 +134,7 @@ inc/extensions/ext-debug.php -text
 inc/extensions/ext-demo.php -text
 inc/extensions/ext-doubler.php -text
 inc/extensions/ext-events.php -text
+inc/extensions/ext-grade.php -text
 inc/extensions/ext-holiday.php -text
 inc/extensions/ext-html_mail.php -text
 inc/extensions/ext-imprint.php -text
@@ -195,6 +198,7 @@ inc/install-functions.php -text
 inc/install-inc.php -text
 inc/js/.htaccess -text
 inc/js/js- -text
+inc/js/js-cookies_disabled.php -text
 inc/js/js-jquery.php -text
 inc/js/js-order_send.php -text
 inc/js/js-surfbar_member_book.php -text
@@ -228,6 +232,7 @@ inc/language/maintenance_de.php -text
 inc/language/mediadata_de.php -text
 inc/language/menu_de.php -text
 inc/language/mods_de.php -text
+inc/language/network_de.php -text
 inc/language/newsletter_de.php -text
 inc/language/nickname_de.php -text
 inc/language/online_de.php -text
@@ -254,6 +259,7 @@ inc/language/user_de.php -text
 inc/language/wernis_de.php -text
 inc/language/yoomedia_de.php -text
 inc/libs/.htaccess -text
+inc/libs/_functions.php -text
 inc/libs/active_functions.php -text
 inc/libs/admins_functions.php -text
 inc/libs/autopurge_functions.php -text
@@ -269,6 +275,7 @@ inc/libs/holiday_functions.php -text
 inc/libs/html_mail_functions.php -text
 inc/libs/jackpot_functions.php -text
 inc/libs/mediadata_functions.php -text
+inc/libs/network_functions.php -text
 inc/libs/newsletter_functions.php -text
 inc/libs/nickname_functions.php -text
 inc/libs/online_functions.php -text
@@ -326,6 +333,7 @@ inc/modules/admin/action-logout.php -text
 inc/modules/admin/action-menu.php -text
 inc/modules/admin/action-misc.php -text
 inc/modules/admin/action-mods.php -text
+inc/modules/admin/action-network.php -text
 inc/modules/admin/action-newsletter.php -text
 inc/modules/admin/action-payouts.php -text
 inc/modules/admin/action-primera.php -text
@@ -405,7 +413,6 @@ inc/modules/admin/what-config_yoomedia.php -text
 inc/modules/admin/what-del_email.php -text
 inc/modules/admin/what-del_holiday.php -text
 inc/modules/admin/what-del_sponsor.php -text
-inc/modules/admin/what-del_task.php -text
 inc/modules/admin/what-del_transfer.php -text
 inc/modules/admin/what-del_user.php -text
 inc/modules/admin/what-edit_emails.php -text
@@ -428,6 +435,9 @@ inc/modules/admin/what-list_country.php -text
 inc/modules/admin/what-list_doubler.php -text
 inc/modules/admin/what-list_holiday.php -text
 inc/modules/admin/what-list_links.php -text
+inc/modules/admin/what-list_network_params.php -text
+inc/modules/admin/what-list_network_types.php -text
+inc/modules/admin/what-list_networks.php -text
 inc/modules/admin/what-list_notifications.php -text
 inc/modules/admin/what-list_payouts.php -text
 inc/modules/admin/what-list_primera.php -text
@@ -457,6 +467,7 @@ inc/modules/admin/what-refbanner.php -text
 inc/modules/admin/what-repair_amnu.php -text
 inc/modules/admin/what-repair_cats.php -text
 inc/modules/admin/what-repair_gmnu.php -text
+inc/modules/admin/what-repair_lang.php -text
 inc/modules/admin/what-repair_mmnu.php -text
 inc/modules/admin/what-send_bonus.php -text
 inc/modules/admin/what-send_newsletter.php -text
@@ -654,6 +665,7 @@ inc/reset/reset_holiday.php -text
 inc/reset/reset_profile.php -text
 inc/reset/reset_surfbar.php -text
 inc/reset/reset_yoomedia.php -text
+inc/revision-functions.php -text
 inc/session-functions.php -text
 inc/session.php -text
 inc/sql-functions.php -text
@@ -711,6 +723,7 @@ templates/de/emails/admin/admin_rallye_no_notify.tpl -text
 templates/de/emails/admin/admin_rallye_notify.tpl -text
 templates/de/emails/admin/admin_rallye_purged.tpl -text
 templates/de/emails/admin/admin_refback.tpl -text
+templates/de/emails/admin/admin_report_bug.tpl -text
 templates/de/emails/admin/admin_reset_password.tpl -text
 templates/de/emails/admin/admin_sponsor_change_data.tpl -text
 templates/de/emails/admin/admin_sponsor_change_email.tpl -text
@@ -747,8 +760,6 @@ 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
 templates/de/emails/admins/admins_msg_contct_admin.tpl -text
-templates/de/emails/admins_mail_contct_admin.tpl -text
-templates/de/emails/admins_msg_contct_admin.tpl -text
 templates/de/emails/back-admin.tpl -text
 templates/de/emails/back-member.tpl -text
 templates/de/emails/beg/.htaccess -text
@@ -866,6 +877,9 @@ templates/de/html/admin/admin_add_banner.tpl -text
 templates/de/html/admin/admin_add_cat.tpl -text
 templates/de/html/admin/admin_add_country.tpl -text
 templates/de/html/admin/admin_add_max.tpl -text
+templates/de/html/admin/admin_add_network.tpl -text
+templates/de/html/admin/admin_add_network_params.tpl -text
+templates/de/html/admin/admin_add_network_type.tpl -text
 templates/de/html/admin/admin_add_payment.tpl -text
 templates/de/html/admin/admin_add_points.tpl -text
 templates/de/html/admin/admin_add_points_all.tpl -text
@@ -972,6 +986,10 @@ templates/de/html/admin/admin_del_cats_row.tpl -text
 templates/de/html/admin/admin_del_email_bonus.tpl -text
 templates/de/html/admin/admin_del_email_normal.tpl -text
 templates/de/html/admin/admin_del_email_notify.tpl -text
+templates/de/html/admin/admin_del_network_types.tpl -text
+templates/de/html/admin/admin_del_network_types_row.tpl -text
+templates/de/html/admin/admin_del_networks.tpl -text
+templates/de/html/admin/admin_del_networks_row.tpl -text
 templates/de/html/admin/admin_del_payments.tpl -text
 templates/de/html/admin/admin_del_payments_row.tpl -text
 templates/de/html/admin/admin_del_sponsor.tpl -text
@@ -988,6 +1006,10 @@ templates/de/html/admin/admin_edit_cats_row.tpl -text
 templates/de/html/admin/admin_edit_email.tpl -text
 templates/de/html/admin/admin_edit_email_row.tpl -text
 templates/de/html/admin/admin_edit_email_select.tpl -text
+templates/de/html/admin/admin_edit_network_types.tpl -text
+templates/de/html/admin/admin_edit_network_types_row.tpl -text
+templates/de/html/admin/admin_edit_networks.tpl -text
+templates/de/html/admin/admin_edit_networks_row.tpl -text
 templates/de/html/admin/admin_edit_payments.tpl -text
 templates/de/html/admin/admin_edit_payments_row.tpl -text
 templates/de/html/admin/admin_edit_rallyes.tpl -text
@@ -1001,6 +1023,7 @@ templates/de/html/admin/admin_edit_user.tpl -text
 templates/de/html/admin/admin_email_archiv.tpl -text
 templates/de/html/admin/admin_email_archiv_row.tpl -text
 templates/de/html/admin/admin_email_nav_row.tpl -text
+templates/de/html/admin/admin_expert_settings_form.tpl -text
 templates/de/html/admin/admin_ext_notes.tpl -text
 templates/de/html/admin/admin_ext_reg_form.tpl -text
 templates/de/html/admin/admin_ext_sql_row.tpl -text
@@ -1011,7 +1034,6 @@ templates/de/html/admin/admin_extensions_delete_row.tpl -text
 templates/de/html/admin/admin_extensions_delete_row_404.tpl -text
 templates/de/html/admin/admin_extensions_edit.tpl -text
 templates/de/html/admin/admin_extensions_edit_row.tpl -text
-templates/de/html/admin/admin_extensions_installed.tpl -text
 templates/de/html/admin/admin_extensions_row.tpl -text
 templates/de/html/admin/admin_extensions_text.tpl -text
 templates/de/html/admin/admin_footer.tpl -text
@@ -1039,6 +1061,8 @@ templates/de/html/admin/admin_list_bonus_rows.tpl -text
 templates/de/html/admin/admin_list_cats.tpl -text
 templates/de/html/admin/admin_list_cats_404.tpl -text
 templates/de/html/admin/admin_list_cats_row.tpl -text
+templates/de/html/admin/admin_list_chk_reg.tpl -text
+templates/de/html/admin/admin_list_chk_reg_row.tpl -text
 templates/de/html/admin/admin_list_country.tpl -text
 templates/de/html/admin/admin_list_country_del_row.tpl -text
 templates/de/html/admin/admin_list_country_edit_row.tpl -text
@@ -1060,6 +1084,12 @@ templates/de/html/admin/admin_list_links_problem.tpl -text
 templates/de/html/admin/admin_list_links_row.tpl -text
 templates/de/html/admin/admin_list_mods.tpl -text
 templates/de/html/admin/admin_list_mods_row.tpl -text
+templates/de/html/admin/admin_list_network_params.tpl -text
+templates/de/html/admin/admin_list_network_params_row.tpl -text
+templates/de/html/admin/admin_list_network_types.tpl -text
+templates/de/html/admin/admin_list_network_types_row.tpl -text
+templates/de/html/admin/admin_list_networks.tpl -text
+templates/de/html/admin/admin_list_networks_row.tpl -text
 templates/de/html/admin/admin_list_notify_emails.tpl -text
 templates/de/html/admin/admin_list_notify_emails_row.tpl -text
 templates/de/html/admin/admin_list_online.tpl -text
@@ -1154,6 +1184,9 @@ templates/de/html/admin/admin_mods_stats.tpl -text
 templates/de/html/admin/admin_mods_stats2.tpl -text
 templates/de/html/admin/admin_mods_stats2_row.tpl -text
 templates/de/html/admin/admin_mods_stats_row.tpl -text
+templates/de/html/admin/admin_network_added.tpl -text
+templates/de/html/admin/admin_network_request_param_added.tpl -text
+templates/de/html/admin/admin_network_type_added.tpl -text
 templates/de/html/admin/admin_newsletter.tpl -text
 templates/de/html/admin/admin_newsletter_nohtml.tpl -text
 templates/de/html/admin/admin_next_link.tpl -text
@@ -1188,9 +1221,11 @@ templates/de/html/admin/admin_refbanner.tpl -text
 templates/de/html/admin/admin_refbanner_edit.tpl -text
 templates/de/html/admin/admin_refbanner_edit_row.tpl -text
 templates/de/html/admin/admin_refbanner_row.tpl -text
-templates/de/html/admin/admin_reg.tpl -text
 templates/de/html/admin/admin_reg_form.tpl -text
-templates/de/html/admin/admin_reg_row.tpl -text
+templates/de/html/admin/admin_repair_lang.tpl -text
+templates/de/html/admin/admin_repair_lang_row_404.tpl -text
+templates/de/html/admin/admin_repair_lang_row_compares.tpl -text
+templates/de/html/admin/admin_repair_lang_row_diff.tpl -text
 templates/de/html/admin/admin_reset_pass_done.tpl -text
 templates/de/html/admin/admin_reset_password.tpl -text
 templates/de/html/admin/admin_reset_password_form.tpl -text
@@ -1199,6 +1234,7 @@ templates/de/html/admin/admin_send_bonus_select.tpl -text
 templates/de/html/admin/admin_send_reset_link.tpl -text
 templates/de/html/admin/admin_send_yoomedia.tpl -text
 templates/de/html/admin/admin_settings_saved.tpl -text
+templates/de/html/admin/admin_settings_unsaved.tpl -text
 templates/de/html/admin/admin_sponsor_paytypes.tpl -text
 templates/de/html/admin/admin_sub_points.tpl -text
 templates/de/html/admin/admin_sub_points_all.tpl -text
@@ -1232,6 +1268,7 @@ templates/de/html/admin/admin_welcome.tpl -text
 templates/de/html/admin/admin_welcome_admins.tpl -text
 templates/de/html/admin/admin_yoomedia_error.tpl -text
 templates/de/html/agb.tpl -text
+templates/de/html/app_die_message.tpl -text
 templates/de/html/beg/.htaccess -text
 templates/de/html/beg/beg_banner.tpl -text
 templates/de/html/beg/beg_done.tpl -text
@@ -1248,6 +1285,7 @@ templates/de/html/copyright.tpl -text
 templates/de/html/copyright_backlink.tpl -text
 templates/de/html/css_inline.tpl -text
 templates/de/html/doubler/.htaccess -text
+templates/de/html/doubler/doubler_banner.tpl -text
 templates/de/html/doubler/doubler_footer.tpl -text
 templates/de/html/doubler/doubler_header.tpl -text
 templates/de/html/doubler/doubler_index.tpl -text
@@ -1270,6 +1308,7 @@ templates/de/html/ext/ext_debug.tpl -text
 templates/de/html/ext/ext_demo.tpl -text
 templates/de/html/ext/ext_doubler.tpl -text
 templates/de/html/ext/ext_events.tpl -text
+templates/de/html/ext/ext_grade.tpl -text
 templates/de/html/ext/ext_holiday.tpl -text
 templates/de/html/ext/ext_html_mail.tpl -text
 templates/de/html/ext/ext_imprint.tpl -text
@@ -1392,6 +1431,7 @@ templates/de/html/install/install_page3.tpl -text
 templates/de/html/install/install_page5.tpl -text
 templates/de/html/install/install_welcome.tpl -text
 templates/de/html/js/.htaccess -text
+templates/de/html/js/js_cookies_disabled.tpl -text
 templates/de/html/js/js_jquery.tpl -text
 templates/de/html/js/js_order_send.tpl -text
 templates/de/html/js/js_surfbar_member_book.tpl -text
@@ -1458,7 +1498,6 @@ templates/de/html/member/member_menu_title.tpl -text
 templates/de/html/member/member_menu_whats.tpl -text
 templates/de/html/member/member_mydata_button.tpl -text
 templates/de/html/member/member_mydata_edit.tpl -text
-templates/de/html/member/member_mydata_locked.tpl -text
 templates/de/html/member/member_mydata_overview.tpl -text
 templates/de/html/member/member_newsletter.tpl -text
 templates/de/html/member/member_nickname_form.tpl -text
@@ -1575,6 +1614,8 @@ templates/de/html/register_header.tpl -text
 templates/de/html/removeip_level.tpl -text
 templates/de/html/runtime_fatal_row.tpl -text
 templates/de/html/runtime_fatal_table.tpl -text
+templates/de/html/select/.htaccess -text
+templates/de/html/select/select_network_box.tpl -text
 templates/de/html/show_bonus.tpl -text
 templates/de/html/show_bonus_footer.tpl -text
 templates/de/html/show_bonus_header.tpl -text
@@ -1609,9 +1650,19 @@ templates/de/html/theme/theme_select_form.tpl -text
 templates/de/html/uberwach/.htaccess -text
 templates/de/html/uberwach/uberwach_snippet.tpl -text
 templates/de/html/welcome.tpl -text
+templates/en/.htaccess -text
+templates/en/emails/.htaccess -text
+templates/en/emails/admin/.htaccess -text
+templates/en/emails/guest/.htaccess -text
+templates/en/emails/member/.htaccess -text
+templates/en/html/.htaccess -text
+templates/en/html/admin/.htaccess -text
 templates/en/html/admin/admin_welcome.tpl -text
+templates/en/html/guest/.htaccess -text
 templates/en/html/impressum.tpl -text
+templates/en/html/install/.htaccess -text
 templates/en/html/mailid/.htaccess -text
+templates/en/html/member/.htaccess -text
 templates/en/html/register_header.tpl -text
 templates/en/html/welcome.tpl -text
 theme/business/css/active.css -text
@@ -1621,9 +1672,11 @@ theme/business/css/doubler.css -text
 theme/business/css/general.css -text
 theme/business/css/imprint.css -text
 theme/business/css/install.css -text
+theme/business/css/mailid.css -text
 theme/business/css/register.css -text
 theme/business/css/sponsor.css -text
 theme/business/css/surfbar.css -text
+theme/business/css/task.css -text
 theme/business/css/top10.css -text
 theme/business/css/transfer.css -text
 theme/business/css/uberwach.css -text
@@ -1637,9 +1690,11 @@ theme/default/css/doubler.css -text
 theme/default/css/general.css -text
 theme/default/css/imprint.css -text
 theme/default/css/install.css -text
+theme/default/css/mailid.css -text
 theme/default/css/register.css -text
 theme/default/css/sponsor.css -text
 theme/default/css/surfbar.css -text
+theme/default/css/task.css -text
 theme/default/css/top10.css -text
 theme/default/css/transfer.css -text
 theme/default/css/uberwach.css -text
@@ -1651,13 +1706,13 @@ theme/desert/css/beg.css -text
 theme/desert/css/bonus.css -text
 theme/desert/css/doubler.css -text
 theme/desert/css/general.css -text
-theme/desert/css/help.css -text
 theme/desert/css/imprint.css -text
 theme/desert/css/install.css -text
-theme/desert/css/paidlinks.css -text
+theme/desert/css/mailid.css -text
 theme/desert/css/register.css -text
 theme/desert/css/sponsor.css -text
 theme/desert/css/surfbar.css -text
+theme/desert/css/task.css -text
 theme/desert/css/top10.css -text
 theme/desert/css/transfer.css -text
 theme/desert/css/uberwach.css -text