Stefan Parviainen 2c1618bc10 Fix conflict and update strings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>		2017-11-15 20:40:51 +01:00
..
strings	Fix conflict and update strings	2017-11-15 20:40:51 +01:00