Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-06 20:04:41 +01:00
commit c5635ccdb3

View file

@ -2441,15 +2441,15 @@
<string name="poi_historic_period_roman_greece">Historic period: Roman Greece (146 BC 330 AD)</string>
<string name="poi_historic_period_roman_kingdom">Historic period: Roman kingdom (753 BC 509 BC)</string>
<string name="poi_historic_period_dominate">Historic period: dominate (285 AD 476 AD)</string>
<string name="poi_historic_period_villager">Historic period: villager (epoch I, II, 1580 BC 133 AC)</string>
<string name="poi_historic_period_urban">Historic period: urban (epoch III, 133 AC 374 AC)</string>
<string name="poi_historic_period_classical">Historic period: classical (epoch IV, 374 AC 900 AC)</string>
<string name="poi_historic_period_imperial">Historic period: imperial (epoch V, 900 AC 1200 AC)</string>
<string name="poi_historic_period_villager">Historic period: villager (epoch I, II, 1580 BC 133 AD)</string>
<string name="poi_historic_period_urban">Historic period: urban (epoch III, 133 AD 374 AD)</string>
<string name="poi_historic_period_classical">Historic period: classical (epoch IV, 374 AD 900 AD)</string>
<string name="poi_historic_period_imperial">Historic period: imperial (epoch V, 900 AD 1200 AD)</string>
<string name="poi_historic_era_paleolithic">Historic era: paleolithic (2.6 million years 10000 BP)</string>
<string name="poi_historic_era_mesolithic">Historic era: mesolithic</string>
<string name="poi_historic_era_neolithic">Historic era: neolithic</string>
<string name="poi_historic_era_chalcolithic">Historic era: chalcolithic (IV-III millennium BC.)</string>
<string name="poi_historic_era_chalcolithic">Historic era: chalcolithic (4th3rd millennium BC)</string>
<string name="poi_historic_stone">Historic stone</string>
<string name="poi_stone_type_conciliation_cross">Type: conciliation cross</string>