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-04-07 01:19:02 +02:00
commit dd713dd63d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
View file

@ -58,7 +58,7 @@ public class GpxSelectionHelper {
File file = new File(selectedGPXFiles.get(0).getGpxFile().path); File file = new File(selectedGPXFiles.get(0).getGpxFile().path);
return Algorithms.getFileNameWithoutExtension(file); return Algorithms.getFileNameWithoutExtension(file);
} else if (selectedGPXFiles.size() == 0) { } else if (selectedGPXFiles.size() == 0) {
return app.getResources().getString(R.string.none); return app.getResources().getString(R.string.shared_string_none);
} else { } else {
return app.getResources().getString(R.string.number_of_gpx_files_selected_pattern, return app.getResources().getString(R.string.number_of_gpx_files_selected_pattern,
selectedGPXFiles.size()); selectedGPXFiles.size());

2
OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
View file

@ -319,7 +319,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
PoiFiltersHelper pfh = app.getPoiFilters(); PoiFiltersHelper pfh = app.getPoiFilters();
String filterId = app.getSettings().SELECTED_POI_FILTER_FOR_MAP.get(); String filterId = app.getSettings().SELECTED_POI_FILTER_FOR_MAP.get();
if (filterId == null) { if (filterId == null) {
return app.getResources().getString(R.string.none); return app.getResources().getString(R.string.shared_string_none);
} }
PoiUIFilter filter = pfh.getFilterById(filterId); PoiUIFilter filter = pfh.getFilterById(filterId);
return filter.getName(); return filter.getName();