Merge branch 'master' of github.com:board3/Board3-Portal into cleanup/tabs

Conflicts:
	root/includes/acp/acp_portal.php
	root/language/de/mods/info_acp_portal.php
	root/language/en/mods/info_acp_portal.php
This commit is contained in:
Marc Alexander
2013-01-04 16:59:37 +01:00
3 changed files with 553 additions and 462 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -57,6 +57,7 @@ $lang = array_merge($lang, array(
'DELETE_MODULE_CONFIRM' => 'Bist du sicher, dass du das Modul "%1$s" löschen möchtest?',
'MODULE_RESET_SUCCESS' => 'Modul Einstellungen erfolgreich zurückgesetzt.',
'MODULE_RESET_CONFIRM' => 'Bist du sicher, dass du die Einstellungen des Moduls "%1$s" zurücksetzen willst?',
'MODULE_NOT_EXISTS' => 'Das gewählte Modul existiert nicht.',
'MODULE_OPTIONS' => 'Modul Optionen',
'MODULE_NAME' => 'Modul Name',

View File

@@ -56,6 +56,7 @@ $lang = array_merge($lang, array(
'DELETE_MODULE_CONFIRM' => 'Are you sure you wish to delete the module "%1$s"?',
'MODULE_RESET_SUCCESS' => 'Successfully reset the module settings.',
'MODULE_RESET_CONFIRM' => 'Are you sure you wish to reset the settings of the module "%1$s"?',
'MODULE_NOT_EXISTS' => 'The selected module does not exist.',
'MODULE_OPTIONS' => 'Module options',
'MODULE_NAME' => 'Module name',