Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-12-20 19:56:34 +01:00
commit 6bcfb9366a
2 changed files with 3 additions and 3 deletions

View file

@ -2040,7 +2040,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="rendering_value_default_name">Standard</string>
<string name="rendering_value_orange_name">Orange</string>
<string name="rendering_value_germanRoadAtlas_name">Deutscher Straßenatlas</string>
<string name="traffic_warning_railways">Eisenbahn</string>
<string name="traffic_warning_railways">Bahnübergang</string>
<string name="traffic_warning_pedestrian">Fußgänger</string>
<string name="show_railway_warnings">Eisenbahn-Übergänge anzeigen</string>
<string name="show_pedestrian_warnings">Fußgänger-Übergänge anzeigen</string>

View file

@ -13,8 +13,8 @@
<string name="rendering_value_default_name">Default</string>
<string name="rendering_value_orange_name">Orange</string>
<string name="rendering_value_germanRoadAtlas_name">German road atlas</string>
<string name="traffic_warning_railways">Railroad</string>
<string name="traffic_warning_pedestrian">Pedestrians</string>
<string name="traffic_warning_railways">Railroad crossing</string>
<string name="traffic_warning_pedestrian">Pedestrian crosswalk</string>
<string name="show_railway_warnings">Show railroad crossings</string>
<string name="show_pedestrian_warnings">Show pedestrian crosswalks</string>
<string name="rendering_value_americanRoadAtlas_name">American road atlas</string>