diff --git a/typo3/sysext/backend/Classes/Controller/BackendController.php b/typo3/sysext/backend/Classes/Controller/BackendController.php
index f2730773e2634b23921f2dda2679c864e545cc10..30cb953f77720bf20c425c483ed3ba14c05de0c3 100644
--- a/typo3/sysext/backend/Classes/Controller/BackendController.php
+++ b/typo3/sysext/backend/Classes/Controller/BackendController.php
@@ -485,21 +485,13 @@ class BackendController
'refresh_login_password' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_password'),
'refresh_login_emptyPassword' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_emptyPassword'),
'refresh_login_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_button'),
- 'refresh_logout_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_logout_button'),
'refresh_exit_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_exit_button'),
'please_wait' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.please_wait'),
- 'loadingIndicator' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:loadingIndicator'),
'be_locked' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.be_locked'),
- 'refresh_login_countdown_singular' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_countdown_singular'),
- 'refresh_login_countdown' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_countdown'),
'login_about_to_expire' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_about_to_expire'),
'login_about_to_expire_title' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_about_to_expire_title'),
'refresh_login_logout_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_logout_button'),
'refresh_login_refresh_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_refresh_button'),
- 'tabs_closeAll' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:tabs.closeAll'),
- 'tabs_closeOther' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:tabs.closeOther'),
- 'tabs_close' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:tabs.close'),
- 'tabs_openInBrowserWindow' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:tabs.openInBrowserWindow'),
'csh_tooltip_loading' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:csh_tooltip_loading')
);
$labels = array(
diff --git a/typo3/sysext/lang/locallang_core.xlf b/typo3/sysext/lang/locallang_core.xlf
index 26dc559a4668511c03be98487a2d0272f8db5ed9..4b132aa351d1c4d1302d6ecec3e2f54c644d8f7f 100644
--- a/typo3/sysext/lang/locallang_core.xlf
+++ b/typo3/sysext/lang/locallang_core.xlf
@@ -710,18 +710,9 @@ Do you want to refresh it now?</source>
<trans-unit id="mess.refresh_login_refresh_button">
<source>Stay logged in!</source>
</trans-unit>
- <trans-unit id="mess.refresh_logout_button">
- <source>Logout</source>
- </trans-unit>
<trans-unit id="mess.refresh_direct_logout_button">
<source>No, log out.</source>
</trans-unit>
- <trans-unit id="mess.refresh_login_countdown">
- <source>{0} seconds</source>
- </trans-unit>
- <trans-unit id="mess.refresh_login_countdown_singular">
- <source>{0} second</source>
- </trans-unit>
<trans-unit id="mess.refresh_login_logging_in">
<source>Logging in...</source>
</trans-unit>
@@ -1233,33 +1224,6 @@ Do you want to refresh it now?</source>
<trans-unit id="toolbarItems.sysinfo.webserver">
<source>Webserver</source>
</trans-unit>
- <trans-unit id="tabs.closeAll">
- <source>Close All Tabs</source>
- </trans-unit>
- <trans-unit id="tabs.closeOther">
- <source>Close Other Tabs</source>
- </trans-unit>
- <trans-unit id="tabs.close">
- <source>Close Tab</source>
- </trans-unit>
- <trans-unit id="tabs.openInBrowserWindow">
- <source>Open In Browser Window</source>
- </trans-unit>
- <trans-unit id="donateWindow.title">
- <source>TYPO3 donation notice</source>
- </trans-unit>
- <trans-unit id="donateWindow.message">
- <source><b>You have now used TYPO3 for more than three months.</b> It would be great if you could donate. TYPO3 is Open Source and relies heavily on donations from its users and supporters.<br/> <b>Thank you</b> for making this great Content Management System even better with your help!</source>
- </trans-unit>
- <trans-unit id="donateWindow.button_donate">
- <source>Donate now</source>
- </trans-unit>
- <trans-unit id="donateWindow.button_disable">
- <source>Never show again</source>
- </trans-unit>
- <trans-unit id="donateWindow.button_postpone">
- <source>Remind me later</source>
- </trans-unit>
<trans-unit id="ExtDirect.namespaceError" xml:space="preserve">
<source>Ext Direct error in "%s" with namespace: "%s"\n
Try to clear the TYPO3 cache and / or use parameter no_cache=1 as parameter in URL typo3/index.php\n\n
@@ -1280,9 +1244,6 @@ Check also the following points:\n
<trans-unit id="link.to.filefile.correctly">
<source>Please, do not link to this page.</source>
</trans-unit>
- <trans-unit id="loadingIndicator">
- <source>Loading ...</source>
- </trans-unit>
<trans-unit id="csh_tooltip_loading">
<source>Loading help...</source>
</trans-unit>
diff --git a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
index 5885fa5cee6491765afddce0a6c12a0df288ed10..58f021f1f8ccd498e47430bb796a756960ab5aac 100644
--- a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
@@ -249,42 +249,9 @@ class PreviewController extends AbstractController
'height' => 400
)
);
- $t3LLLcore = array(
- 'waitTitle' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_logging_in'),
- 'refresh_login_failed' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_failed'),
- 'refresh_login_failed_message' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_failed_message'),
- 'refresh_login_title' => sprintf($lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_title'), htmlspecialchars($backendUser->user['username'])),
- 'login_expired' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_expired'),
- 'refresh_login_username' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_username'),
- 'refresh_login_password' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_password'),
- 'refresh_login_emptyPassword' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_emptyPassword'),
- 'refresh_login_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_button'),
- 'refresh_logout_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_logout_button'),
- 'refresh_exit_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_exit_button'),
- 'please_wait' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.please_wait'),
- 'loadingIndicator' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:loadingIndicator'),
- 'be_locked' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.be_locked'),
- 'refresh_login_countdown_singular' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_countdown_singular'),
- 'refresh_login_countdown' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_countdown'),
- 'login_about_to_expire' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_about_to_expire'),
- 'login_about_to_expire_title' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.login_about_to_expire_title'),
- 'refresh_login_refresh_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_login_refresh_button'),
- 'refresh_direct_logout_button' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:mess.refresh_direct_logout_button'),
- 'tabs_closeAll' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:tabs.closeAll'),
- 'tabs_closeOther' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:tabs.closeOther'),
- 'tabs_close' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:tabs.close'),
- 'tabs_openInBrowserWindow' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:tabs.openInBrowserWindow'),
- 'donateWindow_title' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:donateWindow.title'),
- 'donateWindow_message' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:donateWindow.message'),
- 'donateWindow_button_donate' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:donateWindow.button_donate'),
- 'donateWindow_button_disable' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:donateWindow.button_disable'),
- 'donateWindow_button_postpone' => $lang->sL('LLL:EXT:lang/locallang_core.xlf:donateWindow.button_postpone')
- );
+
return '
TYPO3.configuration = ' . json_encode($t3Configuration) . ';
- TYPO3.LLL = {
- core : ' . json_encode($t3LLLcore) . '
- };
/**
* TypoSetup object.