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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-01-01 12:34:06 +01:00
commit 940e4d889a
4 changed files with 27 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -895,7 +895,7 @@
<string name="context_menu_item_directions_from">Directions from</string>
<string name="route_descr_map_location">Map: </string>
<string name="route_descr_lat_lon">Lat %1$.3f, lon %2$.3f</string>
<string name="route_descr_current_location">Current position</string>
<!-- string name="route_descr_current_location">Current position</string -->
<string name="route_descr_destination">Destination</string>
<string name="route_to">To:</string>
<string name="route_via">Via:</string>
@ -1574,11 +1574,11 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="map_version_changed_info">Server contains map files not compatible with your current version of the application. To download and use them, please upgrade the application to newer version.</string>
<string name="poi_filter_nominatim">Online Nominatim</string>
<string name="search_position_current_location_search">Searching position…</string>
<string name="search_position_current_location_found">Position (found)</string>
<string name="search_position_current_location_found">My Position (found)</string>
<string name="search_position_address">Address…</string>
<string name="search_position_favorites">Favorites…</string>
<string name="search_position_undefined">Undefined</string>
<string name="search_position_current_location">Current position…</string>
<!-- string name="search_position_current_location">Current position…</string -->
<string name="search_position_map_view">Current map center</string>
<string name="select_search_position">Origin:</string>
<string name="context_menu_item_search">Search near here</string>

2
OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
View file

@ -191,7 +191,7 @@ public class SearchActivity extends TabActivity implements OsmAndLocationListene
spinnerAdapter = new ArrayAdapter<String>(getSupportActionBar().getThemedContext(), R.layout.spinner_item,
new ArrayList<String>(Arrays.asList(new String[]{
getString(R.string.search_position_undefined),
getString(R.string.search_position_current_location),
getString(R.string.shared_string_my_location) + getString(R.string.shared_string_ellipsis),
getString(R.string.search_position_map_view),
getString(R.string.search_position_favorites),
getString(R.string.search_position_address)

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
View file

@ -532,7 +532,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
private Spinner setupFromSpinner(View view) {
ArrayList<RouteSpinnerRow> fromActions = new ArrayList<>();
fromActions.add(new RouteSpinnerRow(R.drawable.ic_action_get_my_location,
mapActivity.getString(R.string.route_descr_current_location)));
mapActivity.getString(R.string.shared_string_my_location)));
fromActions.add(new RouteSpinnerRow(R.drawable.ic_action_fav_dark,
mapActivity.getString(R.string.shared_string_favorite) + mapActivity.getString(R.string.shared_string_ellipsis)));
fromActions.add(new RouteSpinnerRow(R.drawable.ic_action_marker_dark,