From b161002ab439282dd8208b61bba92f0c78c0cd75 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 11 May 2010 12:59:47 +0000
Subject: [PATCH] fix warning regarding unsupported operand types; translations
 provided by mkk

---
 infolog/inc/class.infolog_bo.inc.php | 2 +-
 infolog/inc/class.infolog_ui.inc.php | 2 +-
 infolog/lang/egw_en.lang             | 2 ++
 infolog/lang/egw_fi.lang             | 6 ++++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index bf7cdc025b..13e5c19023 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -191,7 +191,7 @@ class infolog_bo
 					{
 						$this->status[$key] = array();
 					}
-					$this->status[$key] = array_merge($this->status[$key],$config_data['status'][$key]);
+					$this->status[$key] = array_merge($this->status[$key],(array)$config_data['status'][$key]);
 				}
 			}
 			if (isset($config_data['types']) && is_array($config_data['types']))
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index e366749c3f..2c7e5df3d5 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -442,7 +442,7 @@ class infolog_ui
 			$rows['sel_options']['info_status'] = array();
 			foreach($this->bo->status as $typ => $stati)
 			{
-				if ($typ != 'defaults') $rows['sel_options']['info_status'] += $stati;
+				if ($typ != 'defaults' && !empty($stati)) $rows['sel_options']['info_status'] += $stati;
 			}
 		}
 		if ($this->bo->history)
diff --git a/infolog/lang/egw_en.lang b/infolog/lang/egw_en.lang
index a8891a646d..c093bf21ca 100644
--- a/infolog/lang/egw_en.lang
+++ b/infolog/lang/egw_en.lang
@@ -205,6 +205,7 @@ location	infolog	en	Location
 longer textual description	infolog	en	longer textual description
 low	infolog	en	low
 max length of the input [, length of the inputfield (optional)]	infolog	en	max length of the input [, length of the input field (optional)]
+modifier	infolog	en	Modifier
 modifierer	infolog	en	Modifierer
 name must not be empty !!!	infolog	en	Name must not be empty !!!
 name of new type to create	infolog	en	name of new type to create
@@ -339,6 +340,7 @@ sub-entries become subs of the parent or main entries, if there's no parent	info
 subject	infolog	en	Subject
 sum	infolog	en	Sum
 task	infolog	en	ToDo
+tasks of	infolog	en	Tasks of
 template	infolog	en	Template
 test import (show importable records <u>only</u> in browser)	infolog	en	Test Import (show importable records <u>only</u> in browser)
 the name used internaly (<= 10 chars), changeing it makes existing data unavailible	infolog	en	the name used internally (<= 10 chars), changing it makes existing data unavailable
diff --git a/infolog/lang/egw_fi.lang b/infolog/lang/egw_fi.lang
index d6f771e15f..242dcfd474 100644
--- a/infolog/lang/egw_fi.lang
+++ b/infolog/lang/egw_fi.lang
@@ -1,4 +1,4 @@
-%1 days in advance	infolog	fi	%1 päivä(ä) etukäteen
+%1 days in advance	infolog	fi	%1 päivää etukäteen
 %1 deleted	infolog	fi	%1 poistettu
 %1 deleted by %2 at %3	infolog	fi	%1 poistanut: %2, klo %3
 %1 modified	infolog	fi	%1 muokattu
@@ -198,6 +198,7 @@ location	infolog	fi	Sijainti
 longer textual description	infolog	fi	Pitempi tekstikuvaus
 low	infolog	fi	Matala
 max length of the input [, length of the inputfield (optional)]	infolog	fi	Kentän tekstin maksimipituus [, kentän maksimi pituus(vaihtoehtoinen)]
+modifier	infolog	fi	Muokkaaja
 modifierer	infolog	fi	Muokkaaja
 name must not be empty !!!	infolog	fi	Nimikenttä ei saa olla tyhjä !!!
 name of new type to create	infolog	fi	Luotavan tyypin nimi
@@ -332,6 +333,7 @@ sub-entries become subs of the parent or main entries, if there's no parent	info
 subject	infolog	fi	Aihe
 sum	infolog	fi	Summa
 task	infolog	fi	Tehtävä
+tasks of	infolog	fi	Tehtävät:
 template	infolog	fi	Mallipohja
 test import (show importable records <u>only</u> in browser)	infolog	fi	Testi Tuonti (näytä tuotavat tietueet <u>vain</u> selaimessa)
 the name used internaly (<= 10 chars), changeing it makes existing data unavailible	infolog	fi	Nimi on sisäisessä käytössä (<= 10 merkkiä), sen muuttaminen aiheuttaa nykyisen tiedon menettämisen.
@@ -359,7 +361,7 @@ urgent	infolog	fi	Tärkeä
 used time	infolog	fi	Käytetty aika
 valid path on clientside<br>eg. \\server\share or e:\	infolog	fi	polku asiakkaan puolella<br>eg. \\Server\Share tai e:\
 valid path on clientside<br>eg. \servershare or e:	infolog	fi	polku asiakkaan puolella<br>eg. \\Server\Share tai e:\
-valid path on clientside<br>eg. servershare or e:	infolog	fi	Polku asiakkaan puolella<br>eg. \\Server\Share tai e:\
+valid path on clientside<br>eg. servershare or e:	infolog	fi	polku asiakkaan puolella<br>eg. \\Server\Share tai e:\
 values for selectbox	infolog	fi	Valintalaatikon arvot
 view all subs of this entry	infolog	fi	Näytä kaikki tämän merkinnän alimerkinnät
 view other subs	infolog	fi	Näytä muut alimerkinnät