Weblate 1278347931 Merge remote-tracking branch 'origin/master' ... Conflicts: OsmAnd/res/values-ar/strings.xml OsmAnd/res/values-ca/strings.xml OsmAnd/res/values-cs/strings.xml OsmAnd/res/values-de/strings.xml		2014-07-15 07:33:08 +02:00
..
bidforfix.xml	Translated using Weblate (Spanish)	2014-07-01 20:02:47 +02:00
strings.xml	Merge remote-tracking branch 'origin/master'	2014-07-15 07:33:08 +02:00