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

Update geocoding

Browse source
This commit is contained in:
Victor Shcherb 2015-12-02 00:33:25 +01:00
commit e85424303a
96 changed files with 2163 additions and 2488 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java
View file

@ -179,13 +179,13 @@ public class GeocodingUtilities {
}
public List<String> prepareStreetName(String s) {
List<String> ls = new ArrayList<String>();
List<String> ls = new ArrayList<String>();
int beginning = 0;
for(int i = 1; i < s.length(); i++) {
if(s.charAt(i) == ' ') {
for (int i = 1; i < s.length(); i++) {
if (s.charAt(i) == ' ') {
addWord(ls, s.substring(beginning, i));
beginning = i;
} else if(s.charAt(i) == '(') {
} else if (s.charAt(i) == '(') {
addWord(ls, s.substring(beginning, i));
while (i < s.length()) {
char c = s.charAt(i);
@ -197,10 +197,10 @@ public class GeocodingUtilities {
}
}
if(beginning < s.length()) {
String lastWord = s.substring(beginning, s.length());
addWord(ls, lastWord);
}
if (beginning < s.length()) {
String lastWord = s.substring(beginning, s.length());
addWord(ls, lastWord);
}
Collections.sort(ls, Collator.getInstance());
return ls;
}

2
OsmAnd/no_translate.xml
View file

@ -23,5 +23,7 @@
<string name="osmo">OsMo</string>
<string name="tag_poi_amenity">amenity</string>
<string name="tag_poi_name">name</string>
<string name="hint_tag">Tag</string>
<string name="hint_value">Value</string>
</resources>

104
OsmAnd/res/layout-land/map_hud_top.xml
View file

@ -1,37 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="1" >
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="1">
<View android:layout_width="@dimen/map_route_planning_land_width"
android:layout_height="0dp"
<View
android:id="@+id/map_route_land_left_margin"
android:layout_width="@dimen/map_route_planning_land_width"
android:layout_height="0dp"
android:layout_gravity="top|left"
android:visibility="gone" />
android:visibility="gone"/>
<!-- LEFT widgets colon -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|left"
android:orientation="vertical" >
android:orientation="vertical">
<LinearLayout
android:id="@+id/map_left_widgets_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|left"
android:orientation="vertical" >
android:orientation="vertical">
<include
layout="@layout/map_hud_widget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
layout="@layout/map_hud_widget" />
android:layout_height="wrap_content"/>
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
</LinearLayout>
</LinearLayout>
@ -39,22 +41,22 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
android:orientation="vertical">
<FrameLayout
android:id="@+id/map_top_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/btn_round"
android:minHeight="@dimen/map_address_height" >
android:minHeight="@dimen/map_address_height">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_gravity="center"
>
>
<TextView
android:id="@+id/map_address_text_shadow"
@ -64,9 +66,9 @@
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:text="Long Street Name"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size" >
android:textSize="@dimen/map_widget_text_size"
tools:text="Long Street Name">
</TextView>
<TextView
@ -77,9 +79,9 @@
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:text="Long Street Name"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size" >
android:textSize="@dimen/map_widget_text_size"
tools:text="Long Street Name">
</TextView>
@ -89,7 +91,7 @@
android:id="@+id/waypoint_info_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
android:orientation="horizontal">
<ImageView
android:id="@+id/waypoint_icon"
@ -98,7 +100,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<TextView
android:id="@+id/waypoint_dist"
@ -109,14 +111,14 @@
android:maxLines="2"
android:textColor="@color/wpt_distance_color"
android:textSize="@dimen/default_desc_text_size"
android:textStyle="bold" />
android:textStyle="bold"/>
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_weight="1" >
android:layout_weight="1">
<TextView
@ -125,9 +127,9 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="Waypoint"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size" />
android:textSize="@dimen/map_button_text_size"
tools:text="Waypoint"/>
<TextView
android:id="@+id/waypoint_text"
@ -135,9 +137,9 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="Waypoint"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size" />
android:textSize="@dimen/map_button_text_size"
tools:text="Waypoint"/>
</FrameLayout>
@ -146,14 +148,14 @@
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_overflow_menu_white" />
android:src="@drawable/ic_overflow_menu_white"/>
<ImageButton
android:id="@+id/waypoint_close"
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>
@ -161,7 +163,7 @@
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
@ -169,14 +171,14 @@
android:layout_gravity="top|left"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginTop="@dimen/map_button_margin"
android:orientation="horizontal" >
android:orientation="horizontal">
<ImageButton
android:id="@+id/map_layers_button"
android:layout_width="@dimen/map_small_button_size"
android:layout_height="@dimen/map_small_button_size"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_compass_button"
@ -184,7 +186,7 @@
android:layout_height="@dimen/map_small_button_size"
android:layout_marginLeft="@dimen/map_small_button_margin"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
<LinearLayout
@ -194,19 +196,19 @@
android:layout_gravity="top|center"
android:layout_marginTop="@dimen/map_button_margin"
android:background="@drawable/btn_round"
android:visibility="gone"
android:orientation="vertical" >
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/map_lanes"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"/>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_weight="1" >
android:layout_weight="1">
<TextView
android:id="@+id/map_lanes_dist_text_shadow"
@ -214,9 +216,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:maxLines="1"
android:text="1048 km"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="1048 km"/>
<TextView
android:id="@+id/map_lanes_dist_text"
@ -224,9 +226,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:maxLines="1"
android:text="1048 km"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="1048 km"/>
</FrameLayout>
@ -240,7 +242,7 @@
android:layout_marginRight="@dimen/map_button_margin"
android:max="100"
android:progress="60"
android:visibility="gone" />
android:visibility="gone"/>
</LinearLayout>
</FrameLayout>
</LinearLayout>
@ -250,24 +252,24 @@
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right" >
android:layout_gravity="top|right">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:orientation="vertical" >
android:orientation="vertical">
<LinearLayout
android:id="@+id/map_right_widgets_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:orientation="vertical" >
android:orientation="vertical">
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
</LinearLayout>
<ImageButton
@ -276,7 +278,7 @@
android:layout_height="@dimen/map_small_button_size"
android:layout_gravity="top|center_horizontal"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>

4
OsmAnd/res/layout-land/point_editor_fragment.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/point_edit_layout"
android:layout_width="366dp"
android:layout_height="match_parent"
@ -77,8 +78,9 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_gravity="center_vertical"
android:text="Point info"
tools:text="Point info"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>

52
OsmAnd/res/layout/dash_storage_type_fragment.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h"
android:layout_marginRight="@dimen/dash_margin_h"
android:layout_marginTop="@dimen/dash_margin"
android:background="?attr/bg_card"
android:orientation="vertical" >
xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h"
android:layout_marginRight="@dimen/dash_margin_h"
android:layout_marginTop="@dimen/dash_margin"
android:background="?attr/bg_card"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
@ -18,7 +18,7 @@
android:orientation="vertical"
android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding"
android:paddingTop="@dimen/list_content_padding" >
android:paddingTop="@dimen/list_content_padding">
<TextView
android:layout_width="wrap_content"
@ -26,35 +26,35 @@
android:layout_marginBottom="@dimen/list_header_bottom_margin"
android:text="@string/storage_directory"
android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size_large" />
android:textSize="@dimen/default_list_text_size_large"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical" >
android:orientation="vertical">
<TextView
android:id="@+id/location_path"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Location path"
android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size" />
android:textSize="@dimen/default_list_text_size"
tools:text="Location path"/>
<TextView
android:id="@+id/location_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Location path \u2022 300 MB"
android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size" />
android:textSize="@dimen/default_list_text_size"
tools:text="Location path \u2022 300 MB"/>
</LinearLayout>
<ImageView
@ -64,11 +64,12 @@
android:layout_gravity="center_vertical"
android:background="?attr/dashboard_button"
android:scaleType="center"
android:src="@drawable/ic_action_edit_dark" />
android:src="@drawable/ic_action_edit_dark"/>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/android_19_location_changed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@ -76,26 +77,25 @@
android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding"
android:paddingTop="3dp"
android:id="@+id/android_19_location_changed"
android:text="@string/android_19_location_disabled"
android:textSize="@dimen/default_list_text_size" />
android:textSize="@dimen/default_list_text_size"/>
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/dashboard_divider" />
android:background="?attr/dashboard_divider"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/list_item_height"
android:orientation="horizontal" >
android:orientation="horizontal">
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
android:layout_weight="1"/>
<net.osmand.plus.widgets.ButtonEx
android:id="@+id/copy_maps"
@ -103,7 +103,7 @@
android:gravity="center"
android:text="@string/shared_string_copy"
osmand:textAllCapsCompat="true"
osmand:typeface="@string/font_roboto_medium" />
osmand:typeface="@string/font_roboto_medium"/>
<net.osmand.plus.widgets.ButtonEx
android:id="@+id/confirm"
@ -113,7 +113,7 @@
android:paddingRight="5dp"
android:text="@string/shared_string_ok"
osmand:textAllCapsCompat="true"
osmand:typeface="@string/font_roboto_medium" />
osmand:typeface="@string/font_roboto_medium"/>
</LinearLayout>
</LinearLayout>

2
OsmAnd/res/layout/dashboard_toolbar.xml
View file

@ -44,9 +44,9 @@
android:layout_height="wrap_content"
android:layout_gravity="left"
android:scaleType="center"
android:text="Toolbar"
android:textColor="@color/abc_primary_text_material_dark"
android:textSize="@dimen/abc_text_size_headline_material"
tools:text="Toolbar"
tools:visibility="gone"/>
<ImageView

5
OsmAnd/res/layout/divider.xml
View file

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_width="match_parent"
android:layout_height="wrap_content">
<View
android:id="@+id/divider"

9
OsmAnd/res/layout/download.xml
View file

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/mainLayout">
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/mainLayout">
<net.osmand.plus.views.controls.PagerSlidingTabStrip
android:id="@+id/sliding_tabs"

2
OsmAnd/res/layout/drawer_list_item.xml
View file

@ -19,7 +19,7 @@
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="@dimen/default_list_text_size"
android:layout_weight="1"

239
OsmAnd/res/layout/editing_poi.xml
View file

@ -1,239 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/LinkToOsmDoc"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/create_poi_link_to_osm_doc" />
<TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="1" >
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/poi_dialog_name" />
<!-- bug with width set it to 100 -->
<EditText
android:id="@+id/Name"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:minWidth="250dp"
android:text="" >
<requestFocus />
</EditText>
</TableRow>
<TableRow>
<Button
android:id="@+id/TypeButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="&lt;Type>" />
<AutoCompleteTextView
android:id="@+id/Type"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:minWidth="250dp"
android:text="" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/OsmTagValue"
android:layout_span="2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp" />
</TableRow>
<TableRow>
<Button
android:id="@+id/OpenHoursButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/poi_dialog_opening_hours" />
<EditText
android:id="@+id/OpeningHours"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:hint="Mo-Su 08:00-20:00"
android:minWidth="250dp"
android:text="" >
</EditText>
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/street_name" />
<EditText
android:id="@+id/StreetName"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:minWidth="250dp" >
</EditText>
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/hno" />
<EditText
android:id="@+id/HouseNumber"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:minWidth="250dp" >
</EditText>
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/phone" />
<EditText
android:id="@+id/Phone"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:hint="0123456789"
android:inputType="phone"
android:minWidth="250dp" >
</EditText>
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/website" />
<EditText
android:id="@+id/Website"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:hint="http://osmand.net"
android:minWidth="250dp" >
</EditText>
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/poi_dialog_comment" />
<EditText
android:id="@+id/Comment"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:minWidth="250dp"
android:text="@string/poi_dialog_comment_default" >
</EditText>
</TableRow>
<TableRow>
<CheckBox
android:id="@+id/CloseChangeset"
android:layout_width="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_span="2"
android:text="@string/close_changeset" />
</TableRow>
</TableLayout>
<TableLayout
android:id="@+id/advancedModeTable"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="1"
android:visibility="gone"
tools:layout_height="25dp"
tools:visibility="visible">
</TableLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/addTag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:minWidth="150dp"
android:text="@string/add_tag"
android:visibility="gone" />
<Button
android:id="@+id/advancedMode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:minWidth="150dp"
android:text="@string/btn_advanced_mode" />
</LinearLayout>
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/poi_dialog_other_tags_message" />
</LinearLayout>
</ScrollView>

1
OsmAnd/res/layout/editing_tile_source.xml
View file

@ -90,7 +90,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:layout_span="2"
android:text="@string/edit_tilesource_elliptic_tile"/>
</LinearLayout>

2
OsmAnd/res/layout/fragment_edit_poi.xml
View file

@ -21,7 +21,7 @@
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical">

10
OsmAnd/res/layout/fragment_edit_poi_advanced.xml
View file

@ -28,7 +28,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="37dp"
android:minHeight="44dp"
android:layout_height="wrap_content"
android:gravity="center">
<net.osmand.plus.widgets.TextViewEx
@ -52,10 +53,12 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="poi name"/>
tools:text="very very very long poi name"/>
</LinearLayout>
<View
@ -65,7 +68,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="37dp"
android:minHeight="44dp"
android:layout_height="wrap_content"
android:gravity="center">
<net.osmand.plus.widgets.TextViewEx

1
OsmAnd/res/layout/fragment_help_screen.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">

25
OsmAnd/res/layout/list_item_bidforfix.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/bidforfixitemlayout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@android:color/white">
<RelativeLayout android:id="@+id/bidforfixitemlayout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@android:color/white">
<TextView
android:id="@+id/bffiText"
@ -15,7 +16,7 @@
android:layout_marginTop="8dp"
android:text="Large Text"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#72B123" />
android:textColor="#72B123"/>
<View
android:id="@+id/ruler"
@ -26,7 +27,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginTop="6dp"
android:background="#B0B0B0" />
android:background="#B0B0B0"/>
<TextView
android:id="@+id/bffiSupport"
@ -35,8 +36,8 @@
android:layout_alignLeft="@+id/bffiText"
android:layout_below="@+id/bffiText"
android:layout_marginTop="16dp"
android:text="18 supporters"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="18 supporters"/>
<TextView
android:id="@+id/bffiFunded"
@ -44,8 +45,8 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/bffiSupport"
android:layout_below="@+id/bffiSupport"
android:text="Funded: 65%"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="Funded: 65%"/>
<ImageView
android:id="@+id/bffiGraph"
@ -54,6 +55,6 @@
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/bffiSupport"
android:layout_marginRight="20dp"
android:src="@android:drawable/alert_dark_frame" />
android:src="@android:drawable/alert_dark_frame"/>
</RelativeLayout>

7
OsmAnd/res/layout/local_index.xml
View file

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<ExpandableListView
android:id="@android:id/list"

2
OsmAnd/res/layout/map_context_menu_fragment.xml
View file

@ -198,7 +198,7 @@
android:layout_marginLeft="-4dp"
android:clickable="true"
android:gravity="center_vertical"
android:text="— 00:26"
tools:text="— 00:26"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"/>

73
OsmAnd/res/layout/map_hud_bottom.xml
View file

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical" >
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/map_alarm_warning"
@ -15,24 +16,24 @@
android:layout_height="@dimen/map_alarm_size"
android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/map_alarm_bottom_margin"
android:layout_marginLeft="@dimen/map_button_shadow_margin" >
android:layout_marginLeft="@dimen/map_button_shadow_margin">
<ImageView
android:id="@+id/map_alarm_warning_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/warnings_limit" />
android:src="@drawable/warnings_limit"/>
<TextView
android:id="@+id/map_alarm_warning_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="60"
android:textColor="@color/color_black"
android:textSize="@dimen/map_alarm_text_size"
android:textStyle="bold" />
android:textStyle="bold"
tools:text="60"/>
</FrameLayout>
<FrameLayout
@ -42,7 +43,7 @@
android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/map_button_shadow_margin"
android:layout_marginLeft="@dimen/map_button_shadow_margin"
android:background="@drawable/btn_round_trans" >
android:background="@drawable/btn_round_trans">
<ImageView
android:id="@+id/map_app_mode_icon"
@ -50,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top|center"
android:layout_marginTop="3dp"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<TextView
android:id="@+id/map_app_mode_text"
@ -58,7 +59,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top|center"
android:gravity="center_horizontal"
android:textSize="@dimen/map_button_text_size" />
android:textSize="@dimen/map_button_text_size"/>
</FrameLayout>
<LinearLayout
@ -67,13 +68,13 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:layout_marginBottom="@dimen/map_button_size"
android:orientation="horizontal" >
android:orientation="horizontal">
<SeekBar
android:id="@+id/map_transparency_seekbar"
android:layout_width="@dimen/map_trans_seek_size"
android:layout_height="wrap_content"
android:layout_gravity="center" />
android:layout_gravity="center"/>
<ImageButton
android:id="@+id/map_transparency_hide"
@ -81,7 +82,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/headliner_close" />
android:src="@drawable/headliner_close"/>
</LinearLayout>
<LinearLayout
@ -89,14 +90,14 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginLeft="@dimen/map_button_margin" >
android:layout_marginLeft="@dimen/map_button_margin">
<ImageButton
android:id="@+id/map_menu_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/btn_round"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_route_info_button"
@ -104,19 +105,19 @@
android:layout_height="@dimen/map_button_size"
android:layout_marginLeft="@dimen/map_button_spacing"
android:background="@drawable/btn_round"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<FrameLayout
android:id="@+id/map_ruler_layout"
android:layout_width="@dimen/map_ruler_width"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/map_button_margin" >
android:layout_marginLeft="@dimen/map_button_margin">
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginBottom="@dimen/map_ruler_bottom_margin" >
android:layout_marginBottom="@dimen/map_ruler_bottom_margin">
<TextView
@ -126,8 +127,8 @@
android:layout_gravity="bottom"
android:gravity="center_horizontal"
android:lineSpacingMultiplier="0.9"
android:text="100 m"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="100 m"/>
<TextView
android:id="@+id/map_ruler_text"
@ -136,8 +137,8 @@
android:layout_gravity="bottom"
android:gravity="center_horizontal"
android:lineSpacingMultiplier="0.9"
android:text="100 m"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="100 m"/>
</FrameLayout>
@ -146,7 +147,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@drawable/ruler" />
android:background="@drawable/ruler"/>
</FrameLayout>
</LinearLayout>
@ -155,7 +156,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin" >
android:layout_marginRight="@dimen/map_button_margin">
<ImageButton
android:id="@+id/map_my_location_button"
@ -163,21 +164,21 @@
android:layout_height="@dimen/map_button_size"
android:layout_gravity="bottom"
android:background="@drawable/btn_circle"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/map_button_spacing"
android:orientation="vertical" >
android:orientation="vertical">
<ImageButton
android:id="@+id/map_zoom_in_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/btn_circle"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_zoom_out_button"
@ -185,29 +186,31 @@
android:layout_height="@dimen/map_button_size"
android:layout_marginTop="@dimen/map_button_spacing"
android:background="@drawable/btn_circle"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<include layout="@layout/map_route_prepare_bottom"/>
<LinearLayout
android:id="@+id/map_context_menu_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@drawable/btn_flat"
android:visibility="gone" >
android:visibility="gone">
<TextView
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center" >
android:gravity="center">
</TextView>
<ImageButton
@ -215,14 +218,14 @@
android:layout_height="@dimen/map_address_height"
android:layout_gravity="center_vertical"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:layout_gravity="center_vertical"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>

183
OsmAnd/res/layout/map_hud_top.xml
View file

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<!-- TOP ROW -->
@ -11,51 +12,51 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/btn_flat"
android:minHeight="@dimen/map_address_height" >
android:minHeight="@dimen/map_address_height">
<!-- android:layout_weight="1" to show properly next turn -->
<FrameLayout
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp">
<TextView
android:id="@+id/map_address_text_shadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_gravity="center" >
android:layout_gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size"
tools:text="Long Street Name">
</TextView>
<TextView
android:id="@+id/map_address_text_shadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:text="Long Street Name"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size" >
</TextView>
<TextView
android:id="@+id/map_address_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:text="Long Street Name"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size" >
</TextView>
</FrameLayout>
<TextView
android:id="@+id/map_address_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size"
tools:text="Long Street Name">
</TextView>
</FrameLayout>
<LinearLayout
android:id="@+id/waypoint_info_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal" >
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/waypoint_icon"
@ -64,7 +65,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<TextView
android:id="@+id/waypoint_dist"
@ -75,57 +76,57 @@
android:maxLines="2"
android:textColor="@color/wpt_distance_color"
android:textSize="@dimen/default_desc_text_size"
android:textStyle="bold" />
android:textStyle="bold"/>
<FrameLayout
android:layout_width="0dp"
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_weight="1">
<TextView
android:id="@+id/waypoint_text_shadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_weight="1" >
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size"
tools:text="Waypoint"/>
<TextView
android:id="@+id/waypoint_text_shadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="Waypoint"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size" />
<TextView
android:id="@+id/waypoint_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size"
tools:text="Waypoint"/>
<TextView
android:id="@+id/waypoint_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="Waypoint"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size" />
</FrameLayout>
</FrameLayout>
<ImageButton
android:id="@+id/waypoint_more"
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/waypoint_close"
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>
<!-- Widgets -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">
<!-- LEFT widgets colon -->
@ -133,21 +134,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="1" >
android:weightSum="1">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="top|left"
android:layout_weight="0.45"
android:orientation="vertical" >
android:orientation="vertical">
<LinearLayout
android:id="@+id/map_left_widgets_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|left"
android:orientation="vertical" >
android:orientation="vertical">
<!--
<include layout="@layout/map_hud_widget" />
@ -162,14 +163,14 @@
android:layout_gravity="top|left"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginTop="@dimen/map_button_margin"
android:orientation="horizontal" >
android:orientation="horizontal">
<ImageButton
android:id="@+id/map_layers_button"
android:layout_width="@dimen/map_small_button_size"
android:layout_height="@dimen/map_small_button_size"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_compass_button"
@ -177,7 +178,7 @@
android:layout_height="@dimen/map_small_button_size"
android:layout_marginLeft="@dimen/map_small_button_margin"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</LinearLayout>
<!-- empty block to not let widgets grow more than 45% -->
@ -185,7 +186,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="0.55" >
android:layout_weight="0.55">
</LinearLayout>
</LinearLayout>
@ -195,38 +196,38 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="1" >
android:weightSum="1">
<!-- empty block to not let widgets grow more than 45% -->
<LinearLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="0.55" >
android:layout_weight="0.55">
</LinearLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:layout_weight="0.45" >
android:layout_weight="0.45">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:orientation="vertical" >
android:orientation="vertical">
<LinearLayout
android:id="@+id/map_right_widgets_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:orientation="vertical" >
android:orientation="vertical">
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
</LinearLayout>
<ImageButton
@ -235,7 +236,7 @@
android:layout_height="@dimen/map_small_button_size"
android:layout_gravity="top|center_horizontal"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>
</LinearLayout>
@ -249,18 +250,18 @@
android:layout_marginTop="@dimen/map_button_margin"
android:background="@drawable/btn_round"
android:orientation="vertical"
android:visibility="gone" >
android:visibility="gone">
<ImageView
android:id="@+id/map_lanes"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"/>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_weight="1" >
android:layout_weight="1">
<TextView
android:id="@+id/map_lanes_dist_text_shadow"
@ -268,9 +269,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:maxLines="1"
android:text="1048 km"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="1048 km"/>
<TextView
android:id="@+id/map_lanes_dist_text"
@ -278,9 +279,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:maxLines="1"
android:text="1048 km"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="1048 km"/>
</FrameLayout>
@ -293,7 +294,7 @@
android:layout_marginRight="@dimen/map_button_margin"
android:max="100"
android:progress="60"
android:visibility="gone" />
android:visibility="gone"/>
</LinearLayout>
</FrameLayout>

2
OsmAnd/res/layout/map_hud_widget.xml
View file

@ -47,7 +47,7 @@
android:src="@drawable/ic_action_test_light" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/map_widget_text_bottom_margin"

2
OsmAnd/res/layout/map_settings_item.xml
View file

@ -25,7 +25,7 @@
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"

1
OsmAnd/res/layout/maps_in_category_fragment.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

2
OsmAnd/res/layout/osmo_group_list.xml
View file

@ -18,7 +18,7 @@
<ExpandableListView
android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_height="0dp"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:layout_marginTop="0dp"

11
OsmAnd/res/layout/osmo_groups_list_header.xml
View file

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?attr/osmo_header_background"
android:orientation="vertical"
android:paddingRight="@dimen/list_content_padding" >
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?attr/osmo_header_background"
android:orientation="vertical"
android:paddingRight="@dimen/list_content_padding">
<LinearLayout
android:layout_width="fill_parent"

9
OsmAnd/res/layout/poi_tag_list_item.xml
View file

@ -2,9 +2,9 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:paddingTop="16dp">
@ -19,8 +19,8 @@
android:id="@+id/tagEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Tag"
tools:text="asdf"/>
android:hint="@string/hint_tag"
tools:text="Tag text"/>
</android.support.design.widget.TextInputLayout>
@ -33,7 +33,7 @@
android:id="@+id/valueEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Value"/>
android:hint="@string/hint_value"/>
</android.support.design.widget.TextInputLayout>
@ -43,5 +43,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="bottom"
android:contentDescription="@string/shared_string_delete"
tools:src="@drawable/ic_action_close_dark"/>
</LinearLayout>

6
OsmAnd/res/layout/point_editor_fragment.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/point_edit_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -71,8 +72,9 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_gravity="center_vertical"
android:text="Point info"
tools:text="Point info"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
@ -136,7 +138,7 @@
android:layout_marginLeft="8dp"
android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary"
android:text="Name"
tools:text="Name"
android:imeOptions="actionDone"
android:inputType="text"/>

4
OsmAnd/res/layout/save_directions_dialog.xml
View file

@ -43,12 +43,12 @@
android:layout_width="125dp"
android:layout_height="wrap_content"
android:text="@string/shared_string_cancel"
android:id="@+id/Cancel"></Button>
android:id="@+id/Cancel"/>
<Button
android:layout_width="125dp"
android:layout_height="wrap_content"
android:text="@string/shared_string_save"
android:id="@+id/Save"></Button>
android:id="@+id/Save"/>
</LinearLayout>
</LinearLayout>

8
OsmAnd/res/layout/searchpoi.xml
View file

@ -10,6 +10,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
tools:visibility="visible"
android:visibility="gone"
android:orientation="horizontal" >
@ -29,7 +30,7 @@
android:focusableInTouchMode="true" />
<EditText
android:id="@+id/edit"
android:id="@+id/searchEditText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
@ -38,9 +39,10 @@
android:maxLines="1"
android:singleLine="true"
android:lines="1"
android:nextFocusLeft="@id/edit"
android:nextFocusUp="@id/edit"
android:nextFocusLeft="@id/searchEditText"
android:nextFocusUp="@id/searchEditText"
android:textColor="?android:textColorPrimary"
android:imeOptions="actionSearch"
tools:text="@string/lorem_ipsum" >
</EditText>

2
OsmAnd/res/layout/sherpafy_list_tour_item.xml
View file

@ -45,7 +45,7 @@
<TextView
android:id="@+id/TourDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"

7
OsmAnd/res/layout/update_index.xml
View file

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/header_layout"

2
OsmAnd/res/layout/waypoint_title.xml
View file

@ -40,7 +40,7 @@
android:layout_marginRight="8dp" />
<ImageButton
android:id="@+id/edit"
android:id="@+id/searchEditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"

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

@ -1277,13 +1277,13 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
<string name="lang_af">Afrikaans</string>
<string name="lang_hy">Armeens</string>
<string name="lang_eu">Baskies</string>
<string name="color_red">rooi</string>
<string name="rendering_value_pink_name">pienk</string>
<string name="color_orange">oranje</string>
<string name="rendering_value_brown_name">bruin</string>
<string name="color_yellow">geel</string>
<string name="color_lightblue">ligblou</string>
<string name="color_blue">blou</string>
<string name="osmo_edit_device">Verander gebruiker eienskappe</string>

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

@ -953,7 +953,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
<string name="local_index_items_uploaded">رُفع %1$d عنصرًا من %2$d عنصر بنجاح.</string>
<string name="local_index_mi_upload_gpx">ارسال الى OSM</string>
<string name="show_more_map_detail">عرض المزيد من تفاصيل الخريطة</string>
<string name="show_more_map_detail_descr">إظهار بعض تفاصيل الخريطة المتجهية (الطرق ...الخ) عند تقريبها أكثر</string>
<string name="show_more_map_detail_descr">إظهار بعض تفاصيل الخريطة المتجهية (الطرق …الخ) عند تقريبها أكثر</string>
<string name="favourites_delete_multiple_succesful">حٌذفت النقطة المفضلة بنجاح.</string>
<string name="favorite_delete_multiple">"أنت بصدد حذف %1$d نقطة مفضلة و٪2$d مجموعة مفضلة. هل أنت متأكد؟"</string>
<string name="favorite_home_category">المنزل</string>
@ -1008,7 +1008,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
<string name="gpx_option_reverse_route">عكس اتجاه GPX</string>
<string name="gpx_option_destination_point">استخدم الوجهة الحالية</string>
<string name="gpx_option_from_start_point">يمر على طول المسار باكمله</string>
<string name="switch_to_vector_map_to_see">لعرض الخرائط المتجهية المحفوظة لهذا الموقع.\n\t اضغط زر القائمة → \'ضبط الخريطة\' → \'مصدر الخريطة... \' → \'خرائط متجهية بدون إتصال\'.</string>
<string name="switch_to_vector_map_to_see">لعرض الخرائط المتجهية المحفوظة لهذا الموقع.\n\t اضغط زر القائمة → \'ضبط الخريطة\' → \'مصدر الخريطة… \' → \'خرائط متجهية بدون إتصال\'.</string>
<string name="choose_audio_stream">خروج التوجيه الصوتي</string>
<string name="choose_audio_stream_descr">اختيار قناة لتشغيل التوجيه الصوتي (التي تعتمد على النظام)</string>
<string name="voice_stream_voice_call">المكالمات الصوتية السمعية</string>
@ -1143,13 +1143,13 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
<string name="loading_smth">جاري التحميل %1$s …</string>
<string name="selected_gpx_info_show">\n\nاضغط باستمرار للرؤية على الخريطة</string>
<string name="color_red">أحمر</string>
<string name="rendering_value_pink_name">وردي</string>
<string name="color_orange">برتقالي</string>
<string name="rendering_value_brown_name">بني</string>
<string name="color_yellow">أصفر</string>
<string name="color_lightblue">أزرق فاتح</string>
<string name="color_blue">أزرق</string>
<string name="color_green">أخضر</string>
<string name="osmo_share_current_session">شارك الجلسة الحالية في المتصفح</string>

10
OsmAnd/res/values-be-rBY/strings.xml
View file

@ -248,13 +248,13 @@
<string name="osmo_use_server_name">Zarehіstravanaje іmia</string>
<string name="osmo_connect_to_my_nickname">Moj nіk</string>
<string name="osmo_user_name">Karystaĺnіk</string>
<string name="color_red">čyrvony</string>
<string name="rendering_value_pink_name">ružovy</string>
<string name="color_orange">aranžavy</string>
<string name="rendering_value_brown_name">karyčnievy</string>
<string name="color_yellow">žoŭty</string>
<string name="color_lightblue">blakіtny</string>
<string name="color_blue">sіnі</string>
<string name="color_green">zialiony</string>
<string name="osmo_edit_device">Źmianіć nalady karystaĺnіka</string>
@ -1126,7 +1126,7 @@
<string name="gpx_option_reverse_route">Razviarnuć kіrunak GPX</string>
<string name="gpx_option_destination_point">Vykarystoŭvać biahučy punkt pryznačeńnia</string>
<string name="gpx_option_from_start_point">Prajścі ŭvieś šliach spačatku</string>
<string name="switch_to_vector_map_to_see">Dlia hetaj pazіcyі dastupnyja lakaĺnyja viektarnyja mapy.\n\t\n\tDlia іch vykarystańnia abiarycie punkt meniu Nalada mapy &gt; Krynіca mapy... &gt; Lakaĺnyja vektarnyja mapy.</string>
<string name="switch_to_vector_map_to_see"><![CDATA[Dlia hetaj pazіcyі dastupnyja lakaĺnyja viektarnyja mapy.\n\t\n\tDlia іch vykarystańnia abiarycie punkt meniu Nalada mapy > Krynіca mapy… > Lakaĺnyja vektarnyja mapy.]]></string>
<string name="choose_audio_stream">Vyvad halasavych padkazak</string>
<string name="choose_audio_stream_descr">Abiarycie kanal prajhravańnia halasavych padkazak</string>
<string name="voice_stream_voice_call">Kanal tieliefanavańnia</string>

19
OsmAnd/res/values-be/strings.xml
View file

File diff suppressed because one or more lines are too long

2611
OsmAnd/res/values-bg/strings.xml
View file

File diff suppressed because one or more lines are too long

15
OsmAnd/res/values-ca/phrases.xml
View file

@ -2000,4 +2000,19 @@
<string name="poi_historic_period_first_intermediate_period">Període històric: primer període intermedi (2181-2055 aC)</string>
<string name="poi_historic_period_second_intermediate_period">Període històric: segon període intermedi (1650 – 1550 aC)</string>
<string name="poi_clothes_socks">Mitjons</string>
<string name="poi_historic_period_first_persian_period">Període històric: primer període persa</string>
<string name="poi_historic_period_late_period">Període històric: període tardà (664-332 aC)</string>
<string name="poi_historic_period_second_persian_period">Període històric: segon període persa</string>
<string name="poi_historic_period_alexander_the_great">Període històric: Alexandre el Gran</string>
<string name="poi_historic_period_ptolemaic_egypt">Període històric: Egipte ptolemaic (305 aC-30 aC)</string>
<string name="poi_historic_period_christian_egypt">Període històric: Egipte cristià</string>
<string name="poi_historic_period_byzantine_egypt">Període històric: Egipte bizantí (30 aC - 641 dC)</string>
<string name="poi_historic_period_persian_occupation">Període històric: ocupació persa</string>
<string name="poi_historic_period_greek_dark_ages">Període històric: l\'edat fosca grega (1100-800 aC)</string>
<string name="poi_historic_period_roman_greece">Període històric: greco-romà (146 aC-330 DC)</string>
<string name="poi_historic_period_roman_kingdom">Període històric: Regne romà (753 - 509 aC)</string>
<string name="poi_historic_period_urban">Període històric: urbà (època III, 133 dC - 374 dC)</string>
<string name="poi_historic_period_classical">Període històric: clàssic (època IV, 374 dC - 900 dC)</string>
<string name="poi_historic_period_imperial">Període històric: imperial (època V, 900 dC - 1200 dC)</string>
</resources>

21
OsmAnd/res/values-ca/strings.xml
View file

File diff suppressed because one or more lines are too long

19
OsmAnd/res/values-cs/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy.</string>
<string name="send_files_to_osm">Nahrát GPX soubory do OSM?</string>
@ -680,7 +679,7 @@
<string name="map_online_data_descr">Používat online mapy (stáhnout je a uložit na SD kartě)</string>
<string name="shared_string_online_maps">Online mapy</string>
<string name="online_map_settings_descr">Nastavení rastrových překryvných nebo podkresových map</string>
<string name="osmand_rastermaps_plugin_description">"S tímto modulem můžete použít mnoho druhů online (také zvané dlaždicové nebo rastrové) map, od předdefinovaných OSM dlaždic (jako Mapnik) až po satelitní snímky a speciální vrstvy jako mapy počasí, klimatické mapy, geologické mapy, stínované vrstvy ... atd.\n\nVšechny tyto mapy mohou být použity jako hlavní (základní) mapa na obrazovce OsmAnd nebo jako překryvná popř. podkladová mapa k jiné základní mapě (např. standardní OsmAnd offline mapě). Pro zlepšení viditelnosti podkladových map je možné vypnout některé objekty z vektorových map OsmAnd, přes menu \'Nastavení mapy\'.\n\nDlaždicové mapy můžete získat přímo z online zdrojů nebo si je můžete připravit pro offline použití (zkopírovat ručně do datového adresáře OsmAnd) jako sqlite databázi, která může být vytvořena mnoha programy pro přípravu map. "</string>
<string name="osmand_rastermaps_plugin_description">"S tímto modulem můžete použít mnoho druhů online (také zvané dlaždicové nebo rastrové) map, od předdefinovaných OSM dlaždic (jako Mapnik) až po satelitní snímky a speciální vrstvy jako mapy počasí, klimatické mapy, geologické mapy, stínované vrstvy … atd.\n\nVšechny tyto mapy mohou být použity jako hlavní (základní) mapa na obrazovce OsmAnd nebo jako překryvná popř. podkladová mapa k jiné základní mapě (např. standardní OsmAnd offline mapě). Pro zlepšení viditelnosti podkladových map je možné vypnout některé objekty z vektorových map OsmAnd, přes menu \'Nastavení mapy\'.\n\nDlaždicové mapy můžete získat přímo z online zdrojů nebo si je můžete připravit pro offline použití (zkopírovat ručně do datového adresáře OsmAnd) jako sqlite databázi, která může být vytvořena mnoha programy pro přípravu map. "</string>
<string name="osmand_background_plugin_description">Zobrazí nastavení na povolení záznamu trasy a navigace v úsporném režimu (při vypnuté obrazovce) pravidelným probouzením GPS zařízení.</string>
<string name="osmand_accessibility_description">Tento modul zobrazí nastavení pro speciální funkce ulehčení přístupu přímo v OsmAnd. Například je možné měnit rychlost TTS hlasu, použít trackball na přibližování nebo například použít hlasové předčítání pro oznamování polohy.</string>
<string name="osmand_development_plugin_description">Tento modul zobrazí nastavení vývojových a ladících funkcí, jako jsou simulace navigace, informace o rychlosti vykreslování nebo hlasová oznámení. Tato nastavení jsou určené pro vývojáře a nejsou potřebné pro běžné použití.</string>
@ -1174,13 +1173,13 @@
<string name="osmo_mode_off">Spustit OsMo relaci</string>
<string name="use_points_as_intermediates">Vypočítat trasu mezi body</string>
<string name="osmo_plugin_description">"Tento modul poskytuje funkcionalitu pro takzvané OsMo pokročilé živé sledování, podívejte se na http://osmo.mobi.\n\nMůžete sledovat všechna zařízení spolupracující skupiny v reálném čase a vzájemně spolu komunikovat. Jsou dostupné různé možnosti nastavení krátkodobého nebo trvalého sledování.\n\nAnonymní skupiny lze vytvářet spontáně na určený počet dní a jsou omezené na vybrané funkce, nemají například dálkové ovládání a skupinového správce. Plně funkční skupiny se vytvářejí na webové stránce a jsou přístupné pouze pro registrované uživatele. "</string>
<string name="color_red">červená</string>
<string name="rendering_value_pink_name">růžová</string>
<string name="color_orange">oranžová</string>
<string name="rendering_value_brown_name">hnědá</string>
<string name="color_yellow">žlutá</string>
<string name="color_lightblue">světle modrá</string>
<string name="color_blue">modrá</string>
<string name="osmo_edit_device">Změnit vlastnosti uživatele</string>
<string name="osmo_edit_color">Zobrazit barvu</string>
<string name="osmo_group_info">Informace</string>
@ -1251,7 +1250,7 @@
<string name="osmo_user_name">Uživatel</string>
<string name="osmo_user_joined">Uživatel %1$s připojen ke skupině %2$s</string>
<string name="osmo_user_left">Uživatel %1$s odebrán ze skupiny %2$s</string>
<string name="color_green">zelená</string>
<string name="gpx_file_is_empty">GPX trasa je prázdná</string>
<string name="shared_string_my_tracks">Všechny trasy</string>
<string name="shared_string_my_favorites">Moje oblíbené</string>
@ -1584,7 +1583,7 @@
<string name="filter_poi_hint">Filtrovat podle jména</string>
<string name="search_poi_category_hint">Pište pro vyhledání ve všech</string>
<string name="plugin_touringview_descr">"Aktivováním tohoto pohledu se změní styl mapy na \"Touring view\", který obsahuje víc detailů pro cestovatele a profesionální řidiče.\n\nTento pohled poskytuje ve všech přiblíženích mapy maximum cestovních detailů (např. cesty, chodníky a orientační značky).\n\nTaké zobrazuje typy cest v jednoznačně odlišných barvách, což je užitečné například pro velká vozidla.\n\nPoskytuje také speciální možnosti pro cestování jako cyklotrasy a turistické trasy.\n\nNení potřebné stáhnout samostatný soubor, tento pohled používá standardní mapové soubory.\n\nTento pohled může být vypnut jeho deaktivováním zde, nebo změnou hodnoty ve \"Vykreslování mapy\" v \"Nastavení mapy\". "</string>
<string name="plugin_nautical_descr">"Tento modul obohacuje OsmAnd mapy a navigaci o poskytování námořních map pro plavení, plachtění a ostatní typy vodních sportů.\n\nSpeciální mapový modul pro OsmAnd poskytuje všechny námořní značky a symboly pro navigaci ve vnitrozemí i u pobřeží. Popis každé navigační značky poskytuje všechny údaje k jejich identifikaci (kategorii, tvar, barvu ... atd.)\n\nTento pohled může být vypnut jeho deaktivováním zde, nebo změnou hodnoty ve \"Vykreslování mapy\" v \"Nastavení mapy\". "</string>
<string name="plugin_nautical_descr">"Tento modul obohacuje OsmAnd mapy a navigaci o poskytování námořních map pro plavení, plachtění a ostatní typy vodních sportů.\n\nSpeciální mapový modul pro OsmAnd poskytuje všechny námořní značky a symboly pro navigaci ve vnitrozemí i u pobřeží. Popis každé navigační značky poskytuje všechny údaje k jejich identifikaci (kategorii, tvar, barvu … atd.)\n\nTento pohled může být vypnut jeho deaktivováním zde, nebo změnou hodnoty ve \"Vykreslování mapy\" v \"Nastavení mapy\". "</string>
<string name="plugin_ski_descr">"Tento modul pro OsmAnd zobrazuje sjezdovky, běžecké tratě, skialpinistické trasy, lanovky a lyžařské vleky. Tratě a sjezdovky jsou zobrazeny barvami podle obtížnosti na speciálně barevně upravené zimní mapě.\n\nAktivováním tohoto pohledu se změní styl mapy na \"Winter and ski\", který zobrazuje krajinné útvary v zimních podmínkách. Tento pohled může být vypnut jeho deaktivováním zde, nebo změnou hodnoty ve \"Vykreslování mapy\" v \"Nastavení mapy\". "</string>
<string name="index_name_netherlands">Evropa - Holandsko</string>
<string name="rendering_value__name">Výchozí</string>
@ -1826,7 +1825,7 @@
<string name="access_from_map_description">Tlačítko menu spustí domovskou obrazovku, ne menu</string>
<string name="access_from_map">Přístup z mapy</string>
<string name="copied_to_clipboard">Zkopírované do schránky</string>
<string name="release_2_2">" • nové kontextově závislé rozhraní pro označení umístění na mapě a ostatních obrazovkách\n\n • obrazovka mapy je nyní spouštěná přímo, pokud není zvoleno \'Zobrazit domovskou obrazovku po startu\'\n\n • konfigurace karet zobrazovaných na domovské obrazovce\n\n • domovskou obrazovku je možné obejít, pokud preferujete ovládání aplikace přes menu\n\n • regiony, pro něž chcete stáhnout mapu, je nyní možné vybrat přímo na mapě světa\n\n • vyhledávání POI nyní umožňuje přesnější dotazy\n\n • vylepšená editace POI a OSM\n\n • přepracované rozhraní stahování map\n\n a další... "</string>
<string name="release_2_2">" • nové kontextově závislé rozhraní pro označení umístění na mapě a ostatních obrazovkách\n\n • obrazovka mapy je nyní spouštěná přímo, pokud není zvoleno \'Zobrazit domovskou obrazovku po startu\'\n\n • konfigurace karet zobrazovaných na domovské obrazovce\n\n • domovskou obrazovku je možné obejít, pokud preferujete ovládání aplikace přes menu\n\n • regiony, pro něž chcete stáhnout mapu, je nyní možné vybrat přímo na mapě světa\n\n • vyhledávání POI nyní umožňuje přesnější dotazy\n\n • vylepšená editace POI a OSM\n\n • přepracované rozhraní stahování map\n\n a další… "</string>
<string name="osm_save_offline">Uložit offline</string>
<string name="osm_edit_modified_poi">Upravený OSM POI</string>
<string name="osm_edit_deleted_poi">Smazaný OSM POI</string>

24
OsmAnd/res/values-da/phrases.xml
View file

@ -2522,7 +2522,7 @@
<string name="poi_health_specialty_gynaecology_yes">Sundhedsspeciale: gynækologi</string>
<string name="poi_health_specialty_internal_medicine_yes">Sundhedsspeciale: intern medicin</string>
<string name="poi_health_specialty_orthopaedics_yes">Sundhedsspeciale: ortopædkirurgi</string>
<string name="poi_health_specialty_otolaryngology_yes">oto-rhino-laryngolog: oto-rhino-laryngolog</string>
<string name="poi_health_specialty_otolaryngology_yes">Sundhedsspeciale: oto-rhino-laryngolog</string>
<string name="poi_health_specialty_paediatrics_yes">Sundhedsspeciale: pædiatri</string>
<string name="poi_health_specialty_paediatrics_no">Sundhedsspeciale: pædiatri: nej</string>
<string name="poi_health_specialty_dermatology_yes">Sundhedsspeciale: dermatologi</string>
@ -2536,12 +2536,12 @@
<string name="poi_health_specialty_trauma_yes">Sundhedsspeciale: traumatologi</string>
<string name="poi_health_specialty_biology_yes">Sundhedsspeciale: klinisk biologi</string>
<string name="poi_health_specialty_osteopathy_yes">Sundhedsspeciale: osteopati</string>
<string name="poi_health_specialty_anaesthetics_yes">Sundhedsspeciale: anæstetika</string>
<string name="poi_health_specialty_anaesthetics_yes">Sundhedsspeciale: anæstesi</string>
<string name="poi_health_specialty_pulmonology_yes">Sundhedsspeciale: pneumologi</string>
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Sundhedsspeciale: tand-, mund- og kæbe ansigtskirurgi</string>
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Sundhedsspeciale: tand-, mund-, kæbe og ansigtskirurgi</string>
<string name="poi_health_specialty_maternity_yes">Sundhedsspeciale: barsel</string>
<string name="poi_health_specialty_emergency_medicine_yes">Sundhedsspeciale: ulykkes- og katastrofemedicin</string>
<string name="poi_health_specialty_emergency_medicine_no">Sundhedsspeciale: ulykkes- og katastrofemedicin: nej</string>
<string name="poi_health_specialty_emergency_medicine_yes">Sundhedsspeciale: akutmedicin</string>
<string name="poi_health_specialty_emergency_medicine_no">Sundhedsspeciale: akutmedicin: nej</string>
<string name="poi_health_specialty_plastic_surgery_yes">Sundhedsspeciale: plastikkirurgi</string>
<string name="poi_health_specialty_orthodontics_yes">Sundhedsspeciale: ortodonti</string>
<string name="poi_health_specialty_physiotherapy_yes">Sundhedsspeciale: fysioterapi</string>
@ -2549,34 +2549,34 @@
<string name="poi_health_specialty_occupational_yes">Sundhedsspeciale: ergoterapi</string>
<string name="poi_health_specialty_child_psychiatry_yes">Sundhedsspeciale: børnepsykiatri</string>
<string name="poi_health_specialty_physiatry_yes">Sundhedsspeciale: fysisk medicin og rehabilitering</string>
<string name="poi_health_specialty_maxillofacial_surgery_yes">Sundhedsspeciale:-ansigtskirurgi</string>
<string name="poi_health_specialty_maxillofacial_surgery_yes">Sundhedsspeciale: ansigtskirurgi</string>
<string name="poi_health_specialty_diagnostic_radiology_yes">Sundhedsspeciale: diagnostisk radiologi</string>
<string name="poi_health_specialty_gastroenterology_yes">Sundhedsspeciale: gastroenterologi</string>
<string name="poi_health_specialty_dentistry_yes">Sundhedsspeciale: tandpleje</string>
<string name="poi_health_specialty_nephrology_yes">Sundhedsspeciale: nefrologi (nyre sygdomme)</string>
<string name="poi_health_specialty_nephrology_yes">Sundhedsspeciale: nefrologi (nyresygdomme)</string>
<string name="poi_health_specialty_neurosurgery_yes">Sundhedsspeciale: neurokirurgi</string>
<string name="poi_health_specialty_neuropsychiatry_yes">Sundhedsspeciale: neuropsykiatri</string>
<string name="poi_health_specialty_endocrinology_yes">Sundhedsspeciale: endokrinologi</string>
<string name="poi_health_specialty_nuclear_medicine_yes">Sundhedsspeciale: nuklear medicin</string>
<string name="poi_health_specialty_nuclear_medicine_yes">Sundhedsspeciale: nuklearmedicin</string>
<string name="poi_health_specialty_pathology_yes">Sundhedsspeciale: patologisk anatomi</string>
<string name="poi_health_specialty_oncology_yes">Sundhedsspeciale: onkologi</string>
<string name="poi_health_specialty_tropical_medicine_yes">Sundhedsspeciale: tropemedicin</string>
<string name="poi_health_specialty_tropical_medicine_no">Sundhedsspeciale: tropemedicin: nej</string>
<string name="poi_health_specialty_obstetrics_postnatal_yes">Sundhedsspeciale: obstetrik (postnatal)</string>
<string name="poi_health_specialty_obstetrics_postnatal_no">Sundhedsspeciale: obstetrik (postnatal): nej</string>
<string name="poi_health_specialty_obstetrics_antenatal_yes">Sundhedsspeciale: obstetrik (før fødslen)</string>
<string name="poi_health_specialty_obstetrics_antenatal_no">Sundhedsspeciale: obstetrik (før fødslen): nej</string>
<string name="poi_health_specialty_obstetrics_antenatal_yes">Sundhedsspeciale: obstetrik (prænatal)</string>
<string name="poi_health_specialty_obstetrics_antenatal_no">Sundhedsspeciale: obstetrik (prænatal): nej</string>
<string name="poi_health_specialty_social_paediatrics_yes">Sundhedsspeciale: socialpædiatri</string>
<string name="poi_health_specialty_social_paediatrics_no">Sundhedspeciale: socialpædiatri: nej</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Sundhedsspeciale: obstetrik (kejsersnit)</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Sundhedsspeciale: obstetrik (kejsersnit): nej</string>
<string name="poi_health_specialty_addiction_medicine_yes">Sundhedsspeciale: afhængighed af medicin</string>
<string name="poi_health_specialty_optometry_yes">Sundhedsspeciale: optometry</string>
<string name="poi_health_specialty_optometry_yes">Sundhedsspeciale: optometri</string>
<string name="poi_health_specialty_clinical_pathology_yes">Sundhedspeciale: klinisk patologi</string>
<string name="poi_health_specialty_speech_therapy_yes">Sundhedsspeciale: taleterapi</string>
<string name="poi_health_specialty_manual_therapy_yes">Sundhedsspeciale: manuelterapi</string>
<string name="poi_health_specialty_sports_medicine_yes">Sundhedsspeciale: sportsmedicin</string>
<string name="poi_health_specialty_podology_yes">Sundhedsspeciale: podology</string>
<string name="poi_health_specialty_podology_yes">Sundhedsspeciale: podologi</string>
<string name="poi_health_specialty_adult_psychiatry_yes">Sundhedsspeciale: voksenpsykiatri</string>
<string name="poi_health_specialty_acupuncture_yes">Sundhedsspeciale: akupunktur</string>
<string name="poi_health_specialty_homeopathy_yes">Sundhedsspeciale: homøopati</string>

23
OsmAnd/res/values-da/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
<string name="av_def_action_video">Optag video</string>
<string name="av_def_action_audio">Optag audio</string>
@ -33,7 +32,7 @@
<string name="osmand_srtm_long_description_1000_chars">"Udvidelsen giver både en højdekurver overlejring og et relieflag, der vises ovenpå OsmAnds standard kort. Funktionaliteten er meget værdsat af sportsfolk, vandrere, og enhver interesseret i en relief struktur af landskabet.
\n\nDe globale data (mellem 70 grader nord og 70 grader syd) er baseret på målinger af SRTM (Shuttle Radar Topografi Mission) og ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), et billeddannende instrument ombord på Terra satellitten, flagskibet i NASAs Earth Observering system. ASTER er et samarbejde mellem NASA, Japans Ministry of Economy, Trade and Industry (METI), og Japan Space Systems (J-spacesystems). "</string>
<string name="map_widget_distancemeasurement">Afstandsmåling</string>
<string name="audionotes_location_not_defined">Placering der skal tilknyttes til noten er ikke defineret endnu. \'Brug placering ...\' for at tildele en note til den angivne placering</string>
<string name="audionotes_location_not_defined">Placering der skal tilknyttes til noten er ikke defineret endnu. \'Brug placering …\' for at tildele en note til den angivne placering</string>
<string name="map_widget_audionotes">Audionoter</string>
<string name="audionotes_plugin_description">Audio-/videonoter udvidelse giver funktionalitet til at tage audio-/foto-/videonoter under en tur, enten ved hjælp en knap på skærmen, eller direkte fra kontekstmenuen for en position på kortet.</string>
@ -1386,13 +1385,13 @@
<string name="import_file_favourites">Gem punkter som en GPX-fil eller importer dem til favoritter?</string>
<string name="color_red">Rød</string>
<string name="rendering_value_pink_name">Lyserød</string>
<string name="color_orange">Orange</string>
<string name="rendering_value_brown_name">Brun</string>
<string name="color_yellow">Gul</string>
<string name="color_lightblue">Lyseblå</string>
<string name="color_blue">Blå</string>
<string name="osmo_edit_device">Ændre brugeregenskaber</string>
@ -1408,7 +1407,7 @@
<string name="osmo_use_server_name">Registreret navn</string>
<string name="osmo_connect_to_my_nickname">Kaldenavn</string>
<string name="osmo_user_name">Bruger</string>
<string name="color_green">Grøn</string>
<string name="osmo_follow">Følg</string>
<string name="osmo_show_group_notifications">Vis gruppemeddelelser</string>
@ -1467,7 +1466,7 @@
<string name="osmo_group_by_invite">Tilslut med invitation</string>
<string name="osmo_group_information_desc">" - Alle grupper der oprettes er offentlige! Hvis de skal være anonyme, tilsluttes enheder direkte via sporings-id\'er.\n - Private grupper er begrænset til 8 personer\n - I tilfælde af inaktivitet eller aktivitet af kun 1 person i 2 uger, vil gruppen blive slettet.\n - Man kan begrænse adgangen til gruppen, til kun med invitation, men for at kontrollere gruppen skal man bruge administrationskonsollen.\n - Hvis der er brug for at oprette en gruppe, men med andre betingelser, kontakt http://osmo.mobi"</string>
<string name="osmo_auth_error_short">Autorisation fejlede</string>
<string name="osmo_auth_error">"OsMo autorisation fejl: %$s.\nDet kan være at tjenesten midlertidig er nede eller registreringen er ududløbet. Fortsæt med en ny registrering?"</string>
<string name="osmo_auth_error">"OsMo autorisation fejl: %1$s.\nDet kan være at tjenesten midlertidig er nede eller registreringen er ududløbet. Fortsæt med en ny registrering?"</string>
<string name="rendering_attr_hideBuildings_name">Skjul bygninger</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Skjul gang- og cykelstier</string>
<string name="rendering_attr_hideText_name">Skjul tekst</string>
@ -1515,7 +1514,7 @@
<string name="rendering_attr_hikingRoutesOSMC_description">Generer stier efter OSMC spor</string>
<string name="osmo_invite">Inviter…</string>
<string name="osmo_leave_confirmation_msg">Forlad gruppen %$s?</string>
<string name="osmo_leave_confirmation_msg">Forlad gruppen %1$s?</string>
<string name="osmo_specify_tracker_id">Angiv id</string>
<string name="arrival_distance_factor_early">Tidligt</string>
<string name="arrival_distance_factor_normally">Normal</string>
@ -2095,7 +2094,7 @@
<string name="osn_close_dialog_success">Note lukket</string>
<string name="osm_edit_modified_poi">Ændret OSM IP</string>
<string name="osm_edit_deleted_poi">Slettet OSM IP</string>
<string name="release_2_2">" • Ny kontekstafhængig brugergrænseflade når der vælges lokationer på kortet og på andre skærme\n\n • Kortskærmen vises direkte, medmindre \'Vis betjeningspanel ved start\' er valgt\n\n • Konfigurer hvordan og hvilket indhold der vises på betjeningspanelet\n\n • Forbigå betjeningspanel hvis der ønskes menuen-baserede app-kontrol\n\n • Hent kort, regioner ved at trykke direkte på verdenskortet\n\n • IP søgning understøtter nu mere specifikke forespørgsler\n\n • Forbedret IP og OSM redigeringsfunktionalitet\n\n • Administration af kortfiler struktur og grænseflade er omarbejdet\n\n og mere... "</string>
<string name="release_2_2">" • Ny kontekstafhængig brugergrænseflade når der vælges lokationer på kortet og på andre skærme\n\n • Kortskærmen vises direkte, medmindre \'Vis betjeningspanel ved start\' er valgt\n\n • Konfigurer hvordan og hvilket indhold der vises på betjeningspanelet\n\n • Forbigå betjeningspanel hvis der ønskes menuen-baserede app-kontrol\n\n • Hent kort, regioner ved at trykke direkte på verdenskortet\n\n • IP søgning understøtter nu mere specifikke forespørgsler\n\n • Forbedret IP og OSM redigeringsfunktionalitet\n\n • Administration af kortfiler struktur og grænseflade er omarbejdet\n\n og mere… "</string>
<string name="osm_save_offline">Gem offline</string>
<string name="rendering_attr_currentTrackColor_description">GPX-farve</string>
<string name="rendering_attr_currentTrackWidth_description">GPX-bredde</string>
@ -2113,6 +2112,6 @@
<string name="routing_attr_avoid_stairs_name">Undgå trapper</string>
<string name="routing_attr_avoid_stairs_description">Undgå trapper</string>
<string name="routing_attr_avoid_borders_name">Undgå grænseovergang</string>
<string name="color_lightgreen">Lysegrøn</string>
<string name="color_purple">Lilla</string>
</resources>

13
OsmAnd/res/values-de/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="regions">Regionen</string>
<string name="region_maps">Regionsweite Karten</string>
<string name="world_maps">Weltweite Karten</string>
@ -1583,13 +1582,13 @@ Liste der Unterstützten Länder (annähernd Weltweit!):
Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua and Barbuda, Äquatorialguinea, Arabische Republik Sahara, Argentinien, Armenien, Aruba, Aserbaidschan, Äthiopien, Australien, Bahamas, Bahrain, Bangladesch, Barbados, Belgien, Belize, Benin, Bermuda, Bhutan, Bolivien, Bonaire, Bosnien und Herzegowina, Botswana, Brasilien, Brunei, Bulgarien, Burkina Faso, Burundi, Chile, China, Costa Rica, Curaçao, Dänemark, Deutschland, Dominica, Dominikanische Republik, Dschibuti, Ecuador, El Salvador, Elfenbeinküste, Eritrea, Estland, Fidschi, Finnland, Frankreich, Französisch-Guayana, Französisch-Polynesien, Gabun, Gambia, Georgien, Ghana, Gibraltar, Grenada, Griechenland, Grönland, Großbritannien, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Honduras, Hong Kong, Indien, Indonesien, Insel Man, Irak, Iran, Irland, Island, Israel, Italien, Jamaika, Japan, Jemen, Jersey, Jordanien, Jungferninseln, Kambodscha, Kamerun, Kanada, Kap Verde, Kasastan, Katar, Kenia, Kirgistan, Kiribati, Kolumbien, Komoren, Kongo, Kroatien, Kuba, Kuwait, Laos, Lesotho, Lettland, Libanon, Liberia, Libyen, Liechtenstein, Litauen, Luxemburg, Macao, Madagaskar, Malawi, Malaysia, Malediven, Mali, Malta, Marokko, Martinique, Mauretanien, Mauritius, Mayotte, Mazedonien, Mexiko, Mikronesien, Moldau, Monaco, Mongolei, Montenegro, Montserrat, Mosambik, Myanmar, Namibia, Nauru, Nepal, Neukaledonien, Neuseeland, Nicaragua, Niederlande, Niederländische Antillen, Niger, Nigeria, Nordkorea, Norwegen, Oman, Österreich, Osttimor, Pakistan, Palau, Palästinensische Autonomiegebiete, Panama, Papua-Neuguinea, Paraquay, Peru, Philippinen, Polen, Portugal, Puerto Rico, Ruanda, Rumänien, Russland, Saint-Barthélemy, Saint Helena, Saint Helena, Ascension und Tristan da Cunha, Saint Kitts und Nevis, Saint Lucia, Saint Martin, Saint-Pierre und Miquelon, Saint Vincent und die Grenadinen, Sambia, Samoa, San Marino, Saudi Arabien, Schweden, Schweiz, Senegal, Serbien, Seychellen, Sierra Leona Singapur, Simbabwe, Slovakei, Slowenien, Somalia, Spanien, Sri Lanka, Südafrika, Sudan, Südgeorgien, Südkorea, Südsudan, Suriname, Swasiland, Syrien, Taiwan, Tadschikistan, Tansania, Thailand, Togo, Trinidad und Tobago, Tschad, Tschechische Republik, Tunesien, Türkei, Turkmenistan, Tuvalu, Uganda, Ukraine, Ungarn, Uruguay, Usbekistan, Vanuatu, Vatikan, Venezuela, Vereinigte Arabische Emirate, Vereinigte Staaten von Amerika, Vietnam, Wallis und Futuna, Weißrussland, Zentralafrikanische Republik, Zypern.
</string>
<string name="color_red">Rot</string>
<string name="color_orange">Orange</string>
<string name="color_yellow">Gelb</string>
<string name="color_lightgreen">Hellgrün</string>
<string name="color_green">Grün</string>
<string name="color_lightblue">Hellblau</string>
<string name="color_blue">Blau</string>
<string name="color_purple">Lila</string>
<string name="rendering_value_pink_name">Pink</string>
<string name="rendering_value_brown_name">Braun</string>
@ -2137,7 +2136,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="access_from_map_description">Menü-Knopf zeigt Dashboard, nicht Menü</string>
<string name="show_on_start_description">\"Aus\" startet direkt die Kartenansicht</string>
<string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
<string name="release_2_2">" • Neue Kontext-bezogene Benutzeroberfläche bei Auswahl von Orten auf der Karte und anderen Ansichten\n\n • Kartenansicht wird nun direkt gestartet, außer bei Auswahl von \'Zeige Dashboard bei App-Start\'\n\n • Auswahl der anzuzeigenden Elemente im Dashboard möglich\n\n • Dashboard kann umgangen werden, falls menü-basierte App-Steuerung gewünscht ist\n\n • Zum Herunterladen von Kartendateien können nun Regionen direkt durch Tippen auf der Weltkarte ausgewählt werden\n\n • Die POI-Suche ermöglicht nun speziellere Abfragen\n\n • Verbesserungen beim Editieren von POI- und OSM-Objekten\n\n • Oberfläche und Struktur zum Herunterladen der Karten wurden überarbeitet\n\n und mehr ... "</string>
<string name="release_2_2">" • Neue Kontext-bezogene Benutzeroberfläche bei Auswahl von Orten auf der Karte und anderen Ansichten\n\n • Kartenansicht wird nun direkt gestartet, außer bei Auswahl von \'Zeige Dashboard bei App-Start\'\n\n • Auswahl der anzuzeigenden Elemente im Dashboard möglich\n\n • Dashboard kann umgangen werden, falls menü-basierte App-Steuerung gewünscht ist\n\n • Zum Herunterladen von Kartendateien können nun Regionen direkt durch Tippen auf der Weltkarte ausgewählt werden\n\n • Die POI-Suche ermöglicht nun speziellere Abfragen\n\n • Verbesserungen beim Editieren von POI- und OSM-Objekten\n\n • Oberfläche und Struktur zum Herunterladen der Karten wurden überarbeitet\n\n und mehr … "</string>
<string name="osm_save_offline">offline speichern</string>
<string name="osm_edit_modified_poi">geänderter OSM-POI</string>
<string name="osm_edit_deleted_poi">OSM-POI löschen</string>

10
OsmAnd/res/values-el/strings.xml
View file

@ -1011,7 +1011,7 @@
<string name="recording_photo_description">Φωτογραφία %1$s %2$s</string>
<string name="av_def_action_picture">Λήψη φωτογραφίας</string>
<string name="recording_context_menu_precord">Λήψη φωτογραφίας</string>
<string name="audionotes_location_not_defined">Δεν έχει καθοριστεί ακόμα τοποθεσία για συσχέτιση με την σημείωση. \"Χρήση τοποθεσίας ...\" για να συνδέσετε την σημείωση με την καθορισμένη τοποθεσία</string>
<string name="audionotes_location_not_defined">Δεν έχει καθοριστεί ακόμα τοποθεσία για συσχέτιση με την σημείωση. \"Χρήση τοποθεσίας …\" για να συνδέσετε την σημείωση με την καθορισμένη τοποθεσία</string>
<string name="local_indexes_cat_av">Δεδομένα Ήχου/Εικόνας</string>
<string name="precise_routing_mode_descr">Ενεργοποίηση για υπολογισμό δρομολογίων με ακρίβεια χωρίς προβλήματα. Ακόμη περιορισμένο σε σχέση με την απόσταση και αργό.</string>
@ -1184,13 +1184,13 @@
<string name="gpx_info_average_speed">Μέση ταχύτητα: %1$s </string>
<string name="gpx_info_maximum_speed">Μέγιστη ταχύτητα: %1$s </string>
<string name="gpx_info_avg_altitude">Μέσο υψόμετρο: %1$s</string>
<string name="color_red">κόκκινο</string>
<string name="rendering_value_pink_name">ροζ</string>
<string name="color_orange">πορτοκαλί</string>
<string name="rendering_value_brown_name">καφέ</string>
<string name="color_yellow">κίτρινο</string>
<string name="color_lightblue">γαλάζιο</string>
<string name="color_blue">μπλε</string>
<string name="color_green">πράσινο</string>
<string name="hours_ago">ώρες πριν</string>

13
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
<string name="copying_osmand_file_failed">Falló al copiar archivos</string>
@ -312,14 +311,14 @@
<string name="osmo_group_info">Información</string>
<string name="osmo_edit_color">Mostrar color</string>
<string name="osmo_edit_device">Cambiar propiedades de usuario</string>
<string name="color_green">verde</string>
<string name="color_blue">azul</string>
<string name="color_lightblue">azul claro</string>
<string name="color_yellow">amarillo</string>
<string name="rendering_value_brown_name">marrón</string>
<string name="color_orange">anaranjado</string>
<string name="rendering_value_pink_name">rosa</string>
<string name="color_red">rojo</string>
<string name="osmo_user_name">Usuario</string>
<string name="osmo_connect_to_my_nickname">Mi apodo</string>
<string name="osmo_use_server_name">Nombre registrado</string>
@ -1979,7 +1978,7 @@
<string name="rendering_attr_roadStyle_description">Estilo de carretera</string>
<string name="poi_dialog_reopen">Reabrir</string>
<string name="osm_save_offline">Guardar sin conexión</string>
<string name="release_2_2">" • Nueva interfaz de usuario sensible al contexto para aprovechar lugares en el mapa y en otra pantallas.\n\n• La pantalla del mapa ahora se inicia directamente, a menos que \'Mostrar panel de control al iniciar la aplicación\', este seleccionado.\n\n• Configura cuál y cómo se mostrarán las tarjetas en el panel de control.\n\n• Omitir el panel del control, si quieres controlar la aplicación desde el menú.\n\n• Para descargar mapas, las regiones pueden seleccionarse directamente pulsando sobre el mapa mundial.\n\n• Mejor recálculo de la ruta (después de reiterados intentos, el motor ahora sugiere una ruta diferente).\n\n• La búsqueda de PDI, ahora soporta consultas más específicas.\n\n• Mejoras en PDI y funcionalidad de edición OSM.\n\n• Se rediseñó la estructura e interfaz de los datos de mapas.\n\n y más... "</string>
<string name="release_2_2">" • Nueva interfaz de usuario sensible al contexto para aprovechar lugares en el mapa y en otra pantallas.\n\n• La pantalla del mapa ahora se inicia directamente, a menos que \'Mostrar panel de control al iniciar la aplicación\', este seleccionado.\n\n• Configura cuál y cómo se mostrarán las tarjetas en el panel de control.\n\n• Omitir el panel del control, si quieres controlar la aplicación desde el menú.\n\n• Para descargar mapas, las regiones pueden seleccionarse directamente pulsando sobre el mapa mundial.\n\n• Mejor recálculo de la ruta (después de reiterados intentos, el motor ahora sugiere una ruta diferente).\n\n• La búsqueda de PDI, ahora soporta consultas más específicas.\n\n• Mejoras en PDI y funcionalidad de edición OSM.\n\n• Se rediseñó la estructura e interfaz de los datos de mapas.\n\n y más… "</string>
<string name="copied_to_clipboard">Copiado al portapapeles</string>
<string name="use_dashboard_btn">Usar panel de control</string>
<string name="use_drawer_btn">Usar menú</string>

15
OsmAnd/res/values-es/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="layer_map_appearance">Configurar pantalla</string>
<string name="show_lanes">Mostrar carriles</string>
@ -1319,13 +1318,13 @@
<string name="osmo_conn_successfull">Conexión establecida: %1$s </string>
<string name="osmo_groups">Grupos/Dispositivos OsMo</string>
<string name="osmo_group_info">Información</string>
<string name="color_red">rojo</string>
<string name="rendering_value_pink_name">rosa</string>
<string name="color_orange">anaranjado</string>
<string name="rendering_value_brown_name">marrón</string>
<string name="color_yellow">amarillo</string>
<string name="color_lightblue">azul claro</string>
<string name="color_blue">azul</string>
<string name="osmo_edit_device">Cambiar propiedades de usuario</string>
<string name="osmo_edit_color">Mostrar color</string>
<string name="osmo_group">Grupo OsMo</string>
@ -1377,7 +1376,7 @@
<string name="osmo_use_server_name">Nombre registrado</string>
<string name="osmo_connect_to_my_nickname">Mi apodo</string>
<string name="osmo_user_name">Usuario</string>
<string name="color_green">verde</string>
<string name="osmo_user_joined">El usuario %1$s se ha unido al grupo %2$s</string>
<string name="osmo_user_left">El usuario %1$s ha abandonado el grupo %2$s</string>
<string name="osmo_show_group_notifications">Mostrar notificaciones de grupo</string>
@ -1976,7 +1975,7 @@
<string name="rendering_attr_currentTrackWidth_description">Ancho del GPX</string>
<string name="rendering_attr_roadStyle_description">Estilo de carretera</string>
<string name="osm_save_offline">Guardar sin conexión</string>
<string name="release_2_2">" • Nueva interfaz de usuario sensible al contexto para aprovechar lugares en el mapa y en otra pantallas.\n\n• La pantalla del mapa ahora se inicia directamente, a menos que \'Mostrar panel de control al iniciar la aplicación\', este seleccionado.\n\n• Configura cuál y cómo se mostrarán las tarjetas en el panel de instrumentos.\n\n• Omitir el panel de control, si quieres controlar la aplicación desde el menú.\n\n• Para descargar mapas, las regiones pueden seleccionarse directamente pulsando sobre el mapa mundial.\n\n• Mejor recálculo de la ruta (después de reiterados intentos, el motor ahora sugiere una ruta diferente).\n\n• La búsqueda de PDI, ahora soporta consultas más específicas.\n\n• Mejoras en PDI y funcionalidad de edición OSM.\n\n• Se rediseñó la estructura e interfaz de los datos de mapas.\n\n y más... "</string>
<string name="release_2_2">" • Nueva interfaz de usuario sensible al contexto para aprovechar lugares en el mapa y en otra pantallas.\n\n• La pantalla del mapa ahora se inicia directamente, a menos que \'Mostrar panel de control al iniciar la aplicación\', este seleccionado.\n\n• Configura cuál y cómo se mostrarán las tarjetas en el panel de instrumentos.\n\n• Omitir el panel de control, si quieres controlar la aplicación desde el menú.\n\n• Para descargar mapas, las regiones pueden seleccionarse directamente pulsando sobre el mapa mundial.\n\n• Mejor recálculo de la ruta (después de reiterados intentos, el motor ahora sugiere una ruta diferente).\n\n• La búsqueda de PDI, ahora soporta consultas más específicas.\n\n• Mejoras en PDI y funcionalidad de edición OSM.\n\n• Se rediseñó la estructura e interfaz de los datos de mapas.\n\n y más… "</string>
<string name="copied_to_clipboard">Copiado al portapapeles</string>

18
OsmAnd/res/values-eu/strings.xml
View file

@ -178,7 +178,7 @@
<string name="osmand_srtm_short_description_80_chars">OsmAnden lineaz kanpoko sestra-kurben plugina</string>
<string name="osmand_srtm_long_description_1000_chars">Plugin honek OsmAnd-eko lineaz kanpoko mapetan agertu daitezkeen sestra-kurbak eskaintzen ditu. Datu globalak (iparraldean 70 gradutan eta hegoaldean 70 gradutan) STRM (Shuttle Radar Topography Mission) eta ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer) neurrietan oinarrituak daude, espazioko Terra irudi tresna, NASAren Lurra Behatzeko Sistemaren satelite emblematikoa. ASTER NASAren, Japoniako Ekonomi, Merkataritza eta Industria Ministerioaren (EMIM), eta Japoneko Espazio Sistemaren (J-espaziosistema) elkarlanaren ondorioz sortua izan da.</string>
<string name="map_widget_distancemeasurement">Distantzia neurketa</string>
<string name="audionotes_location_not_defined">Ez dago oharrarekin erlazionaturiko kokapenik definituta. \"Kokapena erabili...\" aukeratutako kokapenari ohar bat lotzeko</string>
<string name="audionotes_location_not_defined">Ez dago oharrarekin erlazionaturiko kokapenik definituta. \"Kokapena erabili…\" aukeratutako kokapenari ohar bat lotzeko</string>
<string name="map_widget_audionotes">Audio oharrak</string>
<string name="audionotes_plugin_description">Ibilaldian zehar audio/bideo oharrak hartu</string>
@ -671,7 +671,7 @@
<string name="installing_new_resources">Datu berriak desenpaketatzen...</string>
<string name="installing_new_resources">Datu berriak desenpaketatzen…</string>
<string name="internet_connection_required_for_online_route">Sareako nabigazio zerbitzu bat izan da aukeratua baina ez dago interneterako konexiorik.</string>
<string name="tts_language_not_supported_title">Hizkuntza ez da onartzen</string>
<string name="tts_language_not_supported">Aukeratutako hizkuntza instalatutako Android TTS (text-to-speech) motorrak ez du jasaten. Beste TTS motor bat bilatu nahi duzu Marketen? Bestela, oraingo TTS hizkuntza erabiliko da.</string>
@ -691,7 +691,7 @@
<string name="overlay_transparency">Gainazalaren gardentasuna</string>
<string name="map_transparency_descr">Eraldatu onarri den maparen gardentasuna</string>
<string name="map_transparency">Oinarri den maparen gardentasuna</string>
<string name="layer_underlay">Azpiazal mapa...</string>
<string name="layer_underlay">Azpiazal mapa…</string>
<string name="map_underlay">Azpiazal mapa</string>
<string name="map_underlay_descr">Aukeratu azpiazal mapa</string>
<string name="layer_overlay">Gainazal mapa…</string>
@ -1196,7 +1196,7 @@
\n Oharra : fitxategi zaharrak ukitu gabe jarraituko dute.
\n Oharra : OsmAnd eta OsmAnd+ artean ezingo dira fitxategiak partekatu. </string>
<string name="copying_osmand_one_file_descr">Fitxategia kopiatzen (%s) kokapen berrira...</string>
<string name="copying_osmand_one_file_descr">Fitxategia kopiatzen (%s) kokapen berrira…</string>
<string name="copying_osmand_files_descr">OsmAnd fitxategiak kopiatzen kokapen berrira (%s)</string>
<string name="copying_osmand_files">OsmAnd fitxategiak kopiatzen</string>
<string name="app_mode_truck">Kamioia</string>
@ -1208,7 +1208,7 @@
<string name="routing_attr_short_way_name">Ibilbide laburra</string>
<string name="routing_attr_short_way_description">Ibilbide laburra erabili</string>
<string name="rendering_attr_coloredBuildings_name">Koloreetako eraikinak</string>
<string name="osmo_invite">Gonbidatu...</string>
<string name="osmo_invite">Gonbidatu…</string>
<string name="osmo_leave_confirmation_msg">%1$s taldea utzi nahi duzu?</string>
<string name="osmo_specify_tracker_id">Id-a espezifikatu</string>
<string name="continue_navigation">Jarraitu Nabigazioa</string>
@ -1318,13 +1318,13 @@
<string name="osmo_follow">Jarraitu</string>
<string name="osmo_user_name">Erabiltzailea</string>
<string name="color_red">gorria</string>
<string name="rendering_value_pink_name">arrosa</string>
<string name="color_orange">laranja</string>
<string name="rendering_value_brown_name">marroia</string>
<string name="color_yellow">horia</string>
<string name="color_lightblue">urdin argia</string>
<string name="color_blue">urdina</string>
<string name="color_green">berdea</string>
<string name="osmo_edit_device">Aldatu erabiltzailearen propietateak</string>

14
OsmAnd/res/values-fa/strings.xml
View file

@ -655,7 +655,7 @@
<string name="settings_preset_descr">نمای نقشه و تنظیمات مسیریابی برای هر پروفایل ذخیره میشود. پروفایل پیش فرض خود را اینجا تنظیم کنید.</string>
<string name="osmand_background_plugin_description">تنظیمات فعالسازی سرویسهای واقعه نگاری در حالت خواب (صفحه خاموش) را بوسیله روشن کردن مرتب دستگاه GPS نشان میدهد.</string>
<string name="av_def_action_choose">انتخاب برحسب تقاضا</string>
<string name="audionotes_location_not_defined">مکان مربوط به این یادداشت هنوز تعریف نشده است. برای اختصاص یادداشت به یک محل \"استفاده از موقعیت...\" را انتخاب کنید</string>
<string name="audionotes_location_not_defined">مکان مربوط به این یادداشت هنوز تعریف نشده است. برای اختصاص یادداشت به یک محل \"استفاده از موقعیت…\" را انتخاب کنید</string>
<string name="rendering_attr_showRoadMaps_description">انتخاب کنید چه زمانی تنها نقشه راهها نشان داده شود:</string>
<string name="target_points">نقاط بین راهی</string>
<string name="ending_point_too_far">نقطه پایانی از نزدیکترین جاده خیلی دور است.</string>
@ -807,7 +807,7 @@
<string name="gpx_option_destination_point">استفاده از مسیر جاری</string>
<string name="gpx_option_from_start_point">گذر از تمامی مسیر</string>
<string name="switch_to_vector_map_to_see">برای این محل نقشه بُرداری آفلاین وجود دارد.
\n\t\n\tبرای فعالسازی آن به \'منو\'←\'پیکربندی نقشه\'←\'منبع نقشه...\'←\'نقشه‌های بُرداری آفلاین \' بروید.</string>
\n\t\n\tبرای فعالسازی آن به \'منو\'←\'پیکربندی نقشه\'←\'منبع نقشه…\'←\'نقشه‌های بُرداری آفلاین \' بروید.</string>
<string name="choose_audio_stream">خروجی راهنمای صوتی</string>
<string name="layer_underlay">نقشه زیرین…</string>
<string name="map_underlay">نقشه زیری</string>
@ -1047,7 +1047,7 @@
- قابلیت آنلاین (دریافت نقشه ها و یا فایل های دیگر)
- در دسترس بودن فایلهای فشرده نقشه تمامی نقاط جهان
- دانلود نقشه ها به صورت آنلاین توسط برنامه
- نقشه های دارای لایه های مختلف از قبیل مسیرهای GPX، مکانهای مهم، علاقمندیها، خطوط همتراز و ایستگاههای حمل و نقل عمومی و ...
- نقشه های دارای لایه های مختلف از قبیل مسیرهای GPX، مکانهای مهم، علاقمندیها، خطوط همتراز و ایستگاههای حمل و نقل عمومی و …
جستجوی آفلاین مسیرها و اماکن مهم(POIها)
مسیریابی آفلاین برای مسیرهای کوتاه (تجربی)
دارای حالتهای عابر پیاده، دوچرخه و خودرو
@ -1553,13 +1553,13 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
<string name="osmo_use_server_name">این نام ثبت شده</string>
<string name="osmo_connect_to_my_nickname">نام مستعار</string>
<string name="osmo_user_name">کاربر</string>
<string name="color_red">قرمز</string>
<string name="rendering_value_pink_name">صورتی</string>
<string name="color_orange">نارنجی</string>
<string name="rendering_value_brown_name">قهوه ای</string>
<string name="color_yellow">زرد</string>
<string name="color_lightblue">آبی روشن</string>
<string name="color_blue">آبی</string>
<string name="color_green">سبز</string>
<string name="osmo_edit_device">تغییر تنظیمات کاربر</string>

27
OsmAnd/res/values-fr/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="offline_edition">Modifications hors-ligne</string>
<string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
@ -526,7 +525,7 @@
<string name="shared_string_close">Fermer</string>
<string name="loading_data">Chargement des données</string>
<string name="reading_indexes">Lecture des index…</string>
<string name="previous_run_crashed">Oups ... OsmAnd a planté. Souhaitez-vous nous envoyer le fichier journal ?</string>
<string name="previous_run_crashed">Oups … OsmAnd a planté. Souhaitez-vous nous envoyer le fichier journal ?</string>
<string name="saving_gpx_tracks">Enregistrement des traces GPX sur la carte SD…</string>
<string name="finished_task">Terminé</string>
@ -682,7 +681,7 @@
<string name="online_map_settings_descr">Configurer la source de la carte en ligne ou en cache</string>
<string name="osmand_rastermaps_plugin_description">"Ce greffon permet d\'accéder à une grande gamme de cartes en ligne (aussi appelées tuiles ou cartes raster) qui vont de cartes OpenStreetMap (comme les tuiles Mapnik) jusqu\'aux images satellites en passant par des cartes spécialisées comme des cartes météo, des cartes de climat, des cartes géologiques, etc ...\n\nChacune de ces cartes est utilisable soit comme carte principale soit comme sur ou sous couche d\'une autre carte. Afin de gérer au mieux la superposition des cartes, vous pouvez masquer certains éléments des cartes vectorielles hors ligne depuis le menu \"Configurer la carte\".\n\nCes cartes tuiles peuvent être obtenues directement en ligne et peuvent également être préparées grâce à des outils tiers puis copiées dans le dossier de données d\'OsmAnd sous forme de base de données sqlite. "</string>
<string name="osmand_rastermaps_plugin_description">"Ce greffon permet d\'accéder à une grande gamme de cartes en ligne (aussi appelées tuiles ou cartes raster) qui vont de cartes OpenStreetMap (comme les tuiles Mapnik) jusqu\'aux images satellites en passant par des cartes spécialisées comme des cartes météo, des cartes de climat, des cartes géologiques, etc …\n\nChacune de ces cartes est utilisable soit comme carte principale soit comme sur ou sous couche d\'une autre carte. Afin de gérer au mieux la superposition des cartes, vous pouvez masquer certains éléments des cartes vectorielles hors ligne depuis le menu \"Configurer la carte\".\n\nCes cartes tuiles peuvent être obtenues directement en ligne et peuvent également être préparées grâce à des outils tiers puis copiées dans le dossier de données d\'OsmAnd sous forme de base de données sqlite. "</string>
<string name="osmand_background_plugin_description">Affiche les préférences afin d\'activer le suivi et la navigation en tâche de fond (écran éteint) en réveillant périodiquement le GPS.</string>
<string name="osmand_accessibility_description">Ce greffon donne accès directement dans OsmAnd aux options d\'accessibilité de votre appareil (réglage de la vitesse des voix TTS, utilisation du trackball pour zoomer ou annonce automatique de votre position).</string>
@ -1162,7 +1161,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="distance_measurement_start_editing">Démarrer la mesure sur la carte</string>
<string name="distance_measurement_finish_editing">Terminer la mesure</string>
<string name="distance_measurement_load_gpx">Ouvrir un fichier GPX...</string>
<string name="distance_measurement_load_gpx">Ouvrir un fichier GPX…</string>
<string name="wait_current_task_finished">Veuillez attendre que la tâche en cours soit terminée</string>
<string name="plugin_distance_point_time">temps</string>
<string name="plugin_distance_point_hdop">précision</string>
@ -1451,13 +1450,13 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="import_file_favourites">Enregistrer les points comme fichier GPX ou les transformer en favoris ?</string>
<string name="color_red">Rouge</string>
<string name="rendering_value_pink_name">Rose</string>
<string name="color_orange">Orange</string>
<string name="rendering_value_brown_name">Brun</string>
<string name="color_yellow">Jaune</string>
<string name="color_lightblue">Bleu clair</string>
<string name="color_blue">Bleu</string>
<string name="osmo_edit_device">Modifier les caractéristiques de l\'utilisateur</string>
@ -1474,7 +1473,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="osmo_use_server_name">Nom enregistré</string>
<string name="osmo_connect_to_my_nickname">Mon pseudo</string>
<string name="osmo_user_name">Utilisateur</string>
<string name="color_green">vert</string>
<string name="osmo_user_joined">L\'utilisateur %1$s a rejoint le groupe %2$s</string>
<string name="osmo_user_left">L\'utilisateur %1$s a quitté le groupe %2$s</string>
<string name="osmo_show_group_notifications">Montrer les notifications de groupe</string>
@ -1611,7 +1610,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="speak_poi">Points d\'intérêt proches</string>
<string name="shared_string_all">Tous</string>
<string name="index_tours">Tours</string>
<string name="record_plugin_description">"Ce greffon permet d\'enregistrer vos itinéraires au format GPX : soit automatiquement soit grâce à un bouton supplémentaire affiché sur la carte.\n\nLes traces ainsi enregistrées peuvent être partagées avec vos amis ou utilisées pour contribuer à OSM. Les sportifs peuvent utiliser ces enregistrements pour leurs entraînements. Certaines analyses des traces peuvent être réalisées directement dans OmsAnd (comme la vitesse moyenne, la durée de l\'itinéraire ...). Enfin les fichiers GPX locaux peuvent être exportés pour être utilisés par d\'autres applications. "</string>
<string name="record_plugin_description">"Ce greffon permet d\'enregistrer vos itinéraires au format GPX : soit automatiquement soit grâce à un bouton supplémentaire affiché sur la carte.\n\nLes traces ainsi enregistrées peuvent être partagées avec vos amis ou utilisées pour contribuer à OSM. Les sportifs peuvent utiliser ces enregistrements pour leurs entraînements. Certaines analyses des traces peuvent être réalisées directement dans OmsAnd (comme la vitesse moyenne, la durée de l\'itinéraire …). Enfin les fichiers GPX locaux peuvent être exportés pour être utilisés par d\'autres applications. "</string>
<string name="record_plugin_name">Enregistrement d\'itinéraire</string>
<string name="int_hour">h</string>
<string name="duration">Durée</string>
@ -1764,7 +1763,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="shared_string_export">Exporter</string>
<string name="plugin_ski_descr">"Activer cette vue bascule vers le style \"Hiver et Ski\", affichant le relief en conditions hivernales, ainsi que les pistes de ski (dont la difficulté est représentée par un code couleurs) et les remontées mécaniques.\n\nCet affichage peut être annulé soit en le désactivant ici, soit en modifiant le Style de la carte dans \"Configurer la carte\". "</string>
<string name="plugin_touringview_descr">"Activer cette vue bascule vers le style d\'affichage \"Grand tourisme\", affichant une carte très détaillée adaptée aux voyageurs et chauffeurs routiers.
\n\nCet affichage, quel que soit le niveau de zoom, fournit le maximum de détails disponibles. Chaque type de voie (routes, pistes, chemins ...) est distingué de manière explicite grâce à des codes couleurs, ce qui est particulièrement utile en cas de conduite de grands véhicules. Il existe aussi des options pour l\'affichage desitinéraires cyclables ou des chemins de randonnée.\n\nIl n\'est pas nécessaire de télécharger une carte supplémentaire, cet affichage s\'appuyant sur les cartes standards.
\n\nCet affichage, quel que soit le niveau de zoom, fournit le maximum de détails disponibles. Chaque type de voie (routes, pistes, chemins …) est distingué de manière explicite grâce à des codes couleurs, ce qui est particulièrement utile en cas de conduite de grands véhicules. Il existe aussi des options pour l\'affichage desitinéraires cyclables ou des chemins de randonnée.\n\nIl n\'est pas nécessaire de télécharger une carte supplémentaire, cet affichage s\'appuyant sur les cartes standards.
\n\nCet affichage peut être annulé soit en le désactivant ici, soit en modifiant le Style de la carte dans \"Configurer la carte\". "</string>
<string name="plugin_touringview_name">Grand tourisme</string>
<string name="plugin_nautical_descr">"Activer cette vue bascule vers le style \"Nautique\", affichant une carte avec le balisage pour la navigation.
@ -1822,7 +1821,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="welcome_select_region">Afin de prendre en compte la signalisation routière et le code de la route, merci de sélectionner votre région :</string>
<string name="welcome_text">Avec OsmAnd visualisez des cartes hors-ligne et naviguez sans couverture réseau dans le monde entier !</string>
<string name="welcome_header">Bienvenue</string>
<string name="confirm_usage_speed_cameras">Dans certains pays (France, Allemagne, Italie, ...) l\'utilisation d\'alertes radars est interdite par la loi. OsmAnd décline toute responsabilité en cas de violation de la loi. Pour activer cette fonctionnalité en toute connaissance de cause, répondez \"Oui\".</string>
<string name="confirm_usage_speed_cameras">Dans certains pays (France, Allemagne, Italie, …) l\'utilisation d\'alertes radars est interdite par la loi. OsmAnd décline toute responsabilité en cas de violation de la loi. Pour activer cette fonctionnalité en toute connaissance de cause, répondez \"Oui\".</string>
<string name="agps_info">Données A-GPS</string>
<string name="agps_data_last_downloaded">Dernière mise à jour des données A-GPS : %1$s</string>
<string name="shared_string_message">Message</string>
@ -2128,6 +2127,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="routing_attr_avoid_stairs_name">Éviter les escaliers</string>
<string name="routing_attr_avoid_borders_name">Éviter le franchissement de frontières</string>
<string name="routing_attr_avoid_stairs_description">Éviter les escaliers</string>
<string name="release_2_2">" • Nouveaux menus contextuels sur un point de la carte\n\n • Choix de l\'affichage au démarrage (tableau de bord ou carte)\n\n • Personnalisation du contenu du tableau de bord\n\n • Possibilité d\'ignorer le tableau de bord et de n\'utiliser que les menus\n\n • Téléchargement des cartes des régions en appuyant directement sur la carte mondiale\n\n • Amélioration de la recherche des PI (Point d\'Intérêt)\n\n • Amélioration des PI (Point d\'Intérêt) et des contributions OSM (Open Street Map)\n\n • Refonte du téléchargement des cartes\n\n et bien plus encore ... "</string>
<string name="release_2_2">" • Nouveaux menus contextuels sur un point de la carte\n\n • Choix de l\'affichage au démarrage (tableau de bord ou carte)\n\n • Personnalisation du contenu du tableau de bord\n\n • Possibilité d\'ignorer le tableau de bord et de n\'utiliser que les menus\n\n • Téléchargement des cartes des régions en appuyant directement sur la carte mondiale\n\n • Amélioration de la recherche des PI (Point d\'Intérêt)\n\n • Amélioration des PI (Point d\'Intérêt) et des contributions OSM (Open Street Map)\n\n • Refonte du téléchargement des cartes\n\n et bien plus encore … "</string>
<string name="poi_context_menu_modify_osm_change">Modifier la contribution OSM</string>
</resources>

10
OsmAnd/res/values-gl/strings.xml
View file

@ -173,13 +173,13 @@
<string name="osmo_use_server_name">Nome rexistrado</string>
<string name="osmo_connect_to_my_nickname">O meu alcume</string>
<string name="osmo_user_name">Usuario</string>
<string name="color_red">vermello</string>
<string name="rendering_value_pink_name">rosa</string>
<string name="color_orange">laranxa</string>
<string name="rendering_value_brown_name">marrón</string>
<string name="color_yellow">amarelo</string>
<string name="color_lightblue">azul claro</string>
<string name="color_blue">azul</string>
<string name="color_green">verde</string>
<string name="osmo_edit_device">Cambiar as propiedades do usuario</string>
@ -547,7 +547,7 @@
<string name="osmand_srtm_short_description_80_chars">Engadido de OsmAnd para curvas de nivel sen conexión</string>
<string name="osmand_srtm_long_description_1000_chars">"Este engadido fornece unha capa de sobreposición de curvas de nivel e unha capa de sombras de altitude (relevo) que poden ser mostradas nos mapas sen conexión de OsmAnd. Esta funcionalidade pode ser moi apreciada por atletas, camiñantes, sendeiristas e calquera que teña interese pola estrutura de relevo da paisaxe.\n\nOs datos globais (entre os 70 graos norte e os 70 graos sul) están baseados nas medicións de SRTM (Misión Topográfica con Radar da Lanzadeira Espacial) e ASTER (Radiómetro Espacial Avanzado de Emisión Térmica e Reflexión) e instrumentos de imaxes a bordo do Terra, o satélite máis importante do Sistema de Observación Terrestre da NASA. ASTER é un esforzo cooperativo entre a NASA, o Ministerio de Economía do Xapón, Comercio e Industria (METI) e Sistemas Espaciais Xaponeses (J-spaceystems). "</string>
<string name="map_widget_distancemeasurement">Medición de distancias</string>
<string name="audionotes_location_not_defined">A situación que asociar coa nota aínda non foi definida. Con «Empregar a situación...» pódeselle asignar unha nota á situación indicada</string>
<string name="audionotes_location_not_defined">A situación que asociar coa nota aínda non foi definida. Con «Empregar a situación…» pódeselle asignar unha nota á situación indicada</string>
<string name="map_widget_audionotes">Notas de son</string>
<string name="audionotes_plugin_description">O engadido de notas de son/vídeo fornece a funcionalidade de tomar notas de son/fotografía/vídeo durante unha viaxe, usando tanto un botón da pantalla do mapa ou directamente co menú de contexto para calquera posición do mapa.</string>

2
OsmAnd/res/values-he/strings.xml
View file

@ -615,7 +615,7 @@
<string name="continuous_rendering">עיבוד תמונה רציף</string>
<string name="continuous_rendering_descr">הצגת עיבוד תמונה רציף במקום תמונה אחת בכל פעם</string>
<string name="rendering_exception">אירעה שגיאה בעת עיבוד האיזור הנבחר</string>
<string name="show_point_options">שימוש במיקום...</string>
<string name="show_point_options">שימוש במיקום…</string>
<string name="renderer_load_sucess">תכונת העיבוד נטענה בהצלחה</string>
<string name="renderer_load_exception">אירעה חריגה: תכונת העיבוד לא נטענה</string>
<string name="renderers">תכונת עיבוד וקטורים</string>

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

@ -1223,13 +1223,13 @@
\nTočke</string>
<string name="osmo_connect_to_my_nickname">Moj nadimak</string>
<string name="osmo_user_name">Korisnik</string>
<string name="color_red">crvena</string>
<string name="rendering_value_pink_name">roza</string>
<string name="color_orange">narančasta</string>
<string name="rendering_value_brown_name">smeđa</string>
<string name="color_yellow">žuta</string>
<string name="color_lightblue">svijetloplava</string>
<string name="color_blue">plava</string>
<string name="color_green">zelena</string>
<string name="osmo_edit_color">Boja prikaza</string>

13
OsmAnd/res/values-hu/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="send_files_to_osm">GPX fájl küldése OSM-re?</string>
<string name="gpx_visibility_txt">Láthatóság</string>
<string name="gpx_tags_txt">Címkék</string>
@ -1319,13 +1318,13 @@
<string name="keep_informing_descr">Navigációs utasítások újra bemondása rendszeres időközönként</string>
<string name="keep_informing">Navigációs utasítások ismétlése</string>
<string name="navigation_intent_invalid">Érvénytelen formátum: %s</string>
<string name="color_red">piros</string>
<string name="rendering_value_pink_name">rózsaszín</string>
<string name="color_orange">narancs</string>
<string name="rendering_value_brown_name">barna</string>
<string name="color_yellow">sárga</string>
<string name="color_lightblue">világoskék</string>
<string name="color_blue">kék</string>
<string name="osmo_edit_device">Felhasználói tulajdonságok módosítása</string>
@ -1392,7 +1391,7 @@
<string name="osmo_use_server_name">Regisztrált név</string>
<string name="osmo_connect_to_my_nickname">Felhasználónevem</string>
<string name="osmo_user_name">Felhasználó</string>
<string name="color_green">zöld</string>
<string name="osmo_track_interval">Rögzítési intervallum</string>
<string name="osmo_track_interval_descr">Válaszd ki a pozícióküldés gyakoriságát</string>

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

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
<string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
<string name="offline_edition">Modifiche offline</string>
@ -976,7 +975,7 @@
<string name="audionotes_plugin_name">Note audio/video</string>
<string name="audionotes_location_not_defined">La posizione da associare con la nota non è ancora definita. \"Usa posizione ...\" per assegnare una nota alla posizione specificata</string>
<string name="audionotes_location_not_defined">La posizione da associare con la nota non è ancora definita. \"Usa posizione …\" per assegnare una nota alla posizione specificata</string>
<string name="osmand_srtm_short_description_80_chars">Plugin Osmand per le curve di livello offline</string>
<string name="osmand_srtm_long_description_1000_chars">"Questo plugin fornisce sia le curve di livello che lo strato ombreggiamento dei rilievi che possono essere visualizzate nelle mappe normali di OsmAnd. Questa funzionalità sarà molto apprezzata dagli atleti, dagli escursionisti, e tutti coloro che sono interessati all\'orografia e al paesaggio.\n\nI dati globali (fra i 70 gradi nord e 70 gradi sud) sono basati su misurazioni del SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), lo strumento misuratore a bordo Terra, il satellite della NASA del sistema di osservazione della terra. ASTER è uno sforzo di cooperazione tra NASA, il Ministero dell\'Economia del Giappone, Commercio e Industria (METI) e sistema spaziale giapponese (J-spacesystems). "</string>
@ -1363,13 +1362,13 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="import_file_favourites">Salvare i punti come file GPX o importarli nei favoriti?</string>
<string name="color_red">rosso</string>
<string name="rendering_value_pink_name">rosa</string>
<string name="color_orange">arancione</string>
<string name="rendering_value_brown_name">marrone</string>
<string name="color_yellow">giallo</string>
<string name="color_lightblue">blu chiaro</string>
<string name="color_blue">blu</string>
<string name="osmo_edit_device">Cambia le proprietà dell\'utilizzatore</string>
@ -1385,7 +1384,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="osmo_use_server_name">Nome registrato</string>
<string name="osmo_connect_to_my_nickname">Mio nickname</string>
<string name="osmo_user_name">Utente</string>
<string name="color_green">verde</string>
<string name="osmo_follow">Segui</string>
<string name="osmo_user_joined">L\'utente %1$s è entrato nel gruppo %2$s</string>

15
OsmAnd/res/values-ja/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="installing_new_resources">新しいデータを展開中…</string>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="installing_new_resources">新しいデータを展開中…</string>
<string name="internet_connection_required_for_online_route">オンライン経路案内を使用しようとしていますが
インターネット接続されていません。</string>
<string name="tts_language_not_supported_title">未サポート言語</string>
@ -17,7 +16,7 @@
<string name="switch_to_raster_map_to_see">現在の位置は あなたのオフラインベクターマップではカバーされていません、 追加でベクターマップをダウンロードする場合は設定内のマップデータ等管理にて、またはオンラインマップにも切り替えることが出来ます(オンラインマッププラグインを使用した場合)。</string>
<string name="switch_to_vector_map_to_see">現在地のベクターマップを見るには\n\t\n\t\'メニュー\' →\'マップ設定\' →\'マップソース...\' →\'オフラインベクターマップ\'を有効にします。</string>
<string name="switch_to_vector_map_to_see">現在地のベクターマップを見るには\n\t\n\t\'メニュー\' →\'マップ設定\' →\'マップソース…\' →\'オフラインベクターマップ\'を有効にします。</string>
<string name="choose_audio_stream">音声案内ストリーム</string>
<string name="choose_audio_stream_descr">音声案内を再生するチャンネルを選択します(使用可否はシステムに依存します)</string>
@ -1448,13 +1447,13 @@ POIの更新は利用できません</string>
<string name="osmo_use_server_name">登録名</string>
<string name="osmo_connect_to_my_nickname">ニックネーム</string>
<string name="osmo_user_name">ユーザー</string>
<string name="color_red">レッド</string>
<string name="rendering_value_pink_name">ピンク</string>
<string name="color_orange">オレンジ</string>
<string name="rendering_value_brown_name">ブラウン</string>
<string name="color_yellow">イエロー</string>
<string name="color_lightblue">ライトブルー</string>
<string name="color_blue">ブルー</string>
<string name="color_green">グリーン</string>
<string name="osmo_edit_device">ユーザープロパティの変更</string>
@ -2044,7 +2043,7 @@ POIの更新は利用できません</string>
<string name="access_from_map">マップ画面から開く</string>
<string name="show_on_start_description">OFFの場合、起動時マップのみ表示します</string>
<string name="copied_to_clipboard">クリップボードにコピーしました</string>
<string name="release_2_2">" • マップ画面や他の画面で項目をタップした場合のコンテキストメニューの刷新\n\n • ダッシュボード設定で\'起動時に表示\'をOFFにすることで今まで通りにマップ画面が直接表示出来る様に、選択式に変更\n\n • ダッシュボード設定で任意の項目だけ表示できる様に変更可能\n\n • ダッシュボード設定で今まで通りメニューボタンでメニューが開ける様に設定可能\n\n • マップ画面で世界地図表示状態から任意の地点のマップデータをダウンロード可能に\n\n • POI検索時より具体的に検索できる様に変更\n\n • POIやOSMの項目編集機能を改善\n\n • マップやその他データのダウンロード構造とUIを刷新\n\n他多数... "</string>
<string name="release_2_2">" • マップ画面や他の画面で項目をタップした場合のコンテキストメニューの刷新\n\n • ダッシュボード設定で\'起動時に表示\'をOFFにすることで今まで通りにマップ画面が直接表示出来る様に、選択式に変更\n\n • ダッシュボード設定で任意の項目だけ表示できる様に変更可能\n\n • ダッシュボード設定で今まで通りメニューボタンでメニューが開ける様に設定可能\n\n • マップ画面で世界地図表示状態から任意の地点のマップデータをダウンロード可能に\n\n • POI検索時より具体的に検索できる様に変更\n\n • POIやOSMの項目編集機能を改善\n\n • マップやその他データのダウンロード構造とUIを刷新\n\n他多数… "</string>
<string name="osm_save_offline">ｵﾌﾗｲﾝで保存</string>
<string name="osm_edit_modified_poi">OSMのPOIが変更されました</string>
<string name="osm_edit_deleted_poi">OSMのPOIが削除されました</string>

2
OsmAnd/res/values-ka/strings.xml
View file

@ -1027,7 +1027,7 @@
<string name="map_widget_distancemeasurement">მანძილის გაზომვა</string>
<string name="audionotes_location_not_defined">მდებარეობა შენიშვნის მისაბმელად ჯერ განსაზღვრული არაა. გამოიყენეთ \"მდებარეობის გამოყენება...\" შენიშვნის სასურველი მდებარეობისათვის მისანიჭებლად</string>
<string name="audionotes_location_not_defined">მდებარეობა შენიშვნის მისაბმელად ჯერ განსაზღვრული არაა. გამოიყენეთ \"მდებარეობის გამოყენება…\" შენიშვნის სასურველი მდებარეობისათვის მისანიჭებლად</string>
<string name="map_widget_audionotes">ხმოვანი შენიშვნები</string>
<string name="audionotes_plugin_description">მგზავრობისას ხმოვანი/ვიდეო შენიშვნების ჩაწერა</string>

10
OsmAnd/res/values-ko/strings.xml
View file

@ -1589,13 +1589,13 @@
<string name="import_file_favourites">장소를 GPX 파일로 저장 할까요? 또는 즐겨찾기로 가져오기 할까요?</string>
<string name="color_red">빨강</string>
<string name="rendering_value_pink_name">분홍</string>
<string name="color_orange">오렌지</string>
<string name="rendering_value_brown_name">갈색</string>
<string name="color_yellow">노랑</string>
<string name="color_lightblue">밝은 청색</string>
<string name="color_blue">파랑</string>
<string name="osmo_edit_device">사용자 등록정보 변경</string>
@ -1612,7 +1612,7 @@
<string name="osmo_use_server_name">등록된 이름</string>
<string name="osmo_connect_to_my_nickname">내 별명</string>
<string name="osmo_user_name">사용자</string>
<string name="color_green">녹색</string>
<string name="osmo_user_joined">사용자 %1$s이(가) 그룹 %2$s에 합류합니다</string>
<string name="osmo_user_left">"사용자 %1$s가 그룹 %2$s에 남습니다"</string>

11
OsmAnd/res/values-lt/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
<string name="shared_location">Bendrinta vieta</string>
<string name="osmand_parking_warning">Dėmesio</string>
@ -1392,13 +1391,13 @@
<string name="osmo_use_server_name">Registruotas vardas</string>
<string name="osmo_connect_to_my_nickname">Mano slapyvardis</string>
<string name="osmo_user_name">Vartotojas</string>
<string name="color_red">raudona</string>
<string name="rendering_value_pink_name">rožinė</string>
<string name="color_orange">oranžinė</string>
<string name="rendering_value_brown_name">ruda</string>
<string name="color_yellow">geltona</string>
<string name="color_lightblue">žydra</string>
<string name="color_blue">mėlyna</string>
<string name="color_green">žalia</string>
<string name="osmo_edit_device">Pakeisti vartotojo nustatymus</string>

15
OsmAnd/res/values-lv/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
<string name="prefs_plugins_descr">Spraudņi papildina aplikācijas iespējas un dod papildus funkcionalitāti</string>
<string name="prefs_plugins">Spraudņi</string>
@ -1166,7 +1165,7 @@
<string name="map_widget_av_notes">Audio/video piezīmes</string>
<string name="osmand_srtm_short_description_80_chars">OsmAnd spraudnis bezsaistes kontūrlīnijām</string>
<string name="map_widget_distancemeasurement">Distances mērīšana</string>
<string name="audionotes_location_not_defined">Nav definēta atrašanās vieta, ko piesaistīt piezīmei. Lai to izdarītu, izvēlieties \"Lietot atrašanās vietu...\"</string>
<string name="audionotes_location_not_defined">Nav definēta atrašanās vieta, ko piesaistīt piezīmei. Lai to izdarītu, izvēlieties \"Lietot atrašanās vietu…\"</string>
<string name="map_widget_audionotes">Audio piezīmes</string>
<string name="audionotes_plugin_description">Ceļojuma laikā uzņemt audio/video piezīmes.</string>
@ -1560,13 +1559,13 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="import_file_favourites">Vai saglabāt vietas GPX failā vai importēt izlasē?</string>
<string name="seconds_ago">sekundes atpakaļ</string>
<string name="color_red">sarkans</string>
<string name="rendering_value_pink_name">rozā</string>
<string name="color_orange">oranžs</string>
<string name="rendering_value_brown_name">brūns</string>
<string name="color_yellow">dzeltens</string>
<string name="color_lightblue">gaiši zils</string>
<string name="color_blue">zils</string>
<string name="osmo_edit_device">Mainīt lietotāja uzstādījumus</string>
@ -1582,7 +1581,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="osmo_use_server_name">Reģistrētais vārds</string>
<string name="osmo_connect_to_my_nickname">Mans segvārds</string>
<string name="osmo_user_name">Lietotājs</string>
<string name="color_green">zaļš</string>
<string name="osmo_follow">Sekot</string>
<string name="osmo_user_joined">Lietotājs %1$s pievienojās %2$s grupai</string>

11
OsmAnd/res/values-nb/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
<string name="rendering_attr_roadColors_name">Veifargeskjema</string>
<string name="map_widget_show_destination_arrow">Vis retning til målet</string>
@ -890,13 +889,13 @@
<string name="fav_point_dublicate_message">Spesifisert favorittnavn er allerede i bruk og endres til %1$s for å unngå duplisering.</string>
<string name="gpx_selection_point">Punkt %1$s</string>
<string name="osmo_center_location">Sentrer på skjermen</string>
<string name="color_red">rød</string>
<string name="rendering_value_pink_name">rosa</string>
<string name="color_orange">orange</string>
<string name="rendering_value_brown_name">brun</string>
<string name="color_yellow">gul</string>
<string name="color_lightblue">lyseblå</string>
<string name="color_blue">blå</string>
<string name="color_green">grønn</string>
<string name="osmo_group_info">Info</string>

17
OsmAnd/res/values-nl/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="layer_map_appearance">Configureer scherm</string>
<string name="show_lanes">Toon rijstroken</string>
@ -1535,13 +1534,13 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="import_file_favourites">Punten bewaren als GPX-bestand of importeren in favorieten?</string>
<string name="color_red">rood</string>
<string name="rendering_value_pink_name">roze</string>
<string name="color_orange">oranje</string>
<string name="rendering_value_brown_name">bruin</string>
<string name="color_yellow">geel</string>
<string name="color_lightblue">lichtblauw</string>
<string name="color_blue">blauw</string>
<string name="osmo_edit_device">Wijzig gebruiker-instellingen</string>
@ -1557,7 +1556,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="osmo_use_server_name">Geregistreerde naam</string>
<string name="osmo_connect_to_my_nickname">Mijn bijnaam</string>
<string name="osmo_user_name">Gebruikersnaam</string>
<string name="color_green">groen</string>
<string name="osmo_follow">Volgen</string>
<string name="osmo_user_joined">Gebruiker %1$s is nu lid van groep %2$s</string>
@ -1716,7 +1715,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="fav_point_emoticons_message">Favoriet bewaard als %1s omdat vreemde tekens niet opgeslagen kunnen worden in een bestand.</string>
<string name="print_route">Route afdrukken</string>
<string name="speed_limit_exceed">Te hoge snelheid melden bij...</string>
<string name="speed_limit_exceed">Te hoge snelheid melden bij…</string>
<string name="speed_limit_exceed_message">Hoeveel de maximumsnelheid mag worden overschreden voordat een melding volgt.</string>
<string name="rendering_category_transport">Openbaar vervoer</string>
<string name="rendering_category_others">Overige kaart attributen</string>
@ -2220,7 +2219,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="dashboard_or_drawer_description">Kies tussen het flexibele dashboard of een vast menu. Dit is altijd te wijzigen via de dashboard-instellingen.</string>
<string name="copied_to_clipboard">Gekopieerd naar klembord</string>
<string name="release_2_2">" • Nieuw contextmenu bij het aantikken van plekken op de kaart en op andere schermen\n\n • De kaart wordt direct getoond, tenzij \'Toon dashboard bij starten van de app\' is gekozen\n\n • Kies welke kaarten worden getoond op het dashboard\n\n • Mogelijkheid menu te grbuiken in plaats van het dashboard\n\n • Kaarten downloaden door op de wereldkaart te tikken\n\n • Fijnmaziger zoeken van POI\n\n • Betere bewerkingsmogelijkheden van POI en OSM\n\n • Kaarten downloaden is makkelijker en overzichtelijker\n\n en meer... "</string>
<string name="release_2_2">" • Nieuw contextmenu bij het aantikken van plekken op de kaart en op andere schermen\n\n • De kaart wordt direct getoond, tenzij \'Toon dashboard bij starten van de app\' is gekozen\n\n • Kies welke kaarten worden getoond op het dashboard\n\n • Mogelijkheid menu te grbuiken in plaats van het dashboard\n\n • Kaarten downloaden door op de wereldkaart te tikken\n\n • Fijnmaziger zoeken van POI\n\n • Betere bewerkingsmogelijkheden van POI en OSM\n\n • Kaarten downloaden is makkelijker en overzichtelijker\n\n en meer… "</string>
<string name="shared_string_commit">Verstuur</string>
<string name="context_menu_item_delete_waypoint">GPX routepunt wissen?</string>

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

@ -65,13 +65,13 @@
<string name="osmo_sign_in">Logg inn</string>
<string name="osmo_connect_to_my_nickname">Kallenamnet mitt</string>
<string name="osmo_user_name">Brukarnamn</string>
<string name="color_red">raud</string>
<string name="rendering_value_pink_name">rosa</string>
<string name="color_orange">oransje</string>
<string name="rendering_value_brown_name">brun</string>
<string name="color_yellow">gul</string>
<string name="color_lightblue">lyseblå</string>
<string name="color_blue">blå</string>
<string name="color_green">grøn</string>
<string name="osmo_edit_device">Endra brukareigenskapar</string>

15
OsmAnd/res/values-pl/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="use_transparent_map_theme">Przezroczysty styl</string>
<string name="native_library_not_supported">To urządzenie nie obsługuje biblioteki renderowania natywnego.</string>
@ -1462,13 +1461,13 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="osmo_tracker_id_descr">Kliknij, aby zobaczyć lub udostępnić identyfikator trackera.
Używając identyfikatora trackera podłączone urządzenia będą mogły śledzić każdy ruch tego urządzenia! Aby się rozłączyć, wybierz opcję: Generuj ponownie.</string>
<string name="osmo_locations_sent">Położenie wysłane %1$d (w buforze %2$d) </string>
<string name="color_red">czerwony</string>
<string name="rendering_value_pink_name">różowy</string>
<string name="color_orange">pomarańczowy</string>
<string name="rendering_value_brown_name">brązowy</string>
<string name="color_yellow">żółty</string>
<string name="color_lightblue">jasnoniebieski</string>
<string name="color_blue">niebieski</string>
<string name="osmo_edit_device">Zmień właściwości użytkownika</string>
@ -1513,7 +1512,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="osmo_use_server_name">Zarejestrowana nazwa</string>
<string name="osmo_connect_to_my_nickname">Mój nick</string>
<string name="osmo_user_name">Użytkownik</string>
<string name="color_green">zielony</string>
<string name="osmo_user_joined">Użytkownik %1$s dołączył do grupy %2$s</string>
<string name="osmo_user_left">Użytkownik %1$s opuścił grupę %2$s</string>
@ -2100,7 +2099,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="access_from_map_description">Wyświetla kokpit zamiast menu</string>
<string name="access_from_map">Dostęp z mapy</string>
<string name="copied_to_clipboard">Skopiowane do schowka</string>
<string name="release_2_2">" • Nowe menu kontekstowe, przystosowane do wybierania lokacji na mapie oraz na innych wyświetlaczach\n\n• Mapa jest teraz wyświetlana bezpośrednio, o ile nie wybrano opcji \'Pokaż pulpit podczas startu aplikacji\'\n\n• Można skonfigurować które zakładki oraz jak będą wyświetlane na pulpicie\n\n• Pomiń panel jeżeli chcesz kontrolować aplikacją poprzez menu\n\n• W celu pobrania map, interesujące nas regiony można wybrać bezpośrednio na mapie świata\n\n• Wyszukiwarka POI wspiera teraz bardziej precyzyjne zapytania\n\n• Poprawiona funkcjonalność POI oraz edytora OSM\n\n• Struktura oraz interfejs menu pobierania map zostały ulepszone\n\ni więcej ... "</string>
<string name="release_2_2">" • Nowe menu kontekstowe, przystosowane do wybierania lokacji na mapie oraz na innych wyświetlaczach\n\n• Mapa jest teraz wyświetlana bezpośrednio, o ile nie wybrano opcji \'Pokaż pulpit podczas startu aplikacji\'\n\n• Można skonfigurować które zakładki oraz jak będą wyświetlane na pulpicie\n\n• Pomiń panel jeżeli chcesz kontrolować aplikacją poprzez menu\n\n• W celu pobrania map, interesujące nas regiony można wybrać bezpośrednio na mapie świata\n\n• Wyszukiwarka POI wspiera teraz bardziej precyzyjne zapytania\n\n• Poprawiona funkcjonalność POI oraz edytora OSM\n\n• Struktura oraz interfejs menu pobierania map zostały ulepszone\n\ni więcej … "</string>
<string name="context_menu_item_open_note">Otwórz notatkę OSM</string>
<string name="osn_bug_name">Notatka OSM</string>
<string name="osn_comment_dialog_title">Dodaj komentarz</string>

56
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -1942,4 +1942,60 @@
<string name="poi_wheelchair_description">Descrição para usuários cadeirantes</string>
<string name="poi_ramp_wheelchair_yes">Rampa para cadeira de rodas: sim</string>
<string name="poi_ramp_wheelchair_no">Rampa para cadeira de rodas: não</string>
<string name="poi_route_ferry_ref">Balsa</string>
<string name="poi_route_railway_ref">Rota ferroviária</string>
<string name="poi_historic_yes">Objeto histórico</string>
<string name="poi_surveillance_yes">Vigilância: sim</string>
<string name="poi_shop_yes">Com loja</string>
<string name="poi_service_bicycle_retail_yes">Venda de bicicletas: sim</string>
<string name="poi_service_bicycle_retail_no">Venda de bicicletas: não</string>
<string name="poi_service_bicycle_repair_yes">Conserto de bicicletas: sim</string>
<string name="poi_service_bicycle_repair_no">Conserto de bicicletas: não</string>
<string name="poi_service_bicycle_rental_yes">Aluguel de bicicletas: sim</string>
<string name="poi_service_bicycle_rental_no">Aluguel de bicicletas: não</string>
<string name="poi_service_bicycle_pump_yes">Bomba de bicicleta: sim</string>
<string name="poi_service_bicycle_pump_no">Bomba de bicicleta: não</string>
<string name="poi_service_bicycle_diy_yes">Ferramentas para reparação de bicicleta DIY: sim</string>
<string name="poi_service_bicycle_diy_no">Ferramentas para reparação de bicicleta DIY: não</string>
<string name="poi_service_bicycle_cleaning_yes">Limpeza de bicicletas: sim</string>
<string name="poi_service_bicycle_cleaning_no">Limpeza de bicicletas: não</string>
<string name="poi_service_bicycle_chaintool_yes">Ferramenta para correia de bicicleta: sim</string>
<string name="poi_service_bicycle_chaintool_no">Ferramenta para correia de bicicleta: não</string>
<string name="poi_service_bicycle_second_hand_yes">Venda de bicicletas de segunda mão: sim</string>
<string name="poi_service_bicycle_second_hand_no">Venda de bicicletas de segunda mão: não</string>
<string name="poi_wildlife_hide">Observatório de vida selvagem</string>
<string name="poi_training_language">Treinamento: idioma</string>
<string name="poi_training_music">Treinamento: música</string>
<string name="poi_training_dance">Treinamento: dança</string>
<string name="poi_training_sport">Treinamento: esporte</string>
<string name="poi_training_art">Treinamento: arte</string>
<string name="poi_training_cooking">Treinamento: cozinhar</string>
<string name="poi_training_computer">Treinamento: computação</string>
<string name="poi_training_yoga">Treinamento: ioga</string>
<string name="poi_training_martial_art">Treinamento: arte marcial</string>
<string name="poi_training_aviation">Treinamento: aviação</string>
<string name="poi_training_hairdressing">Treinamento: cabeleireiro</string>
<string name="poi_monument_yes">Monumento</string>
<string name="poi_industrial_oil">Tipo: indústria petroleira</string>
<string name="poi_industrial_wellsite">Tipo: poço</string>
<string name="poi_industrial_factory">Tipo: fábrica</string>
<string name="poi_industrial_gas">Tipo: indústria de gás</string>
<string name="poi_industrial_timber">Tipo: madeira</string>
<string name="poi_industrial_refinery">Tipo: refinaria</string>
<string name="poi_industrial_warehouse">Tipo: armazém</string>
<string name="poi_industrial_agriculture">Tipo: agricultura</string>
<string name="poi_industrial_brewery">Tipo: cervejaria</string>
<string name="poi_industrial_brickyard">Tipo: olaria</string>
<string name="poi_industrial_sawmill">Tipo: serraria</string>
<string name="poi_industrial_water_purification">Tipo: purificação de água</string>
<string name="poi_industrial_port">Tipo: porto</string>
<string name="poi_industrial_depot">Tipo: depósito</string>
</resources>

15
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="shared_string_my_places">Meus locais</string>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="shared_string_my_places">Meus locais</string>
<string name="days_behind">dias atrás</string>
<string name="watch">Ver</string>
<string name="rendering_attr_pisteGrooming_name">Pista de preparação</string>
@ -461,13 +460,13 @@
<string name="osmo_use_server_name">Nome registrado</string>
<string name="osmo_connect_to_my_nickname">Meu apelido</string>
<string name="osmo_user_name">Usuário</string>
<string name="color_red">vermelho</string>
<string name="rendering_value_pink_name">rosa</string>
<string name="color_orange">laranja</string>
<string name="rendering_value_brown_name">marrom</string>
<string name="color_yellow">amarelo</string>
<string name="color_lightblue">azul claro</string>
<string name="color_blue">azul</string>
<string name="color_green">verde</string>
<string name="osmo_edit_device">Alterar as propriedades do usuário</string>
@ -788,7 +787,7 @@
<string name="recording_default_name">Gravando</string>
<string name="map_widget_av_notes">Notas de áudio/vídeo</string>
<string name="map_widget_distancemeasurement">Medição de distância</string>
<string name="audionotes_location_not_defined">Local para associar com a nota ainda não está definido. \"Usar posição...\" para atribuir uma nota para o local especificado</string>
<string name="audionotes_location_not_defined">Local para associar com a nota ainda não está definido. \"Usar posição…\" para atribuir uma nota para o local especificado</string>
<string name="map_widget_audionotes">Notas de áudio</string>
<string name="index_srtm_parts">peças</string>
<string name="download_select_map_types">Outros mapas</string>
@ -1814,7 +1813,7 @@
<string name="access_from_map">Acessar a partir do mapa</string>
<string name="show_on_start_description">\'Desligado\' lança diretamente para a tela do mapa</string>
<string name="copied_to_clipboard">Copiado para a área de transferência</string>
<string name="release_2_2">" • Nova interface do usuário sensível ao contexto, ao tocar locais no mapa ou em outras telas\n\n • Tela do mapa é agora lançada diretamente, a menos que \'Mostrar painel de controle no início\' esteja selecionado\n\n • Configure quais e de que forma os cartões são exibidos no painel de controle\n\n • Desative o painel de controle, se preferir um controle baseado em menus\n\n • Para baixar mapas, as regiões podem ser selecionadas diretamente, tocando no mapa do mundo\n\n • Pesquisa por \'Pontos de interesse\' agora oferece suporte a consultas mais específicas\n\n • Melhoria nos \'Pontos de interesse\' e funcionalidades de edição OSM\n\n • Reformulação de estrutura e de interface para baixa dados de mapa.\n\n e mais... "</string>
<string name="release_2_2">" • Nova interface do usuário sensível ao contexto, ao tocar locais no mapa ou em outras telas\n\n • Tela do mapa é agora lançada diretamente, a menos que \'Mostrar painel de controle no início\' esteja selecionado\n\n • Configure quais e de que forma os cartões são exibidos no painel de controle\n\n • Desative o painel de controle, se preferir um controle baseado em menus\n\n • Para baixar mapas, as regiões podem ser selecionadas diretamente, tocando no mapa do mundo\n\n • Pesquisa por \'Pontos de interesse\' agora oferece suporte a consultas mais específicas\n\n • Melhoria nos \'Pontos de interesse\' e funcionalidades de edição OSM\n\n • Reformulação de estrutura e de interface para baixa dados de mapa.\n\n e mais… "</string>
<string name="access_from_map_description">O botão menu lança o painel de controle, não o menu</string>
<string name="osm_save_offline">Salvar offline</string>
<string name="osm_edit_modified_poi">POI no OSM modificado</string>

19
OsmAnd/res/values-pt/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="amenity_type_administrative">Administrativo</string>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="amenity_type_administrative">Administrativo</string>
<string name="amenity_type_barrier">Barreira</string>
<string name="amenity_type_education">Educação</string>
<string name="amenity_type_emergency">Emergência</string>
@ -1046,7 +1045,7 @@
<string name="map_widget_distancemeasurement">Medição da distância</string>
<string name="audionotes_location_not_defined">Local para associar com a nota ainda não está definido. \"Usar localização...\" para atribuir uma nota para o local especificado</string>
<string name="audionotes_location_not_defined">Local para associar com a nota ainda não está definido. \"Usar localização…\" para atribuir uma nota para o local especificado</string>
<string name="map_widget_audionotes">Notas de áudio</string>
<string name="audionotes_plugin_description">O plugin de notas de áudio/vídeo fornece a funcionalidade para tomar notas de áudio/fotografia/vídeo durante uma viagem, usando um botão na tela do mapa ou diretamente do menu de contexto para qualquer posição no mapa.</string>
@ -1359,13 +1358,13 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="osmo_use_server_name">Nome registado</string>
<string name="osmo_connect_to_my_nickname">Minha alcunha</string>
<string name="osmo_user_name">Utilizador</string>
<string name="color_red">vermelho</string>
<string name="rendering_value_pink_name">rosa</string>
<string name="color_orange">laranja</string>
<string name="rendering_value_brown_name">castanho</string>
<string name="color_yellow">amarelo</string>
<string name="color_lightblue">azul claro</string>
<string name="color_blue">azul</string>
<string name="color_green">verde</string>
<string name="osmo_edit_device">Mudar propriedades do utilizador</string>
@ -1414,7 +1413,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="osmo_tracker_id_descr">Clique para partilhar a identificação do tracker
Ao usar a identificação do tracker, aparelhos ligados podem ver todos os movimentos deste aparelho ! Para desligar seleccione a opção regenerar.</string>
<string name="osmo_session_token">Token de sessão: %1$s</string>
<string name="osmo_auth_pending">Aguardando autorização...</string>
<string name="osmo_auth_pending">Aguardando autorização…</string>
<string name="osmo_locations_sent">Localização enviada %1$d (in buffer %2$d) </string>
<string name="osmo_conn_successfull">Ligação estabelecida : %1$s </string>
<string name="osmo_io_error">Problema de ligação OsMo </string>
@ -1474,7 +1473,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
         \n Nota: Os arquivos antigos permanecerão intocados.
         \n Nota: não será possível compartilhar arquivos entre OsmAnd e OsmAnd + . </string>
<string name="copying_osmand_one_file_descr">Copiando o arquivo (%s) para novo destino ...</string>
<string name="copying_osmand_one_file_descr">Copiando o arquivo (%s) para novo destino …</string>
<string name="copying_osmand_files_descr">Cópia de arquivos Osmand para novo destino (%s)</string>
<string name="copying_osmand_files">Cópia de arquivos Osmand</string>
<string name="calculate_osmand_route_gpx">Calcular rota offline OsmAnd</string>
@ -1826,7 +1825,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="show_on_start">Mostrar no arranque</string>
<string name="copied_to_clipboard">Copiado para a Área de Transferências</string>
<string name="release_2_2">" • Novo interface do utilizador sensível ao contexto, ao tocar locais no mapa, ou em outras telas\n\n• Tela do Mapa é agora lançada diretamente, a menos que \'Mostrar Painel de instrumentos no arranque\' seja selecionado\n\n• Configure quais e de que forma os cartões são exibidos no Painel de instrumentos\n\n• Desactivar o Painel, se preferir um controle baseado em menus\n\n• Para fazer download de mapas, as regiões podem ser seleccionadas directamente, tocando no mapa do mundo\n\n• Busca por \'Pontos de Interesse\' agora oferece suporte a consultas mais específicas\n\n• Melhoria nos \'Pontos de Interesse\' e funcionalidades de edição OSM\n\n• Reformulação de estrutura e de interface para download de mapas de dados
\n\ne mais... "</string>
\n\ne mais… "</string>
<string name="osm_save_offline">Guardar off-line</string>
<string name="osm_edit_modified_poi">Ponto de Interesse OSM modificado</string>
</resources>

11
OsmAnd/res/values-ro/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="background_service_is_enabled_question">Serviciul sleep încă rulează în background. Doriți să-l opriți?</string>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="background_service_is_enabled_question">Serviciul sleep încă rulează în background. Doriți să-l opriți?</string>
<string name="close_changeset">Închide setul de modificări</string>
@ -1328,13 +1327,13 @@
<string name="osmo_use_server_name">Nume înregistrat</string>
<string name="osmo_connect_to_my_nickname">Porecla mea</string>
<string name="osmo_user_name">Utilizator</string>
<string name="color_red">roșu</string>
<string name="rendering_value_pink_name">roz</string>
<string name="color_orange">portocaliu</string>
<string name="rendering_value_brown_name">maro</string>
<string name="color_yellow">galben</string>
<string name="color_lightblue">albastru deschis</string>
<string name="color_blue">albastru</string>
<string name="color_green">verde</string>
<string name="osmo_edit_device">Schimbă proprietăți utilizator</string>

10
OsmAnd/res/values-ru/strings.xml
View file

@ -1230,13 +1230,13 @@
<string name="osmo_connect">Подключиться к</string>
<string name="osmo_server_operation_failed">OsMo: не удалось правильно обработать команду</string>
<string name="import_file_favourites">Сохранить точки как файл GPX или импортировать их в избранное?</string>
<string name="color_red">красный</string>
<string name="rendering_value_pink_name">розовый</string>
<string name="color_orange">оранжевый</string>
<string name="rendering_value_brown_name">коричневый</string>
<string name="color_yellow">жёлтый</string>
<string name="color_lightblue">голубой</string>
<string name="color_blue">синий</string>
<string name="osmo_create_groups_confirm">Чтобы создавать группы Вы должны быть зарегистрированным пользователем OsMo.</string>
<string name="osmo_sign_in">Войти</string>
<string name="osmo_regenerate_login_ids_confirm">Вы уверены в необходимости регенерации персональных ID? Все устройства, соединённые с Вами, больше не смогут отследить Вас.</string>
@ -1244,7 +1244,7 @@
<string name="osmo_use_server_name">Зарегистрированное имя</string>
<string name="osmo_connect_to_my_nickname">Мой ник</string>
<string name="osmo_user_name">Пользователь</string>
<string name="color_green">зелёный</string>
<string name="osmo_credentials_not_valid">Ваши учётные данные OsMo не верны.</string>
<string name="osmo_follow">Следить</string>
<string name="osmo_edit_device">Изменить пользовательские настройки</string>

15
OsmAnd/res/values-sc/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
<string name="voice_pref_title">Boghe</string>
<string name="misc_pref_title">Mistura</string>
@ -321,7 +320,7 @@
<string name="osmand_srtm_long_description_1000_chars">"Custa estensione frunit sas lìnias de livellu e sas umbraduras de sos rilievos, chi podent èssere visualizadas in supra de sas mapas regulares de OsmAnd. Custa funtzionalidade at a èssere appretziada meda dae sos atletas, sos escursionistas, e totu sos chi sunt interessados in s\'orografia e su paesàggiu.
\n\nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s’ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un’aina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un’isfortzu de coperassione intre NASA, su Ministeru de s’Economia Cummèrtziu e Industria (METI) de su Giappone, e su sistema ispatziale giapponesu (J-spacesystems). "</string>
<string name="map_widget_distancemeasurement">Medidura de sa distantzia</string>
<string name="audionotes_location_not_defined">Sa positzione da assotziare cun sa nota non est galu dessinida. \"Imprea positzione ...\" pro assinzare una nota a sa positzione dislindada</string>
<string name="audionotes_location_not_defined">Sa positzione da assotziare cun sa nota non est galu dessinida. \"Imprea positzione …\" pro assinzare una nota a sa positzione dislindada</string>
<string name="map_widget_audionotes">Notas àudio</string>
<string name="audionotes_plugin_description">S’estensione pro sas notas àudio/vìdeo frunit sas funtzionalidades pro registrare notas àudio/foto/vìdeo durante su biàgiu, impreende su butone in s\'ischermu de sa mapa o su menù de cuntestu pro cale si siat positzione in sa mapa.</string>
@ -532,13 +531,13 @@
<string name="osmo_use_server_name">Nùmene registrau</string>
<string name="osmo_connect_to_my_nickname">Zistru meu</string>
<string name="osmo_user_name">Impitadore</string>
<string name="color_red">ruju</string>
<string name="rendering_value_pink_name">rosa</string>
<string name="color_orange">arantzu</string>
<string name="rendering_value_brown_name">castàngiu</string>
<string name="color_yellow">grogu</string>
<string name="color_lightblue">blu lepiu</string>
<string name="color_blue">blu</string>
<string name="color_green">birde</string>
<string name="osmo_edit_device">Muda sas propriedades de s’impitadore</string>
@ -2023,7 +2022,7 @@
<string name="use_drawer_btn">Imprea sa mapa</string>
<string name="access_from_map_description">Su butone de su menù alluet su pannellu de controllu, imbetzes de su menù</string>
<string name="access_from_map">Intra dae sa mapa</string>
<string name="release_2_2">" • Interfache impitadore noa pro incarcare positziones in sa mapa e in àteros ischermos\n\n • S\'ischermu de sa mapa est como postu come prima cosa a s’allumìngiu de s’aplicatzione, semper chi \'Ammustra pannellu de controllu in s\'allumìngiu\' no siet ischertadu\n\n • Como podes cunfigurare sas impostatziones pro isseberare cales sunt sas ischedas chi diant dèper’èssere ammustradas in su pannellu e comente\n\n • Brinca su pannellu de controllu, si preferis a impreare su menù pro sa gestione de s’aplicatzione\n\n • Pro iscarrigare mapas, sas regiones podent èssere ischertadas deretamente incarchende in sa mapa generale de su mundu\n\n • Sa chirca de PDI como suportat chircas prus dislindadas\n\n • Megioradas sas funtzionalidades de modìficas de PDI e OSM\n\n • Istrutura e s\'interfache de iscarrigamentu datos mapas torrada a fàghere\n\n e àteru... "</string>
<string name="release_2_2">" • Interfache impitadore noa pro incarcare positziones in sa mapa e in àteros ischermos\n\n • S\'ischermu de sa mapa est como postu come prima cosa a s’allumìngiu de s’aplicatzione, semper chi \'Ammustra pannellu de controllu in s\'allumìngiu\' no siet ischertadu\n\n • Como podes cunfigurare sas impostatziones pro isseberare cales sunt sas ischedas chi diant dèper’èssere ammustradas in su pannellu e comente\n\n • Brinca su pannellu de controllu, si preferis a impreare su menù pro sa gestione de s’aplicatzione\n\n • Pro iscarrigare mapas, sas regiones podent èssere ischertadas deretamente incarchende in sa mapa generale de su mundu\n\n • Sa chirca de PDI como suportat chircas prus dislindadas\n\n • Megioradas sas funtzionalidades de modìficas de PDI e OSM\n\n • Istrutura e s\'interfache de iscarrigamentu datos mapas torrada a fàghere\n\n e àteru… "</string>
<string name="please_specify_poi_type_only_from_list">"Dislinda sa casta curreta de PDI o brinca custa parte. "</string>
<string name="routing_attr_avoid_stairs_name">Istransi sas iscalas</string>
<string name="routing_attr_avoid_stairs_description">Istransi sas iscalas</string>

17
OsmAnd/res/values-sk/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="recording_context_menu_show">Zobraziť</string>
<string name="recording_photo_description">Fotografia %1$s %2$s</string>
@ -1235,13 +1234,13 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="osmo_mode_restart">Reštartovať reláciu OsMo</string>
<string name="osmo_settings_debug">Informácie pre ladenie</string>
<string name="import_file_favourites">Uložiť body ako súbor GPX alebo ich importovať do obľúbených?</string>
<string name="color_red">červená</string>
<string name="rendering_value_pink_name">ružová</string>
<string name="color_orange">oranžová</string>
<string name="rendering_value_brown_name">hnedá</string>
<string name="color_yellow">žltá</string>
<string name="color_lightblue">svetlomodrá</string>
<string name="color_blue">modrá</string>
<string name="osmo_edit_device">Zmeniť vlastnosti používateľa</string>
<string name="osmo_edit_color">Zobrazovaná farba</string>
<string name="osmo_group_info">Informácie</string>
@ -1256,7 +1255,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="osmo_enable_tracker">Odosielať moje polohy</string>
<string name="osmo_control">Rýchly prístup k OsMo</string>
<string name="osmo_follow">Nasledovať</string>
<string name="color_green">zelená</string>
<string name="osmo_connect_to_group_id">ID skupiny</string>
<string name="osmo_user_joined">Používateľ %1$s sa pripojil ku skupine %2$s</string>
<string name="osmo_user_left">Používateľ %1$s opustil skupinu %2$s</string>
@ -1901,7 +1900,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="context_menu_item_delete_waypoint">Odstrániť bod GPX?</string>
<string name="context_menu_item_edit_waypoint">Upraviť bod GPX</string>
<string name="copied_to_clipboard">Skopírované do schránky</string>
<string name="release_2_2">" • Nové kontextovo závislé rozhranie pre označenie umiestnení na mape a iných obrazovkách\n\n • Obrazovka mapy je priamo spustená ak nie je zvolené \'Zobraziť úvodný panel pri štarte\'\n\n • Je možné nastaviť ktoré karty sú zobrazené na úvodnom paneli\n\n • Úvodný panel je možné obísť, ak preferujete ovládanie aplikácie cez menu\n\n • Pre stiahnutie máp je možne priamo označiť oblasť na mape sveta\n\n • Hľadanie bodov záujmu (POI) umožňuje presnejšie špecifikácie\n\n • Vylepšené možnosti úpravy POI a OSM poznámok\n\n • Prepracované rozhranie sťahovania máp\n\n a ďalšie vylepšenia... "</string>
<string name="release_2_2">" • Nové kontextovo závislé rozhranie pre označenie umiestnení na mape a iných obrazovkách\n\n • Obrazovka mapy je priamo spustená ak nie je zvolené \'Zobraziť úvodný panel pri štarte\'\n\n • Je možné nastaviť ktoré karty sú zobrazené na úvodnom paneli\n\n • Úvodný panel je možné obísť, ak preferujete ovládanie aplikácie cez menu\n\n • Pre stiahnutie máp je možne priamo označiť oblasť na mape sveta\n\n • Hľadanie bodov záujmu (POI) umožňuje presnejšie špecifikácie\n\n • Vylepšené možnosti úpravy POI a OSM poznámok\n\n • Prepracované rozhranie sťahovania máp\n\n a ďalšie vylepšenia… "</string>
<string name="osm_save_offline">Uložiť offline</string>
<string name="osm_edit_modified_poi">Upravený OSM POI</string>
<string name="osm_edit_deleted_poi">Odstránený OSM POI</string>
@ -1937,6 +1936,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="routing_attr_avoid_stairs_name">Vyhnúť sa schodom</string>
<string name="routing_attr_avoid_stairs_description">Vyhnúť sa schodom</string>
<string name="routing_attr_avoid_borders_name">Vyhnúť sa hraničným priechodom</string>
<string name="color_lightgreen">svetlozelená</string>
<string name="color_purple">fialová</string>
</resources>

22
OsmAnd/res/values-sl/strings.xml
View file

@ -376,7 +376,7 @@
<string name="osmand_parking_position_description">Položaj parkiranega vozila: %1$s</string>
<string name="osmand_parking_position_description_add">Prevzem vozila ob:</string>
<string name="osmand_parking_position_name">Točka parkiranja</string>
<string name="osmand_parking_plugin_description">Vstavek za parkiranje omogoča enostavno shranjevanje mesta parkiranja vozila in časa parkirne ure. Podatki so prikazani na zaslonu za enostavno opozarjanje.\nOmogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih parkiranja (letališča, letovišča ...).</string>
<string name="osmand_parking_plugin_description">Vstavek za parkiranje omogoča enostavno shranjevanje mesta parkiranja vozila in časa parkirne ure. Podatki so prikazani na zaslonu za enostavno opozarjanje.\nOmogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih parkiranja (letališča, letovišča …).</string>
<string name="osmand_parking_plugin_name">Parkiranje (mesto in čas)</string>
<string name="context_menu_item_add_parking_point">Označi kot kraj parkiranja</string>
<string name="context_menu_item_delete_parking_point">Izbriši oznako parkirnega mesta</string>
@ -790,7 +790,7 @@
<string name="renderers_descr">Izberite videz izrisovalnika</string>
<string name="poi_context_menu_website">Pokaži spletišče POI</string>
<string name="poi_context_menu_call">Pokaži telefon točke POI</string>
<string name="download_type_to_filter">Poišči ...</string>
<string name="download_type_to_filter">Poišči …</string>
<string name="use_high_res_maps">Zaslon z visoko ločljivostjo</string>
<string name="use_high_res_maps_descr">Ne raztegni (in zamegli) predmetov zemljevida na zaslonih z visoko ločljivostjo</string>
<string name="context_menu_item_search_transport">Iskanje javnega prevoza</string>
@ -1126,8 +1126,8 @@
<string name="clear_intermediate_points">Počisti vmesne točke</string>
<string name="keep_intermediate_points">Obdrži vmesne točke</string>
<string name="new_directions_point_dialog">Vmesne točke so že nastavljene.</string>
<string name="context_menu_item_directions_to">Navigacija do ...</string>
<string name="context_menu_item_directions_from">Navigacija od ...</string>
<string name="context_menu_item_directions_to">Navigacija do …</string>
<string name="context_menu_item_directions_from">Navigacija od …</string>
<string name="route_descr_map_location">Zemljevid: </string>
<string name="route_to">Konec poti:</string>
<string name="route_via">Preko:</string>
@ -1323,13 +1323,13 @@
<string name="osmo_cancel_moving_target">Opusti premikajočo se tarčo</string>
<string name="osmo_connect_to_my_nickname">Vzdevek</string>
<string name="osmo_user_name">Uporabnik</string>
<string name="color_red">rdeča</string>
<string name="rendering_value_pink_name">rožnata</string>
<string name="color_orange">oranžna</string>
<string name="rendering_value_brown_name">rjava</string>
<string name="color_yellow">rumena</string>
<string name="color_lightblue">svetlo modra</string>
<string name="color_blue">modra</string>
<string name="color_green">zelena</string>
<string name="osmo_edit_device">Spremeni nastavitve uporabnika</string>
@ -1756,7 +1756,7 @@
\n\nZa uporabo te možnosti je uporabljen podroben izris obstoječih zemljevidov, zato posebni zemljevidi niso potrebni.
\n\nPodrobni izris je mogoče prekiniti z onemogočanjem možnosti ali pa s spreminjanjem vrste prikaza zemljevida. "</string>
<string name="plugin_ski_descr">"Vstavek omogoča prikaz prog za nordijsko in alpsko smučanje, splošnih smučišč, žičnic in vlečnic in druge smučarske podrobnosti. Težavnost smučišč je označena barvnimi kodami, podrobni izris zemljevida pa je primeren za zimski pogled pokrajine.\n\nZ izborom tega pogleda se slog prikaza spremeni v \'Zimski pogled\' in kaže vse podrobnosti v zimskem pogledu. Izris je mogoče prekiniti z onemogočanjem možnosti ali pa s spreminjanjem vrste prikaza zemljevida. "</string>
<string name="plugin_nautical_descr">"Vstavek obogati vsebino zemljevidov OsmAnd in kakovost navigacije s podrobnimi pomorskimi zemljevidi za plovila, jadralce in druge vrste vodnih športov.\n\nS tem posebnim prekrivnim zemljevidom je mogoč izris posebnih navigacijskih oznak, ki so sicer značilne za navtične zemljevide. Opisi posamezne oznake pripomorejo k določanju (kategorije, oblike, barve, zaporedja, sklica ...).\n\nVrnitev na običajni pogled je mogoče na dva načina. Ali odklopite prekrivni sloj ali pa spremenite slog zemljevida med \'Nastavitvami zemljevida\' v meniju. "</string>
<string name="plugin_nautical_descr">"Vstavek obogati vsebino zemljevidov OsmAnd in kakovost navigacije s podrobnimi pomorskimi zemljevidi za plovila, jadralce in druge vrste vodnih športov.\n\nS tem posebnim prekrivnim zemljevidom je mogoč izris posebnih navigacijskih oznak, ki so sicer značilne za navtične zemljevide. Opisi posamezne oznake pripomorejo k določanju (kategorije, oblike, barve, zaporedja, sklica …).\n\nVrnitev na običajni pogled je mogoče na dva načina. Ali odklopite prekrivni sloj ali pa spremenite slog zemljevida med \'Nastavitvami zemljevida\' v meniju. "</string>
<string name="routing_attr_avoid_borders_description">Izogibanje prehodom meje z drugimi državami</string>
<string name="routing_attr_height_name">Omejitev višine</string>
@ -1997,7 +1997,7 @@
<string name="context_menu_item_edit_waypoint">Uredi vmesno točko GPX</string>
<string name="shared_string_location">Mesto</string>
<string name="poi_context_menu_modify_osm_change">Popravi spremembo OSM</string>
<string name="please_specify_poi_type_only_from_list">"Določiti je treba ustrezno vrsto točke POI ali pa jo preskočiti. "</string>
<string name="please_specify_poi_type_only_from_list">"Določiti je treba ustrezno vrsto točke POI ali pa podatek preskočiti. "</string>
<string name="access_from_map_description">Menijski gumb zažene nadzorno ploščo in ne menija</string>
<string name="access_from_map">Dostop prek zemljevida</string>
<string name="copied_to_clipboard">Vsebina je kopirana v odložišče</string>
@ -2028,7 +2028,7 @@
<string name="dashboard_or_drawer_title">Upravljanje prek nadzorne plošče ali menija</string>
<string name="dashboard_or_drawer_description">Ob meniju je po novem na voljo možnost upravljanja s programom preko prilagodljive nadzorne plošče. Možnost je mogoče spremeniti med nastavitvami.</string>
<string name="osm_edit_commented_note">Opomba OSM z dodatnimi zapisi</string>
<string name="release_2_2">" • Prenovljen in posodobljen vmesnik, ki omogoča izbiranje mest na zemljevidu in prek drugih pogledov\n\n • Pogled zemljevida se zažene neposredno, če ni izbrana možnost \"Pokaži nadzorno ploščo ob zagonu programa\"\n\n • Možnost nastavitve prikazanih ikon v nadzorni plošči\n\n • Možnost zamenjave nadzorne plošče z menijem\n\n • Prejemanje zemljevidov je sedaj na voljo z enostavnim klikom na državo ali regijo na svetovnem zemljevidu\n\n • Iskanje točk POI podpira tudi podrobnejše poizvedbe\n\n • Izboljšane možnosti urejanja točk POI in OSM\n\n • Vmesnik za prejem zemljevidov je poenostavljen\n\n in še veliko več ... "</string>
<string name="release_2_2">" • Prenovljen in posodobljen vmesnik, ki omogoča izbiranje mest na zemljevidu in prek drugih pogledov\n\n • Pogled zemljevida se zažene neposredno, če ni izbrana možnost \"Pokaži nadzorno ploščo ob zagonu programa\"\n\n • Možnost nastavitve prikazanih ikon v nadzorni plošči\n\n • Možnost zamenjave nadzorne plošče z menijem\n\n • Prejemanje zemljevidov je sedaj na voljo z enostavnim klikom na državo ali regijo na svetovnem zemljevidu\n\n • Iskanje točk POI podpira tudi podrobnejše poizvedbe\n\n • Izboljšane možnosti urejanja točk POI in OSM\n\n • Vmesnik za prejem zemljevidov je poenostavljen\n\n in še veliko več … "</string>
<string name="routing_attr_avoid_stairs_name">Izogni se stopnicam</string>
<string name="routing_attr_avoid_stairs_description">Izogni se stopnicam</string>
<string name="routing_attr_avoid_borders_name">Izogni se mejnim prehodom</string>

21
OsmAnd/res/values-sv/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
<string name="ChooseCountry">Välj land</string>
<string name="choose_city">Välj stad</string>
@ -439,8 +438,8 @@
<string name="gpx_option_reverse_route">Omvänd GPX-riktning</string>
<string name="gpx_option_destination_point">Använd aktuell destination</string>
<string name="gpx_option_from_start_point">Passera längs hela spåret</string>
<string name="switch_to_vector_map_to_see">En offline vektor-karta finns tillgänglig för den här platsen.
\n\t\n\tFör användning aktivera \'Meny\' -&gt; \'Konfigurera karta\' -&gt; \'Kartkälla...\' -&gt; \'Offline vektor-kartor\'.</string>
<string name="switch_to_vector_map_to_see"><![CDATA[En offline vektor-karta finns tillgänglig för den här platsen.
\n\t\n\tFör användning aktivera \'Meny\' -> \'Konfigurera karta\' -> \'Kartkälla…\' -> \'Offline vektor-kartor\'.]]></string>
<string name="choose_audio_stream">Röstväglednings-output</string>
<string name="choose_audio_stream_descr">Välj kanal för uppspelning av röstvägledning (systemberoende)</string>
<string name="voice_stream_voice_call">Röstsamtal ljud</string>
@ -857,7 +856,7 @@
<string name="download_srtm_maps">Höjdkurvsdata</string>
<string name="audionotes_location_not_defined">Platsen att associera med anteckningen är inte angiven än. \"Använd platsen ...\" för att knyta en anteckning till den angivna platsen</string>
<string name="audionotes_location_not_defined">Platsen att associera med anteckningen är inte angiven än. \"Använd platsen …\" för att knyta en anteckning till den angivna platsen</string>
<string name="route_descr_current_location">Aktuell position</string>
@ -1310,13 +1309,13 @@
<string name="osmo_control">OsMo snabbåtkomst</string>
<string name="osmo_mode_restart">Starta om OsMo-session</string>
<string name="osmo_settings_debug">Felsökningsinformation</string>
<string name="color_red">röd</string>
<string name="rendering_value_pink_name">skär</string>
<string name="color_orange">brandgul</string>
<string name="rendering_value_brown_name">brun</string>
<string name="color_yellow">gul</string>
<string name="color_lightblue">ljusblå</string>
<string name="color_blue">blå</string>
<string name="osmo_edit_device">Ändra användaregenskaper</string>
@ -1369,7 +1368,7 @@
<string name="layer_amenity_label">Namn på punkter</string>
<string name="show_zoom_buttons_navigation_descr">Visa zoom-knappar under navigering</string>
<string name="show_zoom_buttons_navigation">Visa zoom-knappar</string>
<string name="color_green">grön</string>
<string name="sort_by_distance">Sortera efter avstånd</string>
@ -2000,7 +1999,7 @@
<string name="access_from_map">Tillgång från kartan</string>
<string name="rendering_attr_currentTrackColor_description">GPX-färg</string>
<string name="rendering_attr_currentTrackWidth_description">GPX-bredd</string>
<string name="release_2_2">" • Nytt kontextkänsligt gränssnitt för att peta på platser på kartan och på andra skärmar\n\n • Kartskärmen startar nu automatiskt om inte \'Visa panelen vid appstart\' är vald\n\n • Konfigurera vilka kort och hur de ska visas i panelen\n\n • Gå förbi panelen om du föredrar en menybaserad kontroll över appen\n\n • För att hämta kartor kan regioner väljas direkt genom att peta på världskartan\n\n • Sökning efter intressepunkter (POI) understöder nu mer specifika frågor\n\n • Förbättrad funktion för POI- och OSM-redigering\n\n • Strukturen för hämtning av kartdata och gränssnittet har omarbetats\n\n och mer ... "</string>
<string name="release_2_2">" • Nytt kontextkänsligt gränssnitt för att peta på platser på kartan och på andra skärmar\n\n • Kartskärmen startar nu automatiskt om inte \'Visa panelen vid appstart\' är vald\n\n • Konfigurera vilka kort och hur de ska visas i panelen\n\n • Gå förbi panelen om du föredrar en menybaserad kontroll över appen\n\n • För att hämta kartor kan regioner väljas direkt genom att peta på världskartan\n\n • Sökning efter intressepunkter (POI) understöder nu mer specifika frågor\n\n • Förbättrad funktion för POI- och OSM-redigering\n\n • Strukturen för hämtning av kartdata och gränssnittet har omarbetats\n\n och mer … "</string>
<string name="dashboard_or_drawer_description">Det finns ett nytt val att primärt kontrollera appen via den flexibla panelen eller via en statisk meny. Detta val kan du alltid ändra på under inställningarna i panelen.</string>
<string name="use_dashboard_btn">Använd panelen</string>
<string name="use_drawer_btn">Använd menyn</string>

12
OsmAnd/res/values-tr/strings.xml
View file

@ -1052,7 +1052,7 @@
<string name="local_index_no_items_to_do">%1$s\'a öğe yok</string>
<string name="tts_language_not_supported">Seçtiğiniz dil yüklü olan Android TTS (yazıdan-sese) motoru tarafından desteklenmiyor. Mağazada başka TTS motoruna bakmak ister misiniz? Aksi halde önceden yüklenen TTS dili kullanılacak.</string>
<string name="gpx_option_reverse_route">GPX yönünü tersine çevir</string>
<string name="switch_to_vector_map_to_see">Bu konum için çevrimdışı vektör haritası. \n\t\n\tKullanmak için \'Menü\' → \'Harita Katmanları\' → \'Harita Kaynağı...\' → \'Çevrimdışı vektör haritalar\'.</string>
<string name="switch_to_vector_map_to_see">Bu konum için çevrimdışı vektör haritası. \n\t\n\tKullanmak için \'Menü\' → \'Harita Katmanları\' → \'Harita Kaynağı…\' → \'Çevrimdışı vektör haritalar\'.</string>
<string name="choose_audio_stream">Sesli kılavuz çıktısı</string>
<string name="choose_audio_stream_descr">Sesli kılavuzu oynatmaya kanal seçin. (sisteme bağımlı)</string>
<string name="voice_stream_voice_call">Sesli çağrı sesi</string>
@ -1085,7 +1085,7 @@
<string name="app_mode_truck">kamyon</string>
<string name="routing_attr_short_way_description">Kısa yoldan git</string>
<string name="copying_osmand_one_file_descr">Şimdidosya ($1%s ) Yeni Geliş kopyalamak ...</string>
<string name="copying_osmand_one_file_descr">Şimdidosya ($1%s ) Yeni Geliş kopyalamak …</string>
<string name="copying_osmand_files_descr">Osmandyeni hedefedosyaları kopyalamak ( $1%s )</string>
<string name="guidance_preferences_descr">öncelikli navigasyon</string>
<string name="routing_preferences_descr">Öncelikli yönlendirme</string>
@ -1304,13 +1304,13 @@
<string name="gpx_info_average_speed">"Ortalama hız: %1$s "</string>
<string name="gpx_info_maximum_speed">"Maksimum hız: %1$s "</string>
<string name="gpx_info_avg_altitude">Ortalama yükseklik: %1$s</string>
<string name="color_red">kırmızı</string>
<string name="rendering_value_pink_name">pembe</string>
<string name="color_orange">turuncu</string>
<string name="rendering_value_brown_name">kahverengi</string>
<string name="color_yellow">sarı</string>
<string name="color_lightblue">açık mavi</string>
<string name="color_blue">mavi</string>
<string name="color_green">yeşil</string>
<string name="av_locations_descr">Not lokasyonlu Gpx dosyası</string>

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

@ -1400,13 +1400,13 @@ OsmAnd має відкриті сирці і активно розвиваєть
<string name="osmo_use_server_name">Зареєстроване ім’я</string>
<string name="osmo_connect_to_my_nickname">Моє призьвісько</string>
<string name="osmo_user_name">Користувач</string>
<string name="color_red">червоний</string>
<string name="rendering_value_pink_name">рожевий</string>
<string name="color_orange">помаранчевий</string>
<string name="rendering_value_brown_name">коричневий</string>
<string name="color_yellow">жовтий</string>
<string name="color_lightblue">блакитний</string>
<string name="color_blue">синій</string>
<string name="color_green">зелений</string>
<string name="osmo_edit_device">Змінити властивості користувача</string>

2
OsmAnd/res/values-zh-rCN/strings.xml
View file

@ -429,7 +429,7 @@
<string name="edit_tilesource_expiration_time">过期(分钟)</string>
<string name="edit_tilesource_minzoom">最小显示级别</string>
<string name="edit_tilesource_url_to_load">URL</string>
<string name="edit_tilesource_choose_existing">选择已有来源...</string>
<string name="edit_tilesource_choose_existing">选择已有来源…</string>
<string name="edit_tilesource_name">名称</string>
<string name="maps_define_edit">定义/编辑…</string>
<string name="map_widget_fps_info">FPS 调试信息</string>

15
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -1400,7 +1400,7 @@
<string name="poi_aerialway_access_entry">入口</string>
<string name="poi_aerialway_access_exit">出口</string>
<string name="poi_aerialway_access_both">出入口</string>
<string name="poi_wheelchair_no">輪椅：不允許</string>
<string name="poi_wheelchair_no">輪椅：無法進入</string>
<string name="poi_wheelchair_limited">輪椅：有限的</string>
<string name="poi_aerialway_summer_access_entry">夏季通行：只能進入</string>
<string name="poi_aerialway_summer_access_exit">夏季通行：只能出去</string>
@ -2372,4 +2372,17 @@
<string name="poi_wiki_lang_nap">那不勒斯語維基</string>
<string name="poi_craft_electronics">3C產品維修</string>
<string name="poi_historic_period_nuragic">歷史時期：nuragic</string>
<string name="poi_historic_period_stone_bronze_undetermined">歷史時期：石器時代 / 青銅器時代 (未確定)</string>
<string name="poi_historic_period_bronze_age">歷史時期：青銅器時代</string>
<string name="poi_historic_period_principate">歷史時期：元首制 (西元前27年 - 西元284年)</string>
<string name="poi_historic_period_classical_greece">歷史時期：古希臘 (西元前5 - 4)</string>
<string name="poi_historic_period_archaic_greece">歷史時期：古希臘</string>
<string name="poi_historic_period_iron_age">歷史時期：鐵器時代</string>
<string name="poi_historic_period_roman_republic">歷史時期：羅馬共和國 (西元前508年 – 西元前27年)</string>
<string name="poi_historic_period_hellenistic_greece">歷史時期：希臘化時代的希臘</string>
<string name="poi_historic_period_new_kingdom">歷史時期：新王國 (西元前1550年 - 1069年)</string>
<string name="poi_historic_period_middle_kingdom">歷史時期：中王國 (西元前2055年 - 1650年)</string>
<string name="poi_historic_period_predynastic_egypt">歷史時期：前王朝時期埃及</string>
<string name="poi_historic_period_early_dynastic_period">歷史時期：早王朝時期 (西元前3100 - 2686年)</string>
</resources>

15
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
<string name="rendering_attr_roadColors_name">道路的色彩調配</string>
<string name="map_widget_show_destination_arrow">顯示目的地方向</string>
@ -1312,13 +1311,13 @@
<string name="import_file_favourites">儲存標點為 GPX 檔案或把它匯入到我的最愛？</string>
<string name="color_red">紅色</string>
<string name="rendering_value_pink_name">粉紅色</string>
<string name="color_orange">橙色</string>
<string name="rendering_value_brown_name">棕色</string>
<string name="color_yellow">黃色</string>
<string name="color_lightblue">淺藍色</string>
<string name="color_blue">藍色</string>
<string name="osmo_edit_device">更改使用者屬性</string>
@ -1335,7 +1334,7 @@
<string name="osmo_use_server_name">已註冊的名稱</string>
<string name="osmo_connect_to_my_nickname">我的暱稱</string>
<string name="osmo_user_name">使用者</string>
<string name="color_green">綠色</string>
<string name="osmo_user_joined">使用者 %1$s 已加入群組 %2$s</string>
<string name="osmo_user_left">使用者 %1$s 離開群組 %2$s</string>
@ -2003,7 +2002,7 @@
<string name="rendering_attr_roadStyle_description">道路樣式</string>
<string name="poi_dialog_reopen">重新開啟</string>
<string name="osm_save_offline">離線儲存</string>
<string name="release_2_2">" •在地圖上和其它螢幕上，為點擊位置做了新的敏捷內容選單使用者界面\n\n•地圖螢幕上現在除了直接啟動外，還有\'在應用程式時啟動顯示儀表板\'可選\n\n •組態哪些以及何種卡可以在儀表板上顯示\n\n•如果您喜歡基本選單的應用程式控制，繞過儀表板方式\n\n •要下載地圖，可以直接在全球地圖上點選區域\n\n •更好的重新計算路線（現在引擎經過反復的嘗試，建議一條不同的路線）\n\n •興趣點搜尋現在支援更具體的查詢\n\n •改善過的興趣點和 OSM 編輯功能\n\n •地圖資料下載結構和界面重新設計\n\n 還有更多... "</string>
<string name="release_2_2"><![CDATA[" •在地圖上和其它螢幕上，為點擊位置做了新的敏捷內容選單使用者界面\n\n•地圖螢幕上現在除了直接啟動外，還有\'在應用程式時啟動顯示儀表板\'可選\n\n •組態哪些以及何種卡可以在儀表板上顯示\n\n•如果您喜歡基本選單的應用程式控制，繞過儀表板方式\n\n •要下載地圖，可以直接在全球地圖上點選區域\n\n •更好的重新計算路線（現在引擎經過反復的嘗試，建議一條不同的路線）\n\n •興趣點搜尋現在支援更具體的查詢\n\n •改善過的興趣點和 OSM 編輯功能\n\n •地圖資料下載結構和界面重新設計\n\n 還有更多… "]]></string>
<string name="copied_to_clipboard">複製到剪貼簿</string>

2
OsmAnd/res/values/sherpafy.xml
View file

@ -29,7 +29,7 @@
<string name="sherpafy_tours">Sherpafy Tours</string>
<string name="access_code_is_not_valid">Access code is not valid</string>
<string name="overview">Overview</string>
<string name="selecting_tour_progress">Selecting tour...</string>
<string name="selecting_tour_progress">Selecting tour…</string>
<string name="no_stages_provided">No stages provided</string>
<string name="download_more">Download more</string>
<string name="no_tour_selected">No tour selected</string>

2
OsmAnd/res/values/strings.xml
View file

@ -25,7 +25,7 @@
\u2022 POI Search now supports more specific queries\n\n
\u2022 Improved POI and OSM editing functionality\n\n
\u2022 Map data download structure and interface reworked\n\n
and more...
and more…
</string>
<string name="osm_save_offline">Save offline</string>
<string name="osm_edit_modified_poi">Modified OSM POI</string>

2
OsmAnd/res/xml/device_admin.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<device-admin xmlns:android="http://schemas.android.com/apk/res/android" >
<device-admin>
<uses-policies>
<force-lock />
</uses-policies>

2
OsmAnd/src/btools/routingapp/BRouterServiceConnection.java
View file

@ -10,7 +10,7 @@ public class BRouterServiceConnection implements ServiceConnection {
IBRouterService brouterService;
public void onServiceConnected(ComponentName className, IBinder boundService) {
brouterService = IBRouterService.Stub.asInterface((IBinder) boundService);
brouterService = IBRouterService.Stub.asInterface(boundService);
}
public void onServiceDisconnected(ComponentName className) {

3
OsmAnd/src/com/example/android/common/view/SlidingTabStrip.java
View file

@ -16,7 +16,6 @@
package com.example.android.common.view;
import android.R;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
@ -65,7 +64,7 @@ class SlidingTabStrip extends LinearLayout {
final float density = getResources().getDisplayMetrics().density;
TypedValue outValue = new TypedValue();
context.getTheme().resolveAttribute(R.attr.colorForeground, outValue, true);
context.getTheme().resolveAttribute(android.R.attr.colorForeground, outValue, true);
final int themeForegroundColor = outValue.data;
mDefaultBottomBorderColor = setColorAlpha(themeForegroundColor,

4
OsmAnd/src/net/osmand/plus/GPXUtilities.java
View file

@ -779,7 +779,7 @@ public class GPXUtilities {
public static String writeGpx(Writer output, GPXFile file, OsmandApplication ctx) {
try {
SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT);
SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
XmlSerializer serializer = PlatformUtil.newSerializer();
serializer.setOutput(output);
@ -960,7 +960,7 @@ public class GPXUtilities {
public static GPXFile loadGPXFile(Context ctx, InputStream f) {
GPXFile res = new GPXFile();
SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT);
SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
try {
XmlPullParser parser = PlatformUtil.newXMLPullParser();

3
OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
View file

@ -33,6 +33,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;
public class ContributionVersionActivity extends OsmandListActivity {
@ -48,7 +49,7 @@ public class ContributionVersionActivity extends OsmandListActivity {
private Date currentInstalledDate;
private List<OsmAndBuild> downloadedBuilds = new ArrayList<OsmAndBuild>();
private SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy");
private SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy", Locale.US);
private File pathToDownload;
private OsmAndBuild currentSelectedBuild = null;

48
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -1,10 +1,21 @@
package net.osmand.plus.activities;
import java.io.File;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import android.app.Activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import net.osmand.IndexConstants;
import net.osmand.Location;
@ -38,27 +49,14 @@ import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.BaseMapLayer;
import net.osmand.plus.views.MapTileLayer;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.util.MapUtils;
import org.apache.commons.logging.Log;
import android.app.Activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import java.io.File;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class MapActivityActions implements DialogProvider {
private static final Log LOG = PlatformUtil.getLog(MapActivityActions.class);
@ -210,7 +208,7 @@ public class MapActivityActions implements DialogProvider {
}
edit.setText(editText);
((Button) dlg.findViewById(R.id.Save)).setOnClickListener(new View.OnClickListener() {
dlg.findViewById(R.id.Save).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String name = edit.getText().toString();
@ -231,7 +229,7 @@ public class MapActivityActions implements DialogProvider {
}
});
((Button) dlg.findViewById(R.id.Cancel)).setOnClickListener(new View.OnClickListener() {
dlg.findViewById(R.id.Cancel).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dlg.dismiss();

25
OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
View file

@ -1,12 +1,9 @@
package net.osmand.plus.activities;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.text.format.DateFormat;
import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
@ -25,10 +22,14 @@ import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
import org.apache.commons.logging.Log;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.text.format.DateFormat;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
public class SavingTrackHelper extends SQLiteOpenHelper {
@ -194,7 +195,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
File fout = new File(dir, f + ".gpx"); //$NON-NLS-1$
if (!data.get(f).isEmpty()) {
WptPt pt = data.get(f).findPointToShow();
String fileName = f + "_" + new SimpleDateFormat("HH-mm_EEE").format(new Date(pt.time)); //$NON-NLS-1$
String fileName = f + "_" + new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time)); //$NON-NLS-1$
fout = new File(dir, fileName + ".gpx"); //$NON-NLS-1$
int ind = 1;
while (fout.exists()) {

25
OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java
View file

@ -1,10 +1,14 @@
package net.osmand.plus.activities.search;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import android.os.AsyncTask;
import android.os.Message;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.FrameLayout;
import net.osmand.CollatorStringMatcher;
import net.osmand.CollatorStringMatcher.StringMatcherMode;
import net.osmand.OsmAndCollator;
@ -18,13 +22,10 @@ import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.resources.RegionAddressRepository;
import net.osmand.util.MapUtils;
import android.os.AsyncTask;
import android.os.Message;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.Button;
import android.widget.FrameLayout;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
public class SearchCityByNameActivity extends SearchByNameAbstractActivity<City> {
@ -189,7 +190,7 @@ public class SearchCityByNameActivity extends SearchByNameAbstractActivity<City>
public void itemSelected(City obj) {
settings.setLastSearchedCity(obj.getId(), obj.getName(region.getLang()), obj.getLocation());
if (region.getCityById(obj.getId(), obj.getName(region.getLang())) == null) {
region.addCityToPreloadedList((City) obj);
region.addCityToPreloadedList(obj);
}
quitActivity(SearchStreetByNameActivity.class);
}

4
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -219,7 +219,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
amenityAdapter = new AmenityAdapter(new ArrayList<Amenity>());
setListAdapter(amenityAdapter);
searchFilterLayout = findViewById(R.id.SearchFilterLayout);
searchFilter = (EditText) findViewById(R.id.edit);
searchFilter = (EditText) findViewById(R.id.searchEditText);
searchFilter.addTextChangedListener(new TextWatcher() {
@Override
public void afterTextChanged(Editable s) {
@ -242,7 +242,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
}
}
});
((EditText)findViewById(R.id.edit)).setHint(R.string.filter_poi_hint);
((EditText)findViewById(R.id.searchEditText)).setHint(R.string.filter_poi_hint);
((ImageView)findViewById(R.id.search_icon)).setImageDrawable(
getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_filter_dark));
((ImageView) findViewById(R.id.options)).

71
OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java
View file

@ -3,12 +3,27 @@
*/
package net.osmand.plus.activities.search;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v7.widget.PopupMenu;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import net.osmand.CollatorStringMatcher;
import net.osmand.CollatorStringMatcher.StringMatcherMode;
@ -29,25 +44,12 @@ import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
import net.osmand.plus.render.RenderingIcons;
import net.osmand.plus.resources.ResourceManager;
import net.osmand.util.Algorithms;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v7.widget.PopupMenu;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@ -65,11 +67,11 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.searchpoi, container, false);
v.findViewById(R.id.SearchFilterLayout).setVisibility(View.VISIBLE);
((EditText)v.findViewById(R.id.edit)).setHint(R.string.search_poi_category_hint);
((EditText)v.findViewById(R.id.searchEditText)).setHint(R.string.search_poi_category_hint);
((ImageView)v.findViewById(R.id.search_icon)).setImageDrawable(
getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_search_dark));
setupSearchEditText((EditText) v.findViewById(R.id.edit));
setupSearchEditText((EditText) v.findViewById(R.id.searchEditText));
setupOptions((ImageView) v.findViewById(R.id.options));
v.findViewById(R.id.poiSplitbar).setVisibility(View.GONE);
return v;
@ -110,6 +112,19 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
currentTask.execute(s.toString().trim());
}
});
searchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
boolean handled = false;
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
final PoiUIFilter poiFilter = getApp().getPoiFilters().getSearchByNamePOIFilter();
poiFilter.setFilterByName(searchEditText.getText().toString());
showFilterActivity(poiFilter.getFilterId());
handled = true;
}
return handled;
}
});
}
@ -195,7 +210,7 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
@Override
public void onListItemClick(ListView listView, View v, int position, long id) {
final Object item = ((PoiFiltersAdapter) getListAdapter()).getItem(position);
final Object item = getListAdapter().getItem(position);
ResourceManager rm = getApp().getResourceManager();
if (!rm.containsAmenityRepositoryToSearch(false)) {
AccessibleToast.makeText(getActivity(), R.string.data_to_search_poi_not_available, Toast.LENGTH_LONG);

7
OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java
View file

@ -14,6 +14,7 @@ import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.util.DisplayMetrics;
import net.osmand.plus.R;
import java.util.TreeMap;
@ -69,7 +70,7 @@ public class FavoriteImageDrawable extends Drawable {
if (!withShadow) {
Rect bs = new Rect(bounds);
//bs.inset((int) (4 * density), (int) (4 * density));
bs.inset(bs.width() / 4, (int) bs.height() / 4);
bs.inset(bs.width() / 4, bs.height() / 4);
listDrawable.setBounds(bs);
}
}
@ -100,8 +101,8 @@ public class FavoriteImageDrawable extends Drawable {
canvas.drawBitmap(favIcon, bs.exactCenterX() - favIcon.getWidth() / 2f, bs.exactCenterY() - favIcon.getHeight() / 2f, paintIcon);
} else {
int min = Math.min(bs.width(), bs.height());
int r = (int) (min * 4 / 10);
int rs = (int) (r - 1);
int r = (min * 4 / 10);
int rs = (r - 1);
canvas.drawCircle(min / 2, min / 2, r, paintOuter);
canvas.drawCircle(min / 2, min / 2, rs, paintInnerCircle);
listDrawable.draw(canvas);

25
OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
View file

@ -1,15 +1,6 @@
package net.osmand.plus.download;
import static net.osmand.IndexConstants.BINARY_MAP_INDEX_EXT;
import java.io.File;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import android.content.Context;
import net.osmand.AndroidUtils;
import net.osmand.IndexConstants;
@ -22,10 +13,20 @@ import net.osmand.util.Algorithms;
import org.xmlpull.v1.XmlPullParser;
import android.content.Context;
import java.io.File;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import static net.osmand.IndexConstants.BINARY_MAP_INDEX_EXT;
public class DownloadActivityType {
private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd.MM.yyyy");
private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd.MM.yyyy", Locale.US);
private static Map<String, DownloadActivityType> byTag = new HashMap<>();
public static final DownloadActivityType NORMAL_FILE =

3
OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
View file

@ -34,6 +34,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;
/**
* @author Koen Rabaey
@ -281,7 +282,7 @@ public class GpxImportHelper {
private File getFileToSave(final String fileName, final File importDir, final GPXUtilities.WptPt pt) {
final StringBuilder builder = new StringBuilder(fileName);
if ("".equals(fileName)) {
builder.append("import_").append(new SimpleDateFormat("HH-mm_EEE").format(new Date(pt.time))).append(GPX_SUFFIX); //$NON-NLS-1$
builder.append("import_").append(new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time))).append(GPX_SUFFIX); //$NON-NLS-1$
}
if (fileName.endsWith(KML_SUFFIX)) {
builder.replace(builder.length() - KML_SUFFIX.length(), builder.length(), GPX_SUFFIX);

6
OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
View file

@ -4,7 +4,6 @@ import android.app.Dialog;
import android.content.DialogInterface;
import android.graphics.Point;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
@ -21,8 +20,8 @@ import android.widget.Button;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
import net.osmand.PlatformUtil;
import net.osmand.StringMatcher;
import net.osmand.osm.AbstractPoiType;
import net.osmand.osm.MapPoiTypes;
import net.osmand.osm.PoiCategory;
@ -318,6 +317,9 @@ public class AdvancedEditPoiFragment extends Fragment
if (poiType.getOsmValue2() != null) {
values.add(poiType.getOsmValue2());
}
for (PoiType type : poiType.getPoiAdditionals()) {
addPoiToStringSet(type, stringSet, values);
}
} else if (abstractPoiType instanceof PoiCategory) {
PoiCategory poiCategory = (PoiCategory) abstractPoiType;
for (PoiFilter filter : poiCategory.getPoiFilters()) {

63
OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
View file

@ -17,6 +17,7 @@ import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AlertDialog;
@ -310,6 +311,43 @@ public class EditPoiDialogFragment extends DialogFragment {
return dialog;
}
@Override
public void onResume() {
super.onResume();
getDialog().setOnKeyListener(new DialogInterface.OnKeyListener() {
@Override
public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
if (keyCode == android.view.KeyEvent.KEYCODE_BACK) {
if (event.getAction() == KeyEvent.ACTION_DOWN) {
return true;
} else {
dismissCheckForChanges();
return true;
}
}
return false;
}
});
}
@Override
public void onSaveInstanceState(Bundle outState) {
outState.putSerializable(TAGS_LIST, (Serializable) editPoiData.getTagValues());
super.onSaveInstanceState(outState);
}
@Override
public void show(FragmentManager manager, String tag) {
if (manager.findFragmentByTag(TAG) == null) {
super.show(manager, TAG);
}
}
@Override
public int show(FragmentTransaction transaction, String tag) {
throw new UnsupportedOperationException("Please use show(FragmentManager manager, String tag)");
}
private void trySave() {
if (TextUtils.isEmpty(poiTypeEditText.getText())) {
HashSet<String> tagsCopy = new HashSet<>();
@ -388,25 +426,6 @@ public class EditPoiDialogFragment extends DialogFragment {
}, getActivity(), mOpenstreetmapUtil);
}
@Override
public void onResume() {
super.onResume();
getDialog().setOnKeyListener(new DialogInterface.OnKeyListener() {
@Override
public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
if (keyCode == android.view.KeyEvent.KEYCODE_BACK) {
if (event.getAction() == KeyEvent.ACTION_DOWN) {
return true;
} else {
dismissCheckForChanges();
return true;
}
}
return false;
}
});
}
private void dismissCheckForChanges() {
if (editPoiData.hasChangesBeenMade()) {
new AreYouSureDialogFragment().show(getChildFragmentManager(),
@ -416,12 +435,6 @@ public class EditPoiDialogFragment extends DialogFragment {
}
}
@Override
public void onSaveInstanceState(Bundle outState) {
outState.putSerializable(TAGS_LIST, (Serializable) editPoiData.getTagValues());
super.onSaveInstanceState(outState);
}
public EditPoiData getEditPoiData() {
return editPoiData;
}

46
OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
View file

@ -1,13 +1,21 @@
package net.osmand.plus.osmedit;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Serializable;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
import android.app.Dialog;
import android.content.DialogInterface;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.PointF;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.util.Xml;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
import net.osmand.AndroidUtils;
import net.osmand.PlatformUtil;
@ -34,21 +42,13 @@ import org.apache.commons.logging.Log;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.app.Dialog;
import android.content.DialogInterface;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.PointF;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.util.Xml;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Serializable;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider, DialogProvider {
@ -440,7 +440,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
if(!Algorithms.isEmpty(text)) {
((EditText)view.findViewById(R.id.messageEditText)).setText(text);
}
AndroidUtils.softKeyboardDelayed((EditText) view.findViewById(R.id.messageEditText));
AndroidUtils.softKeyboardDelayed(view.findViewById(R.id.messageEditText));
btn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View dialog) {

30
OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
View file

@ -1,6 +1,18 @@
package net.osmand.plus.osmedit;
import java.util.List;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.Spinner;
import android.widget.Toast;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;
@ -27,19 +39,7 @@ import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.Spinner;
import android.widget.Toast;
import java.util.List;
public class OsmEditingPlugin extends OsmandPlugin {
@ -204,7 +204,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
} else if (resId == R.string.poi_context_menu_modify_osm_change) {
final Node entity = ((OpenstreetmapPoint) selectedObj).getEntity();
EditPoiDialogFragment.createInstance(entity, false)
.show(mapActivity.getSupportFragmentManager(), "edit_poi");
.show(mapActivity.getSupportFragmentManager(), EditPoiDialogFragment.TAG);
}
return true;
}

25
OsmAnd/src/net/osmand/plus/osmo/OsMoThread.java
View file

@ -1,5 +1,16 @@
package net.osmand.plus.osmo;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Message;
import net.osmand.PlatformUtil;
import net.osmand.plus.osmo.OsMoService.SessionInfo;
import org.apache.commons.logging.Log;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.InetSocketAddress;
@ -12,22 +23,12 @@ import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
import net.osmand.PlatformUtil;
import net.osmand.plus.osmo.OsMoService.SessionInfo;
import org.apache.commons.logging.Log;
import org.json.JSONException;
import org.json.JSONObject;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Message;
public class OsMoThread {
// private static String TRACKER_SERVER = "srv.osmo.mobi";
// private static int TRACKER_PORT = 3245;
@ -63,7 +64,7 @@ public class OsMoThread {
private ByteBuffer pendingReadCommand = ByteBuffer.allocate(2048);
private LinkedList<String> queueOfMessages = new LinkedList<String>();
private SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss");
private SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss", Locale.US);
private ConcurrentLinkedQueue<String> lastCommands = new ConcurrentLinkedQueue<String>();
private final static int STACK_CMD = 30;