mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 16:03:47 +01:00
reverted change of r72367 and fixed the real cause for the mainscreen_message problem: YOU SHOULD NOT HAVE TRANSLATIONS FOR mainscreen_message; You may have to force the reload of new language file-information
This commit is contained in:
parent
d283757b8d
commit
6c1b4c588e
@ -1,5 +1,4 @@
|
||||
displays home home cs Zobrazuje hlavní stranu
|
||||
egroupware home cs eGroupWare
|
||||
home home cs Hlavní strana
|
||||
mainscreen_message home cs mainscreen_message
|
||||
there is a new version of egroupware available home cs Je k dispozici nová verze eGroupWare
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home de Home anzeigen
|
||||
egroupware home de EGRoupware
|
||||
home home de Home
|
||||
mainscreen_message home de Meldung auf dem Hauptbildschirm
|
||||
there is a new version of egroupware available home de Es steht eine neuere Version von EGroupware zur Verfügung
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home en Displays home
|
||||
egroupware home en eGroupWare
|
||||
home home en Home
|
||||
mainscreen_message home en mainscreen_message
|
||||
there is a new version of egroupware available home en There is a new version of eGroupWare available
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home es-es Muestra el inicio
|
||||
egroupware home es-es eGroupWare
|
||||
home home es-es Inicio
|
||||
mainscreen_message home es-es Mensaje de la pantalla principal
|
||||
there is a new version of egroupware available home es-es Hay disponible una nueva versión de eGroupWare
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home fi Näytä etusivu
|
||||
egroupware home fi eGroupWare
|
||||
home home fi Etusivu
|
||||
mainscreen_message home fi mainscreen_message
|
||||
there is a new version of egroupware available home fi Uudempi versio eGroupWaresta on saatavilla
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home fr Afficher l'écran d'accueil
|
||||
egroupware home fr eGroupWare
|
||||
home home fr Accueil
|
||||
mainscreen_message home fr Ecran principal des messages
|
||||
there is a new version of egroupware available home fr Une nouvelle version de eGroupWare est disponible
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home it Mostra home
|
||||
egroupware home it eGroupware
|
||||
home home it Home
|
||||
mainscreen_message home it Messaggio principale
|
||||
there is a new version of egroupware available home it C'è una nuova versione di eGroupWare disponibile
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home iw test
|
||||
egroupware home iw sdg
|
||||
home home iw gsg
|
||||
mainscreen_message home iw sgs
|
||||
there is a new version of egroupware available home iw sgsg
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home nl Toont start
|
||||
egroupware home nl eGroupware
|
||||
home home nl Start
|
||||
mainscreen_message home nl Bericht op startscherm
|
||||
there is a new version of egroupware available home nl Er is een nieuwe versie van eGroupWare beschikbaar
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home pt-br Exibe Página Inicial
|
||||
egroupware home pt-br eGroupWare
|
||||
home home pt-br Página Inicial
|
||||
mainscreen_message home pt-br Mensagem da tela principal
|
||||
there is a new version of egroupware available home pt-br Há uma nova versão do eGroupWare disponível
|
||||
|
@ -1,2 +1 @@
|
||||
mainscreen_message home pt Mensagem de boas vindas!
|
||||
there is a new version of egroupware available home pt Existe uma nova versão do eGroupWare disponível
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home ru Показать дом
|
||||
egroupware home ru eGroupWare
|
||||
home home ru Домой
|
||||
mainscreen_message home ru Сообщение основного экрана (?)
|
||||
there is a new version of egroupware available home ru Доступна новая версия eGroupWare
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home sk Zobrazí Domov
|
||||
egroupware home sk eGroupWare
|
||||
home home sk Domov
|
||||
mainscreen_message home sk -domovská stránka-
|
||||
there is a new version of egroupware available home sk Existuje už novšia verzia eGroupWare
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home sl Prikaže domačo stran
|
||||
egroupware home sl eGroupWare
|
||||
home home sl Domov
|
||||
mainscreen_message home sl Sporočilo uvodnega zaslona
|
||||
there is a new version of egroupware available home sl Na voljo je nova različica eGroupWare-a
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home sv Visar Hemsidan
|
||||
egroupware home sv eGroupWare
|
||||
home home sv Hem
|
||||
mainscreen_message home sv Hemsidan meddelanden
|
||||
there is a new version of egroupware available home sv En uppdaterad version av eGroupWare är tillgänglig
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home zh-tw 顯示首頁
|
||||
egroupware home zh-tw eGroupWare
|
||||
home home zh-tw 首頁
|
||||
mainscreen_message home zh-tw 首頁訊息
|
||||
there is a new version of egroupware available home zh-tw eGroupWare 有新版本推出了
|
||||
|
@ -1,5 +1,4 @@
|
||||
displays home home zh 显示首页
|
||||
egroupware home zh eGroupWare
|
||||
home home zh 首页
|
||||
mainscreen_message home zh 主窗口讯息
|
||||
there is a new version of egroupware available home zh eGroupWare 有最新版本推出
|
||||
|
@ -245,20 +245,13 @@ class translation
|
||||
static function add_app($app,$lang=False)
|
||||
{
|
||||
$lang = $lang ? $lang : self::$userlang;
|
||||
|
||||
if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang)
|
||||
{
|
||||
//$start = microtime(true);
|
||||
// for loginscreen we have to use a instance specific cache!
|
||||
$loaded =& egw_cache::getCache(in_array($app,self::$instance_specific_translations) ? egw_cache::INSTANCE : egw_cache::TREE,
|
||||
__CLASS__,$app.':'.$lang,array(__CLASS__,'load_app'),array($app,$lang));
|
||||
foreach(array_keys($loaded) as $key)
|
||||
{
|
||||
// as array_merge does renumber, and the padding of the loaded langs to the existing langs does lead to strange phenomenons
|
||||
// regarding the mainscreen_message, we do that the old fashioned way.
|
||||
if (!empty($loaded[$key])) self::$lang_arr[$key] = $loaded[$key];
|
||||
}
|
||||
//self::$lang_arr += $loaded; // use += instead of array_merge, as we have phrases with numerical index, which get renumbered by array_merge
|
||||
self::$lang_arr += $loaded; // use += instead of array_merge, as we have phrases with numerical index, which get renumbered by array_merge
|
||||
self::$loaded_apps[$app] = $lang;
|
||||
//error_log(__METHOD__."($app,$lang) took ".(1000*(microtime(true)-$start))." ms, loaded ".count($loaded)." phrases -> total=".count(self::$lang_arr).": ".function_backtrace());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user