Henry Bravo a7c28f5644 Fix conflic translates		2017-05-29 15:05:11 -05:00
..
de/LC_MESSAGES	Fix conflic translates	2017-05-29 15:05:11 -05:00