Even more constants/language strings rewritten, merge_array() now logs debug messages

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index a6a10877d2f0a03b043f512d4b5a0797438972b5..3056141d0c0a8ccbaa45a13ed908f93a3ad52717 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -87,6 +87,7 @@ inc/autopurge/purge-mails.php -text
 inc/autopurge/purge-tsks.php -text
 inc/autopurge/purge-unconfirmed.php -text
 inc/cache/.htaccess -text
+inc/cache/.revision -text
 inc/check-reset.php -text
 inc/config.php -text
 inc/databases.php -text
@@ -152,6 +153,7 @@ inc/extensions/ext-task.php -text
 inc/extensions/ext-theme.php -text
 inc/extensions/ext-top10.php -text
 inc/extensions/ext-transfer.php -text
+inc/extensions/ext-usage.php -text
 inc/extensions/ext-user.php -text
 inc/extensions/ext-wernis.php -text
 inc/extensions/ext-yoomedia.php -text
@@ -213,6 +215,7 @@ inc/language/task_de.php -text
 inc/language/theme_de.php -text
 inc/language/top10_de.php -text
 inc/language/transfer_de.php -text
+inc/language/usage_de.php -text
 inc/language/user_de.php -text
 inc/language/wernis_de.php -text
 inc/language/yoomedia_de.php -text
@@ -1227,6 +1230,7 @@ templates/de/html/ext/ext_doubler.tpl -text
 templates/de/html/ext/ext_events.tpl -text
 templates/de/html/ext/ext_holiday.tpl -text
 templates/de/html/ext/ext_html_mail.tpl -text
+templates/de/html/ext/ext_logs.tpl -text
 templates/de/html/ext/ext_mailid.tpl -text
 templates/de/html/ext/ext_maintenance.tpl -text
 templates/de/html/ext/ext_mediadata.tpl -text
@@ -1257,6 +1261,7 @@ templates/de/html/ext/ext_task.tpl -text
 templates/de/html/ext/ext_theme.tpl -text
 templates/de/html/ext/ext_top10.tpl -text
 templates/de/html/ext/ext_transfer.tpl -text
+templates/de/html/ext/ext_usage.tpl -text
 templates/de/html/ext/ext_user.tpl -text
 templates/de/html/ext/ext_wernis.tpl -text
 templates/de/html/ext/ext_yoomedia.tpl -text
@@ -1321,6 +1326,7 @@ templates/de/html/index.tpl -text
 templates/de/html/index_forward.tpl -text
 templates/de/html/infos.tpl -text
 templates/de/html/install/.htaccess -text
+templates/de/html/install/install_fatal_errors.tpl -text
 templates/de/html/install/install_fatal_row.tpl -text
 templates/de/html/install/install_fatal_table.tpl -text
 templates/de/html/install/install_finished.tpl -text