Merge remote-tracking branch 'weblate/master'

Conflicts:
	OsmAnd/res/values-b+kab/strings.xml
This commit is contained in:
Victor Shcherb 2018-03-12 09:39:03 +01:00
commit 296f52b431
3 changed files with 8 additions and 3 deletions

View file

@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="rendering_value_car_name">Takeṛṛust</string>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<resources>
<string name="rendering_value_car_name">Takeṛṛust</string>
<string name="rendering_value_bicycle_name">Azlalam</string>
@ -677,4 +679,5 @@
<string name="shared_string_actions">Tigawin</string>
<string name="parked_at">Sers deg</string>
<string name="without_time_limit">Ulac tilist deg wakud</string>
<string name="group_deleted">Agraw ittwakes</string>
</resources>

View file

@ -3782,4 +3782,6 @@
<string name="poi_flooring">Bodenleger</string>
<string name="poi_pottery">Töpferei</string>
<string name="poi_whitewater_rapid_name">Name der Stromschnellen</string>
</resources>

View file

@ -2939,5 +2939,5 @@ Abgedeckte Fläche: %1$s x %2$s</string>
<string name="transport_nearby_routes_within">Routen in der Nähe</string>
<string name="transport_nearby_routes">IN DER NÄHE</string>
<string name="group_deleted">Gruppe gelöscht</string>
<string name="rendering_attr_whiteWaterSports_name">Wildwassersportarten</string>
<string name="rendering_attr_whiteWaterSports_name">Wildwasser Sportarten</string>
</resources>