Merge branch 'master' of github.com:EGroupware/egroupware

This commit is contained in:
Ralf Becker 2016-05-12 23:05:34 +02:00
commit 08f394e6df

View File

@ -378,7 +378,7 @@ class Translation
* How to load translations for a given app * How to load translations for a given app
* *
* Translations for common, preferences or admin are in spread over all applications. * Translations for common, preferences or admin are in spread over all applications.
* API has translations for some pseudo-apps. * Api, old phpgwapi and etemplate have translations for some pseudo-apps.
* *
* @var array app => app(s) or string 'all-apps' * @var array app => app(s) or string 'all-apps'
*/ */
@ -388,8 +388,9 @@ class Translation
'admin' => 'all-apps', 'admin' => 'all-apps',
'jscalendar' => array('phpgwapi'), 'jscalendar' => array('phpgwapi'),
'sitemgr-link' => array('sitemgr'), 'sitemgr-link' => array('sitemgr'),
'groupdav' => array('phpgwapi'), 'groupdav' => array('api'),
'login' => array('phpgwapi','registration'), 'developer_tools' => array('etemplate'),
'login' => array('api','registration'),
); );
/** /**