resolved conflicts in source and new pending translations

This commit is contained in:
José Miguel González Aguilera 2016-12-15 07:47:13 +01:00
parent 96dbec47fb
commit a257417dee

File diff suppressed because it is too large Load diff