Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2014-06-23 09:22:13 +02:00
commit 790c294543
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/net/osmand/data/City.java
View file

@ -11,7 +11,7 @@ public class City extends MapObject {
public enum CityType {
// that's tricky way to play with that numbers (to avoid including suburbs in city & vice verse)
// district special type and it is not registered as a city
CITY(10000), TOWN(5000), VILLAGE(1300), HAMLET(1000), SUBURB(400), DISTRICT(400);
CITY(10000), TOWN(5000), VILLAGE(1300), HAMLET(1000), SUBURB(400), DISTRICT(400), NEIGHBOURHOOD(300);
private double radius;

1
OsmAnd-java/src/net/osmand/osm/edit/OSMSettings.java
View file

@ -35,6 +35,7 @@ public class OSMSettings {
ADDR_STREET("addr:street"), //$NON-NLS-1$
ADDR_STREET2("addr:street2"), //$NON-NLS-1$
ADDR_CITY("addr:city"), //$NON-NLS-1$
ADDR_PLACE("addr:place"), //$NON-NLS-1$
ADDR_POSTCODE("addr:postcode"), //$NON-NLS-1$
ADDR_INTERPOLATION("addr:interpolation"), //$NON-NLS-1$
ADDRESS_TYPE("address:type"), //$NON-NLS-1$

8
OsmAnd/res/values-ar/strings.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="recording_context_menu_show">عرضإظهار</string>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="recording_context_menu_show">عرضإظهار</string>
<string name="av_def_action_picture">التقاط صورةالتقاط صورة</string>
<string name="av_def_action_video">تسجيل الفيديو</string>
@ -1169,7 +1170,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
<string name="vector_map_not_needed">لا"شكرا</string>
<string name="basemap_missing">خريطة العالم الأساسية (التي تغطي العالم كله في الأزيز صغيرة) مفقود. يرجى النظر تحميله World_basemap_x.obf للبيئة كاملة</string>
<string name="vector_data_missing">على متن (\'حاليا \') البيانات مفقود على بطاقة SD. يرجى النظر إلى تحميل البرنامج من اجل استخدام الخرائط دون اتصال.</string>
<string name="local_index_gpx_info_show">\ ن \ ن الصحافة وعقد لمدة الخيارات</string>
<string name="local_index_gpx_info_show">\n\nاضغط باستمرار لعرض الخيارات</string>
@ -1356,4 +1357,5 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
<string name="version_index_is_big_for_memory">لا تناسب الزاكرة</string>
<string name="version_index_is_not_supported">اصدار المنتج غير مدعوم</string>
<string name="poi_error_unexpected_template">حدث خطأ غير متوقع أثناء ممارسة العمل {0}.</string>
</resources>
<string name="show_zoom_buttons_navigation">أظهر أزرار التقريب</string>
</resources>

4
OsmAnd/res/values-it/strings.xml
View file

@ -455,7 +455,7 @@
<string name="send_report">Invia rapporto</string>
<string name="none_region_found">Non è stata trovato nessuna dato per la regione nella scheda SD. Scarica una regione da internet.</string>
<string name="poi_namefinder_query_empty">Inserisci i parametri di ricerca per trovare un PDI</string>
<string name="any_poi">Qualsiasi</string>
<string name="any_poi">Tutti</string>
<string name="layer_transport_route">Percorso di trasporto pubblico</string>
<string name="thanks_yandex_traffic">Grazie a Yandex per le informazioni sul traffico.</string>
<string name="layer_yandex_traffic">Yandex (traffico)</string>
@ -1001,7 +1001,7 @@
<string name="map_widget_time">Tempo rimasto</string>
<string name="map_widget_next_turn">Prossima svolta</string>
<string name="map_widget_next_turn_small">Prossima svolta (piccola)</string>
<string name="map_widget_next_next_turn">Svolta successiva a questa</string>
<string name="map_widget_next_next_turn">Svolta successiva</string>
<string name="map_widget_mini_route">Minimappa del percorso</string>
<string name="bg_service_screen_lock">Blocca lo schermo</string>
<string name="bg_service_screen_lock_toast">Lo schermo è bloccato</string>