Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-10-24 14:26:45 +02:00
commit bd151c2b83

View file

@ -1233,7 +1233,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="route_updated_loc_found">Route will be calculated once position is found</string>
<string name="osmand_parking_hours">Hours</string>
<string name="osmand_parking_minutes">Minutes</string>
<string name="osmand_parking_position_description_add_time">The car was parked at:</string>
<string name="osmand_parking_position_description_add_time">The car was parked at</string>
<string name="select_animate_speedup">Select speed of route simulation</string>
<string name="global_app_allocated_memory_descr">Allocated memory %1$s MB (Android limit %2$s MB, Dalvik %3$s MB).</string>
<string name="global_app_allocated_memory">Allocated memory</string>