Merge pull request #1557 from GaidamakUA/dashboard_swipe_to_dismiss

Poi dialog. Work in progress.

OsmAnd-java/src/net/osmand/IndexConstants.java

@@ -11,24 +11,29 @@ public class IndexConstants {
 	public final static int TTSVOICE_VERSION = 1; //supported download versions
 	
 	public static final String POI_INDEX_EXT = ".poi.odb"; //$NON-NLS-1$
+	
 	public static final String BINARY_MAP_INDEX_EXT = ".obf"; //$NON-NLS-1$
-	public static final String BINARY_SRTM_MAP_INDEX_EXT = ".srtm.obf"; //$NON-NLS-1$
-	public static final String BINARY_WIKI_MAP_INDEX_EXT_ZIP = ".wiki.obf.zip"; //$NON-NLS-1$
+	public static final String BINARY_MAP_INDEX_EXT_ZIP = ".obf.zip"; //$NON-NLS-1$
+	
 	public static final String BINARY_WIKI_MAP_INDEX_EXT = ".wiki.obf"; //$NON-NLS-1$
+	public static final String BINARY_WIKI_MAP_INDEX_EXT_ZIP = ".wiki.obf.zip"; //$NON-NLS-1$
+	public static final String BINARY_ROAD_MAP_INDEX_EXT = ".road.obf"; //$NON-NLS-1$
+	public static final String BINARY_ROAD_MAP_INDEX_EXT_ZIP = ".road.obf.zip"; //$NON-NLS-1$
+	public static final String BINARY_SRTM_MAP_INDEX_EXT = ".srtm.obf"; //$NON-NLS-1$
 	public static final String BINARY_SRTM_MAP_INDEX_EXT_ZIP = ".srtm.obf.zip"; //$NON-NLS-1$
+	public static final String EXTRA_EXT = ".extra";
+	public static final String EXTRA_ZIP_EXT = ".extra.zip";
+	
 	public static final String TOUR_INDEX_EXT = ".tour"; //$NON-NLS-1$
+	public static final String TOUR_INDEX_EXT_ZIP = ".tour.zip"; //$NON-NLS-1$
 	
 	public static final String GEN_LOG_EXT = ".gen.log"; //$NON-NLS-1$
 	
-	public static final String POI_INDEX_EXT_ZIP = ".poi.zip"; //$NON-NLS-1$
 	public static final String VOICE_INDEX_EXT_ZIP = ".voice.zip"; //$NON-NLS-1$
 	public static final String TTSVOICE_INDEX_EXT_ZIP = ".ttsvoice.zip"; //$NON-NLS-1$
 	public static final String ANYVOICE_INDEX_EXT_ZIP = "voice.zip"; //$NON-NLS-1$ //to cactch both voices, .voice.zip and .ttsvoice.zip
-	public static final String BINARY_MAP_INDEX_EXT_ZIP = ".obf.zip"; //$NON-NLS-1$
-	public static final String TOUR_INDEX_EXT_ZIP = ".tour.zip"; //$NON-NLS-1$
+
 	
-	public static final String EXTRA_ZIP_EXT = ".extra.zip";
-	public static final String EXTRA_EXT = ".extra";
 	
 	public static final String RENDERER_INDEX_EXT = ".render.xml"; //$NON-NLS-1$
 	
@@ -42,8 +47,10 @@ public class IndexConstants {
 	public static final String GPX_RECORDED_INDEX_DIR = GPX_INDEX_DIR + "rec/";
 	public static final String GPX_IMPORT_DIR = GPX_INDEX_DIR + "import/";
 	public static final String TILES_INDEX_DIR= "tiles/";
+	public static final String LIVE_INDEX_DIR= "live/";
 	public static final String TOURS_INDEX_DIR= "tours/";
 	public static final String SRTM_INDEX_DIR = "srtm/"; //$NON-NLS-1$
+	public static final String ROADS_INDEX_DIR = "roads/"; //$NON-NLS-1$
 	public static final String WIKI_INDEX_DIR = "wiki/"; //$NON-NLS-1$
 	public static final String AV_INDEX_DIR = "avnotes/"; //$NON-NLS-1$
 	public static final String VOICE_INDEX_DIR = "voice/"; //$NON-NLS-1$

OsmAnd-java/src/net/osmand/binary/BinaryInspector.java

@@ -66,15 +66,17 @@ public class BinaryInspector {
 		// test cases show info
 		if(args.length == 1 && "test".equals(args[0])) {
 			in.inspector(new String[]{
-//				"-vpoi",
-				"-vmap", "-vmapobjects", 
+				"-vpoi",
+//				"-vmap", "-vmapobjects",  //	"-vmapcoordinates", 
 //				"-vrouting",
 //				"-vaddress", "-vcities","-vstreetgroups", 
 //				"-vstreets", "-vbuildings", "-vintersections", 
-				"-zoom=14",
+//				"-zoom=15",
 //				"-bbox=1.74,51.17,1.75,51.16",
 //				"-vstats",
-				"/Users/victorshcherb/osmand/osm-gen/032.obf"
+				"/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"
+//				"/Users/victorshcherb/osmand/maps/Map.obf"
+//				"/Users/victorshcherb/osmand/temp/Czech-republic_jihovychod_europe_2.road.obf"
 					});
 		} else {
 			in.inspector(args);
@@ -118,6 +120,7 @@ public class BinaryInspector {
 		boolean vmap;
 		boolean vrouting;
 		boolean vmapObjects;
+		boolean vmapCoordinates;
 		boolean vstats;
 		boolean osm;
 		FileOutputStream osmOut = null;
@@ -177,6 +180,8 @@ public class BinaryInspector {
 					vrouting = true;
 				} else if(params[i].equals("-vmapobjects")){
 					vmapObjects = true;
+				} else if(params[i].equals("-vmapcoordinates")){
+					vmapCoordinates = true;
 				} else if(params[i].equals("-vpoi")){
 					vpoi = true;
 				} else if(params[i].startsWith("-osm")){
@@ -261,7 +266,7 @@ public class BinaryInspector {
 			printFileInformation(f);
 		}
 	}
-	public  static final void writeInt(CodedOutputStream ous, int v) throws IOException {
+	public static final void writeInt(CodedOutputStream ous, int v) throws IOException {
 		ous.writeRawByte((v >>> 24) & 0xFF);
 		ous.writeRawByte((v >>> 16) & 0xFF);
 		ous.writeRawByte((v >>>  8) & 0xFF);
@@ -287,7 +292,7 @@ public class BinaryInspector {
 				return null;
 			}
 			rafs[c] = new RandomAccessFile(f.getAbsolutePath(), "r");
-			indexes[c] = new BinaryMapIndexReader(rafs[c]);
+			indexes[c] = new BinaryMapIndexReader(rafs[c], f);
 			partsSet[c] = new LinkedHashSet<Float>();
 			if(version == -1){
 				version = indexes[c].getVersion();
@@ -400,7 +405,7 @@ public class BinaryInspector {
 	}
 
 
-	private  static void copyBinaryPart(CodedOutputStream ous, byte[] BUFFER, RandomAccessFile raf, long fp, int length)
+	public static void copyBinaryPart(CodedOutputStream ous, byte[] BUFFER, RandomAccessFile raf, long fp, int length)
 			throws IOException {
 		raf.seek(fp);
 		int toRead = length;
@@ -443,12 +448,13 @@ public class BinaryInspector {
 	
 	public void printFileInformation(File file) throws IOException {
 		RandomAccessFile r = new RandomAccessFile(file.getAbsolutePath(), "r");
-		printFileInformation(r, file.getName());
+		printFileInformation(r, file);
 	}
 
-	public  void printFileInformation(RandomAccessFile r, String filename) throws IOException {
+	public  void printFileInformation(RandomAccessFile r, File file ) throws IOException {
+		String filename = file.getName();
 		try {
-			BinaryMapIndexReader index = new BinaryMapIndexReader(r);
+			BinaryMapIndexReader index = new BinaryMapIndexReader(r, file);
 			int i = 1;
 			println("Binary index " + filename + " version = " + index.getVersion() +" edition = " + new Date(index.getDateCreated()));
 			for(BinaryIndexPart p : index.getIndexes()){
@@ -808,7 +814,7 @@ public class BinaryInspector {
 									throw new RuntimeException(e);
 								}
 							} else {
-								printMapDetails(obj, b);
+								printMapDetails(obj, b, vInfo.vmapCoordinates);
 								println(b.toString());
 							}
 						}
@@ -834,7 +840,7 @@ public class BinaryInspector {
 
 	
 
-	private static void printMapDetails(BinaryMapDataObject obj, StringBuilder b) {
+	private static void printMapDetails(BinaryMapDataObject obj, StringBuilder b, boolean vmapCoordinates) {
 		boolean multipolygon = obj.getPolygonInnerCoordinates() != null && obj.getPolygonInnerCoordinates().length > 0;
 		if(multipolygon ) {
 			b.append("Multipolygon");
@@ -893,11 +899,13 @@ public class BinaryInspector {
 		}
 
 		b.append(" id ").append((obj.getId() >> 1));
-		b.append(" lat/lon : ");
-		for(int i=0; i<obj.getPointsLength(); i++) {
-			float x = (float) MapUtils.get31LongitudeX(obj.getPoint31XTile(i));
-			float y = (float) MapUtils.get31LatitudeY(obj.getPoint31YTile(i));
-			b.append(y).append(" / ").append(x).append(" , ");
+		if (vmapCoordinates) {
+			b.append(" lat/lon : ");
+			for (int i = 0; i < obj.getPointsLength(); i++) {
+				float x = (float) MapUtils.get31LongitudeX(obj.getPoint31XTile(i));
+				float y = (float) MapUtils.get31LatitudeY(obj.getPoint31YTile(i));
+				b.append(y).append(" / ").append(x).append(" , ");
+			}
 		}
 	}
 
@@ -1069,7 +1077,7 @@ public class BinaryInspector {
 		}
 		println("Inspector is console utility for working with binary indexes of OsmAnd.");
 		println("It allows print info about file, extract parts and merge indexes.");
-		println("\nUsage for print info : inspector [-vaddress] [-vstreetgroups] [-vstreets] [-vbuildings] [-vintersections] [-vmap] [-vmapobjects] [-osm] [-vpoi] [-vrouting] [-vtransport] [-zoom=Zoom] [-bbox=LeftLon,TopLat,RightLon,BottomLan] [file]");
+		println("\nUsage for print info : inspector [-vaddress] [-vstreetgroups] [-vstreets] [-vbuildings] [-vintersections] [-vmap] [-vmapobjects] [-vmapcoordinates] [-osm] [-vpoi] [-vrouting] [-vtransport] [-zoom=Zoom] [-bbox=LeftLon,TopLat,RightLon,BottomLan] [file]");
 		println("  Prints information about [file] binary index of OsmAnd.");
 		println("  -v.. more verbouse output (like all cities and their streets or all map objects with tags/values and coordinates)");
 		println("\nUsage for combining indexes : inspector -c file_to_create (file_from_extract ((+|-)parts_to_extract)? )*");

OsmAnd-java/src/net/osmand/binary/BinaryMapIndexFilter.java

@@ -26,7 +26,7 @@ public class BinaryMapIndexFilter {
 	private final BinaryMapIndexReader reader;
 
 	public BinaryMapIndexFilter(File file) throws IOException{
-		reader = new BinaryMapIndexReader(new RandomAccessFile(file.getPath(), "r"));
+		reader = new BinaryMapIndexReader(new RandomAccessFile(file.getPath(), "r"), file);
 	}
 	
 	

OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java

@@ -81,6 +81,7 @@ public class BinaryMapIndexReader {
 	public static boolean READ_STATS = false;
 	
 	private final RandomAccessFile raf;
+	protected final File file;
 	/*private*/ int version;
 	/*private */long dateCreated;
 	// keep them immutable inside
@@ -102,8 +103,9 @@ public class BinaryMapIndexReader {
 	private static String BASEMAP_NAME = "basemap";
 
 	
-	public BinaryMapIndexReader(final RandomAccessFile raf) throws IOException {
+	public BinaryMapIndexReader(final RandomAccessFile raf, File file) throws IOException {
 		this.raf = raf;
+		this.file = file;
 		codedIS = CodedInputStream.newInstance(raf);
 		codedIS.setSizeLimit(Integer.MAX_VALUE); // 2048 MB
 		transportAdapter = new BinaryMapTransportReaderAdapter(this);
@@ -113,8 +115,9 @@ public class BinaryMapIndexReader {
 		init();
 	}
 	
-	/*private */BinaryMapIndexReader(final RandomAccessFile raf, boolean init) throws IOException {
+	/*private */BinaryMapIndexReader(final RandomAccessFile raf, File file, boolean init) throws IOException {
 		this.raf = raf;
+		this.file = file;
 		codedIS = CodedInputStream.newInstance(raf);
 		codedIS.setSizeLimit(Integer.MAX_VALUE); // 2048 MB
 		transportAdapter = new BinaryMapTransportReaderAdapter(this);
@@ -128,6 +131,7 @@ public class BinaryMapIndexReader {
 	
 	public BinaryMapIndexReader(final RandomAccessFile raf, BinaryMapIndexReader referenceToSameFile) throws IOException {
 		this.raf = raf;
+		this.file = referenceToSameFile.file;
 		codedIS = CodedInputStream.newInstance(raf);
 		codedIS.setSizeLimit(Integer.MAX_VALUE); // 2048 MB
 		version = referenceToSameFile.version;
@@ -362,6 +366,10 @@ public class BinaryMapIndexReader {
 		return raf;
 	}
 	
+	public File getFile() {
+		return file;
+	}
+	
 	public int readByte() throws IOException{
 		byte b = codedIS.readRawByte();
 		if(b < 0){
@@ -535,40 +543,31 @@ public class BinaryMapIndexReader {
 		return names;
 	}
 	
-	public LatLon getRegionCenter(String name) {
-		AddressRegion rg = getRegionByName(name);
-		if (rg != null) {
-			return rg.calculatedCenter;
+	public LatLon getRegionCenter() {
+		for(AddressRegion r : addressIndexes) {
+			if(r.calculatedCenter != null)
+				return r.calculatedCenter;
 		}
 		return null;
 	}
 	
-	private AddressRegion getRegionByName(String name){
-		for(AddressRegion r : addressIndexes){
-			if(r.name.equals(name)){
-				return r;
-			}
-		}
-		return null;
+	public List<City> getCities(SearchRequest<City> resultMatcher,  
+			int cityType) throws IOException {
+		return getCities(resultMatcher, null, null, cityType);
 	}
+
 	
-	public List<City> getCities(String region, SearchRequest<City> resultMatcher,  
-			int cityType) throws IOException {
-		return getCities(region, resultMatcher, null, null, cityType);
-	}
-	public List<City> getCities(String region, SearchRequest<City> resultMatcher, StringMatcher matcher, String lang, 
-			int cityType) throws IOException {
+	public List<City> getCities(SearchRequest<City> resultMatcher, StringMatcher matcher, String lang, int cityType)
+			throws IOException {
 		List<City> cities = new ArrayList<City>();
-		AddressRegion r = getRegionByName(region);
-		if(r == null) {
-			return cities;
-		}
-		for(CitiesBlock block : r.cities) {
-			if(block.type == cityType) {
-				codedIS.seek(block.filePointer);
-				int old = codedIS.pushLimit(block.length);
-				addressAdapter.readCities(cities, resultMatcher, matcher, r.attributeTagsTable);
-				codedIS.popLimit(old);
+		for (AddressRegion r : addressIndexes) {
+			for (CitiesBlock block : r.cities) {
+				if (block.type == cityType) {
+					codedIS.seek(block.filePointer);
+					int old = codedIS.pushLimit(block.length);
+					addressAdapter.readCities(cities, resultMatcher, matcher, r.attributeTagsTable);
+					codedIS.popLimit(old);
+				}
 			}
 		}
 		return cities;
@@ -1742,7 +1741,7 @@ public class BinaryMapIndexReader {
 		List<MapRoot> roots = new ArrayList<MapRoot>();
 		
 		Map<String, Map<String, Integer> > encodingRules = new HashMap<String, Map<String, Integer> >();
-		TIntObjectMap<TagValuePair> decodingRules = new TIntObjectHashMap<TagValuePair>();
+		public TIntObjectMap<TagValuePair> decodingRules = new TIntObjectHashMap<TagValuePair>();
 		public int nameEncodingType = 0;
 		public int nameEnEncodingType = -1;
 		public int refEncodingType = -1;
@@ -1965,9 +1964,10 @@ public class BinaryMapIndexReader {
 	}
 	
 	public static void main(String[] args) throws IOException {
-		RandomAccessFile raf = new RandomAccessFile("/Users/victorshcherb/osmand/osm-gen/map.obf", "r");
+		File fl = new File("/Users/victorshcherb/osmand/osm-gen/map.obf");
+		RandomAccessFile raf = new RandomAccessFile(fl, "r");
 		
-		BinaryMapIndexReader reader = new BinaryMapIndexReader(raf);
+		BinaryMapIndexReader reader = new BinaryMapIndexReader(raf, fl);
 		println("VERSION " + reader.getVersion()); //$NON-NLS-1$
 		long time = System.currentTimeMillis();
 
@@ -2260,9 +2260,8 @@ public class BinaryMapIndexReader {
 	
 	private static void testAddressSearch(BinaryMapIndexReader reader) throws IOException {
 		// test address index search
-		String reg = reader.getRegionNames().get(0);
 		final Map<String, Integer> streetFreq = new HashMap<String, Integer>();
-		List<City> cs = reader.getCities(reg, null, BinaryMapAddressReaderAdapter.CITY_TOWN_TYPE);
+		List<City> cs = reader.getCities(null, BinaryMapAddressReaderAdapter.CITY_TOWN_TYPE);
 		for(City c : cs){
 			int buildings = 0;
 			reader.preloadStreets(c, null);
@@ -2275,7 +2274,7 @@ public class BinaryMapIndexReader {
 			println(c.getName() + " " + c.getLocation() + " " + c.getStreets().size() + " " + buildings + " " + c.getEnName(true) + " " + c.getName("ru"));
 		}
 //		int[] count = new int[1];
-		List<City> villages = reader.getCities(reg, buildAddressRequest((ResultMatcher<City>) null), BinaryMapAddressReaderAdapter.VILLAGES_TYPE);
+		List<City> villages = reader.getCities(buildAddressRequest((ResultMatcher<City>) null), BinaryMapAddressReaderAdapter.VILLAGES_TYPE);
 		for(City v : villages) {
 			reader.preloadStreets(v,  null);
 			for(Street s : v.getStreets()){

OsmAnd-java/src/net/osmand/binary/CachedOsmandIndexes.java

@@ -185,19 +185,19 @@ public class CachedOsmandIndexes {
 		BinaryMapIndexReader reader = null;
 		if (found == null) {
 			long val = System.currentTimeMillis();
-			reader = new BinaryMapIndexReader(mf);
+			reader = new BinaryMapIndexReader(mf, f);
 			addToCache(reader, f);
 			if (log.isDebugEnabled()) {
 				log.debug("Initializing db " + f.getAbsolutePath() + " " + (System.currentTimeMillis() - val ) + "ms"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 		} else {
-			reader = initFileIndex(found, mf);
+			reader = initFileIndex(found, mf, f);
 		}
 		return reader;
 	}
 	
-	private BinaryMapIndexReader initFileIndex(FileIndex found, RandomAccessFile mf) throws IOException {
-		BinaryMapIndexReader reader = new BinaryMapIndexReader(mf, false);
+	private BinaryMapIndexReader initFileIndex(FileIndex found, RandomAccessFile mf, File f) throws IOException {
+		BinaryMapIndexReader reader = new BinaryMapIndexReader(mf, f, false);
 		reader.version = found.getVersion();
 		reader.dateCreated = found.getDateModified();
 		

OsmAnd-java/src/net/osmand/binary/RouteDataObject.java

@@ -248,7 +248,7 @@ public class RouteDataObject {
 			String pref = v.substring(i, v.length()).trim();
 			float add = 0;
 			for(int ik = 0; ik < pref.length(); ik++) {
-				if(Character.isDigit(pref.charAt(ik)) || pref.charAt(ik) == '.' || pref.charAt(ik) == '-') {
+				if(Algorithms.isDigit(pref.charAt(ik)) || pref.charAt(ik) == '.' || pref.charAt(ik) == '-') {
 					int first = Algorithms.findFirstNumberEndIndex(pref.substring(ik));
 					if(first != -1) {
 						add = parseLength(pref.substring(ik), 0);

OsmAnd-java/src/net/osmand/data/City.java

@@ -33,6 +33,9 @@ public class City extends MapObject {
 			if (place == null) {
 				return null;
 			}
+			if("township".equals(place)) {
+				return CityType.TOWN;
+			}
 			for (CityType t : CityType.values()) {
 				if (t.name().equalsIgnoreCase(place)) {
 					return t;

OsmAnd-java/src/net/osmand/map/MapTileDownloader.java

@@ -301,9 +301,7 @@ public class MapTileDownloader {
 		Iterator<WeakReference<IMapDownloaderCallback>> it = callbacks.iterator();
 		while(it.hasNext()) {
 			IMapDownloaderCallback c = it.next().get();
-			if(c == null) {
-				it.remove();
-			} else {
+			if(c != null) {
 				c.tileDownloaded(request);
 			}
 		}		

OsmAnd-java/src/net/osmand/map/OsmandRegions.java

@@ -4,6 +4,7 @@ package net.osmand.map;
 import gnu.trove.iterator.TIntObjectIterator;
 import gnu.trove.list.array.TIntArrayList;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
@@ -56,7 +57,7 @@ public class OsmandRegions {
 
 
 	public void prepareFile(String fileName) throws IOException {
-		reader = new BinaryMapIndexReader(new RandomAccessFile(fileName, "r"));
+		reader = new BinaryMapIndexReader(new RandomAccessFile(fileName, "r"), new File(fileName));
 		initLocaleNames();
 	}
 

OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java

@@ -84,7 +84,7 @@ public class MapRenderingTypes {
 			init();
 		}
 	}
-	public Collection<Map<String, String>> splitTagsIntoDifferentObjects(final Map<String, String> tags) {
+	public static Collection<Map<String, String>> splitTagsIntoDifferentObjects(final Map<String, String> tags) {
 		// check open sea maps tags
 		boolean split = splitIsNeeded(tags);
 		if(!split) {
@@ -94,7 +94,7 @@ public class MapRenderingTypes {
 		}
 	}
 
-	protected boolean splitIsNeeded(final Map<String, String> tags) {
+	protected static boolean splitIsNeeded(final Map<String, String> tags) {
 		boolean seamark = false;
 		for(String s : tags.keySet()) {
 			if(s.startsWith("seamark:")) {
@@ -105,7 +105,7 @@ public class MapRenderingTypes {
 		return seamark;
 	}
 
-	private Collection<Map<String, String>> splitOpenSeaMapsTags(final Map<String, String> tags) {
+	private static Collection<Map<String, String>> splitOpenSeaMapsTags(final Map<String, String> tags) {
 		Map<String, Map<String, String>> groupByOpenSeamaps = new HashMap<String, Map<String, String>>();
 		Map<String, String> common = new HashMap<String, String>();
 		String ATTACHED_KEY = "seamark:attached";
@@ -148,7 +148,7 @@ public class MapRenderingTypes {
 	}	
 	
 	
-	private String openSeaType(String value) {
+	private static String openSeaType(String value) {
 		if(value.equals("light_major") || value.equals("light_minor")) {
 			return "light";
 		}

OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java

@@ -175,22 +175,25 @@ public class EntityParser {
 	}
 	
 	
-	public static List<Amenity> parseAmenities(MapPoiTypes poiTypes, Entity entity, Map<String, String> tags,List<Amenity> amenitiesList) {
+	public static List<Amenity> parseAmenities(MapPoiTypes poiTypes, Entity entity, Map<String, String> tags,
+			List<Amenity> amenitiesList) {
 		amenitiesList.clear();
 		// it could be collection of amenities
 		boolean relation = entity instanceof Relation;
 		boolean purerelation = relation && !"multipolygon".equals(tags.get("type"));
-		
-		for (Map.Entry<String, String> e : tags.entrySet()) {
-			Amenity am = poiTypes.parseAmenity(e.getKey(), e.getValue(), purerelation, tags);
-			if (am != null) {
-				parseMapObject(am, entity, tags);
-				String wbs = getWebSiteURL(tags);
-				if(wbs != null) {
-					am.setAdditionalInfo("website", wbs);
-				}
-				if (checkAmenitiesToAdd(am, amenitiesList) && !"no".equals(am.getSubType())) {
-					amenitiesList.add(am);
+		Collection<Map<String, String>> it = MapRenderingTypes.splitTagsIntoDifferentObjects(tags);
+		for (Map<String, String> ts : it) {
+			for (Map.Entry<String, String> e : ts.entrySet()) {
+				Amenity am = poiTypes.parseAmenity(e.getKey(), e.getValue(), purerelation, ts);
+				if (am != null) {
+					parseMapObject(am, entity, ts);
+					String wbs = getWebSiteURL(ts);
+					if (wbs != null) {
+						am.setAdditionalInfo("website", wbs);
+					}
+					if (checkAmenitiesToAdd(am, amenitiesList) && !"no".equals(am.getSubType())) {
+						amenitiesList.add(am);
+					}
 				}
 			}
 		}

OsmAnd-java/src/net/osmand/osm/io/NetworkUtils.java

@@ -27,11 +27,9 @@ public class NetworkUtils {
 
 	private static Proxy proxy = null;
 
-	public static String sendGetRequest(String urlText, String userNamePassword){
-		URL url;
+	public static String sendGetRequest(String urlText, String userNamePassword, StringBuilder responseBody){
 		try {
 			log.info("GET : " + urlText);
-			url = new URL(urlText);
 			HttpURLConnection conn = getHttpURLConnection(urlText);
 			conn.setDoInput(true);
 			conn.setDoOutput(false);
@@ -39,14 +37,13 @@ public class NetworkUtils {
 			if(userNamePassword != null) {
 				conn.setRequestProperty("Authorization", "Basic " + Base64.encode(userNamePassword)); //$NON-NLS-1$ //$NON-NLS-2$
 			}
-			
 	        conn.setRequestProperty("User-Agent", "OsmAnd"); //$NON-NLS-1$ //$NON-NLS-2$
 			log.info("Response code and message : " + conn.getResponseCode() + " " + conn.getResponseMessage());
 			if(conn.getResponseCode() != 200){
 				return conn.getResponseMessage();
 			}
 			InputStream is = conn.getInputStream();
-			StringBuilder responseBody = new StringBuilder();
+			responseBody.setLength(0);
 			if (is != null) {
 				BufferedReader in = new BufferedReader(new InputStreamReader(is, "UTF-8")); //$NON-NLS-1$
 				String s;
@@ -62,12 +59,7 @@ public class NetworkUtils {
 				}
 				is.close();
 			}
-			String response = responseBody.toString();
-			log.info("Response : " + response);
-			if(response.startsWith("OK")){
-				return null;
-			}
-			return response;
+			return null;
 		} catch (IOException e) {
 			log.error(e.getMessage(), e);
 			return e.getMessage();

OsmAnd-java/src/net/osmand/osm/io/OsmBaseStorage.java

@@ -1,5 +1,6 @@
 package net.osmand.osm.io;
 
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -8,12 +9,14 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.zip.GZIPInputStream;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
 import net.osmand.IProgress;
+import net.osmand.PlatformUtil;
 import net.osmand.osm.edit.Entity;
 import net.osmand.osm.edit.EntityInfo;
 import net.osmand.osm.edit.Node;
@@ -25,9 +28,11 @@ import net.osmand.osm.edit.Entity.EntityType;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 
-public class OsmBaseStorage extends DefaultHandler {
+public class OsmBaseStorage {
 
 	protected static final String ELEM_OSM = "osm"; //$NON-NLS-1$
 	protected static final String ELEM_OSMCHANGE = "osmChange"; //$NON-NLS-1$
@@ -78,8 +83,14 @@ public class OsmBaseStorage extends DefaultHandler {
 	
 	
 	
+	public static void main(String[] args) throws IOException, SAXException, XmlPullParserException {
+		GZIPInputStream is = new GZIPInputStream(
+				new FileInputStream("/Users/victorshcherb/osmand/temp/m.m001508233.osc.gz"));
+		new OsmBaseStorage().parseOSM(is, IProgress.EMPTY_PROGRESS);
+	}
+	
 	public synchronized void parseOSM(InputStream stream, IProgress progress, InputStream streamForProgress, 
-			boolean entityInfo) throws IOException, SAXException {
+			boolean entityInfo) throws IOException, XmlPullParserException {
 		this.inputStream = stream;
 		this.progress = progress;
 		parseEntityInfo = entityInfo;
@@ -87,15 +98,22 @@ public class OsmBaseStorage extends DefaultHandler {
 			streamForProgress = inputStream;
 		}
 		this.streamForProgress = streamForProgress;
-		SAXParser parser = initSaxParser();
 		parseStarted = false;
 		entities.clear();
 		this.entityInfo.clear();
 		if(progress != null){
 			progress.startWork(streamForProgress.available());
 		}
-		
-		parser.parse(stream, this);
+		XmlPullParser parser = PlatformUtil.newXMLPullParser();
+		parser.setInput(stream, "UTF-8");
+		int tok;
+		while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
+			if (tok == XmlPullParser.START_TAG) {
+				startElement(parser, parser.getName());
+			} else if (tok == XmlPullParser.END_TAG) {
+				endElement(parser, parser.getName());
+			}
+		}
 		if(progress != null){
 			progress.finishTask();
 		}
@@ -107,7 +125,7 @@ public class OsmBaseStorage extends DefaultHandler {
 	 * @throws IOException
 	 * @throws SAXException - could be
 	 */
-	public synchronized void parseOSM(InputStream stream, IProgress progress) throws IOException, SAXException {
+	public synchronized void parseOSM(InputStream stream, IProgress progress) throws IOException, XmlPullParserException {
 		parseOSM(stream, progress, null, true);
 		
 	}
@@ -120,29 +138,14 @@ public class OsmBaseStorage extends DefaultHandler {
 	}
 	
 	private boolean osmChange;
-	protected SAXParser saxParser;
-	public SAXParser initSaxParser(){
-		if(saxParser != null){
-			return saxParser;
-		}
-		SAXParserFactory factory = SAXParserFactory.newInstance();
-		try {
-			factory.setFeature("http://xml.org/sax/features/namespace-prefixes", false); //$NON-NLS-1$
-			return saxParser = factory.newSAXParser();
-		} catch (ParserConfigurationException e) {
-			throw new IllegalStateException(e);
-		} catch (SAXException e) {
-			throw new IllegalStateException(e);
-		}	
-	}
 	
 	public boolean isOsmChange() {
 		return osmChange;
 	}
 	
-	protected Long parseId(Attributes a, String name, long defId){
+	protected Long parseId(XmlPullParser parser, String name, long defId){
 		long id = defId; 
-		String value = a.getValue(name);
+		String value = parser.getAttributeValue("",name);
 		try {
 			id = Long.parseLong(value);
 		} catch (NumberFormatException e) {
@@ -150,9 +153,9 @@ public class OsmBaseStorage extends DefaultHandler {
 		return id;
 	}
 	
-	protected double parseDouble(Attributes a, String name, double defVal){
+	protected double parseDouble(XmlPullParser parser, String name, double defVal){
 		double ret = defVal; 
-		String value = a.getValue(name);
+		String value = parser.getAttributeValue("", name);
 		if(value == null) {
 			return defVal;
 		}
@@ -169,21 +172,20 @@ public class OsmBaseStorage extends DefaultHandler {
 		supportedVersions.add("0.5"); //$NON-NLS-1$
 	}
 	
-	protected void initRootElement(String uri, String localName, String name, Attributes attributes) throws OsmVersionNotSupported{
-		if((!ELEM_OSM.equals(name) && !ELEM_OSMCHANGE.equals(name)) || !supportedVersions.contains(attributes.getValue(ATTR_VERSION))){
+	protected void initRootElement(XmlPullParser parser, String name) throws OsmVersionNotSupported {
+		if ((!ELEM_OSM.equals(name) && !ELEM_OSMCHANGE.equals(name))
+				|| !supportedVersions.contains(parser.getAttributeValue("", ATTR_VERSION))) {
 			throw new OsmVersionNotSupported();
 		}
 		osmChange = ELEM_OSMCHANGE.equals(name);
-		parseStarted = true;	
+		parseStarted = true;
 	}
 	
 	protected static final int moduleProgress = 1 << 10;
 	
-	@Override
-	public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException {
-		name = saxParser.isNamespaceAware() ? localName : name;
+	public void startElement(XmlPullParser parser, String name)  {
 		if(!parseStarted){
-			initRootElement(uri, localName, name, attributes);
+			initRootElement(parser, name);
 		}
 		if (ELEM_MODIFY.equals(name) ) {
 			currentModify = Entity.MODIFY_MODIFIED;
@@ -202,12 +204,12 @@ public class OsmBaseStorage extends DefaultHandler {
 				}
 			}
 			if (ELEM_NODE.equals(name)) {
-				currentParsedEntity = new Node(parseDouble(attributes, ATTR_LAT, 0), parseDouble(attributes, ATTR_LON, 0),
-						parseId(attributes, ATTR_ID, -1));
+				currentParsedEntity = new Node(parseDouble(parser, ATTR_LAT, 0), parseDouble(parser, ATTR_LON, 0),
+						parseId(parser, ATTR_ID, -1));
 			} else if (ELEM_WAY.equals(name)) {
-				currentParsedEntity = new Way(parseId(attributes, ATTR_ID, -1));
+				currentParsedEntity = new Way(parseId(parser, ATTR_ID, -1));
 			} else if (ELEM_RELATION.equals(name)) {
-				currentParsedEntity = new Relation(parseId(attributes, ATTR_ID, -1));
+				currentParsedEntity = new Relation(parseId(parser, ATTR_ID, -1));
 			} else {
 				// this situation could be logged as unhandled
 			}
@@ -215,30 +217,34 @@ public class OsmBaseStorage extends DefaultHandler {
 				currentParsedEntity.setModify(currentModify);
 				if (parseEntityInfo) {
 					currentParsedEntityInfo = new EntityInfo();
-					currentParsedEntityInfo.setChangeset(attributes.getValue(ATTR_CHANGESET));
-					currentParsedEntityInfo.setTimestamp(attributes.getValue(ATTR_TIMESTAMP));
-					currentParsedEntityInfo.setUser(attributes.getValue(ATTR_USER));
-					currentParsedEntityInfo.setVersion(attributes.getValue(ATTR_VERSION));
-					currentParsedEntityInfo.setVisible(attributes.getValue(ATTR_VISIBLE));
-					currentParsedEntityInfo.setUid(attributes.getValue(ATTR_UID));
+					currentParsedEntityInfo.setChangeset(parser.getAttributeValue("",ATTR_CHANGESET));
+					currentParsedEntityInfo.setTimestamp(parser.getAttributeValue("",ATTR_TIMESTAMP));
+					currentParsedEntityInfo.setUser(parser.getAttributeValue("",ATTR_USER));
+					currentParsedEntityInfo.setVersion(parser.getAttributeValue("",ATTR_VERSION));
+					currentParsedEntityInfo.setVisible(parser.getAttributeValue("",ATTR_VISIBLE));
+					currentParsedEntityInfo.setUid(parser.getAttributeValue("",ATTR_UID));
 				}
 			}
 		} else {
 			if (ELEM_TAG.equals(name)) {
-				String key = attributes.getValue(ATTR_K);
+				String key = parser.getAttributeValue("",ATTR_K);
 				if(key != null){
-					currentParsedEntity.putTag(key, attributes.getValue(ATTR_V));
+					currentParsedEntity.putTag(key, parser.getAttributeValue("",ATTR_V));
 				}
 			} else if (ELEM_ND.equals(name)) {
-				Long id = parseId(attributes, ATTR_REF, -1);
+				Long id = parseId(parser, ATTR_REF, -1);
 				if(id != -1 && currentParsedEntity instanceof Way){
 					((Way)currentParsedEntity).addNode(id);
 				}
 			} else if (ELEM_MEMBER.equals(name)) {
-				Long id = parseId(attributes, ATTR_REF, -1);
-				if(id != -1 && currentParsedEntity instanceof Relation){
-					EntityType type = EntityType.valueOf(attributes.getValue(ATTR_TYPE).toUpperCase());
-					((Relation)currentParsedEntity).addMember(id, type, attributes.getValue(ATTR_ROLE));
+				try {
+					Long id = parseId(parser, ATTR_REF, -1);
+					if (id != -1 && currentParsedEntity instanceof Relation) {
+						EntityType type = EntityType.valueOf(parser.getAttributeValue("",ATTR_TYPE).toUpperCase());
+						((Relation) currentParsedEntity).addMember(id, type, parser.getAttributeValue("",ATTR_ROLE));
+					}
+				} catch (Exception e) {
+					e.printStackTrace();
 				}
 
 			}  else {
@@ -247,9 +253,7 @@ public class OsmBaseStorage extends DefaultHandler {
 		}
 	}
 	
-	@Override
-	public void endElement(String uri, String localName, String name) throws SAXException {
-		name = saxParser.isNamespaceAware() ? localName : name;
+	public void endElement(XmlPullParser parser, String name) {
 		EntityType type = null;
 		if (ELEM_NODE.equals(name)){
 			type = EntityType.NODE; 
@@ -281,7 +285,6 @@ public class OsmBaseStorage extends DefaultHandler {
 				currentParsedEntity = null;
 			}
 		}
-		super.endElement(uri, localName, name);
     }
 
     public void registerEntity(Entity entity, EntityInfo info) {
@@ -323,7 +326,7 @@ public class OsmBaseStorage extends DefaultHandler {
 	/**
 	 * Thrown when version is not supported
 	 */
-	public static class OsmVersionNotSupported extends SAXException {
+	public static class OsmVersionNotSupported extends RuntimeException {
 		private static final long serialVersionUID = -127558215143984838L;
 
 	}

OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java

@@ -652,12 +652,14 @@ public class RouteResultPreparation {
 					// This was just to make sure that there's no bad data.
 					TurnType.setPrimaryTurnAndReset(lanesArray, ind, TurnType.TL);
 					TurnType.setSecondaryTurn(lanesArray, ind, tt);
+					lanesArray[ind] |= 1;
 				}
 			} else {
 				if (!TurnType.isRightTurn(tt)) {
 					// This was just to make sure that there's no bad data.
 					TurnType.setPrimaryTurnAndReset(lanesArray, ind, TurnType.TR);
 					TurnType.setSecondaryTurn(lanesArray, ind, tt);
+					lanesArray[ind] |= 1;
 				}
 			}
 			setAllowedLanes(tt, lanesArray);

OsmAnd-java/src/net/osmand/router/TestRouting.java

@@ -297,7 +297,7 @@ public class TestRouting {
 		for (File f : files) {
 			RandomAccessFile raf = new RandomAccessFile(f.getAbsolutePath(), "r"); //$NON-NLS-1$ //$NON-NLS-2$
 			System.out.println(f.getName());
-			rs[it++] = new BinaryMapIndexReader(raf);
+			rs[it++] = new BinaryMapIndexReader(raf, f);
 		}
 		return rs;
 	}

OsmAnd-java/src/net/osmand/util/Algorithms.java

@@ -1,6 +1,7 @@
 package net.osmand.util;
 
 
+import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.EOFException;
 import java.io.File;
@@ -8,8 +9,12 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -42,6 +47,56 @@ public class Algorithms {
 		return def;
 	}
 	
+	
+	public static String getFileNameWithoutExtension(File f) {
+		String name = f.getName();
+		int i = name.indexOf('.');
+		if(i >= 0) {
+			name = name.substring(0, i);
+		}
+		return name;
+	}
+	
+	
+	
+	public static File[] getSortedFilesVersions(File dir){
+		File[] listFiles = dir.listFiles();
+		if (listFiles != null) {
+			Arrays.sort(listFiles, getFileVersionComparator());
+		}
+		return listFiles;
+	}
+
+	public static Comparator<File> getFileVersionComparator() {
+		return new Comparator<File>() {
+			@Override
+			public int compare(File o1, File o2) {
+				return -simplifyFileName(o1.getName()).compareTo(simplifyFileName(o2.getName()));
+			}
+			
+			public String simplifyFileName(String fn) {
+				String lc = fn.toLowerCase();
+				if (lc.indexOf(".") != -1) {
+					lc = lc.substring(0, lc.indexOf("."));
+				}
+				if (lc.endsWith("_2")) {
+					lc = lc.substring(0, lc.length() - "_2".length());
+				}
+				boolean hasTimestampEnd = false;
+				for(int i = 0; i < lc.length(); i++) {
+					if(lc.charAt(i) >= '0' && lc.charAt(i) <= '9') {
+						hasTimestampEnd = true;
+						break;
+					}
+				}
+				if(!hasTimestampEnd) {
+					lc += "_00_00_00";
+				}
+				return lc;
+			}
+		};
+	}
+	
 	private static final char CHAR_TOSPLIT = 0x01;
 
 	public static Map<String, String> decodeMap(String s) {
@@ -78,7 +133,7 @@ public class Algorithms {
 		if (value.length() > 0 && value.charAt(0) == '-') {
 			i++;
 		}
-		while (i < value.length() && (Character.isDigit(value.charAt(i)) || value.charAt(i) == '.')) {
+		while (i < value.length() && (isDigit(value.charAt(i)) || value.charAt(i) == '.')) {
 			i++;
 			valid = true;
 		}
@@ -89,6 +144,10 @@ public class Algorithms {
 		}
 	}
 	
+	public static boolean isDigit(char charAt) {
+		return charAt >= '0' && charAt <= '9';
+	}
+
 	/**
 	 * Determine whether a file is a ZIP File.
 	 */
@@ -165,7 +224,7 @@ public class Algorithms {
 	public static int extractFirstIntegerNumber(String s) {
 		int i = 0;
 		for (int k = 0; k < s.length(); k++) {
-			if (Character.isDigit(s.charAt(k))) {
+			if (isDigit(s.charAt(k))) {
 				i = i * 10 + (s.charAt(k) - '0');
 			} else {
 				break;
@@ -178,12 +237,12 @@ public class Algorithms {
 		int i = 0;
 		int k = 0;
 		for (k = 0; k < s.length(); k++) {
-			if (Character.isDigit(s.charAt(k))) {
+			if (isDigit(s.charAt(k))) {
 				break;
 			}
 		}
 		for (; k < s.length(); k++) {
-			if (Character.isDigit(s.charAt(k))) {
+			if (isDigit(s.charAt(k))) {
 				i = i * 10 + (s.charAt(k) - '0');
 			} else {
 				break;
@@ -264,6 +323,25 @@ public class Algorithms {
 			
 	}
 	
+	public static StringBuilder readFromInputStream(InputStream i) throws IOException {
+		StringBuilder responseBody = new StringBuilder();
+		responseBody.setLength(0);
+		if (i != null) {
+			BufferedReader in = new BufferedReader(new InputStreamReader(i, "UTF-8"), 256); //$NON-NLS-1$
+			String s;
+			boolean f = true;
+			while ((s = in.readLine()) != null) {
+				if (!f) {
+					responseBody.append("\n"); //$NON-NLS-1$
+				} else {
+					f = false;
+				}
+				responseBody.append(s);
+			}
+		}
+		return responseBody;
+	}
+	
 	public static boolean removeAllFiles(File f) {
 		if (f == null) {
 			return false;

OsmAnd/AndroidManifest.xml

@@ -5,7 +5,7 @@
 	android:versionCode="211"
 	package="net.osmand.plus">
 
-	<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="21" />
+	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
 
 
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

OsmAnd/build.gradle

@@ -8,7 +8,6 @@ apply plugin: 'com.android.application'
 // APP_EDITION - date stamp of builds
 // APP_FEATURES - features +play_market +gps_status -parking_plugin -blackberry -free_version -amazon
 
-
 // 1. To be done Filter fonts
 // <unzip src="OsmAndCore_android.aar" dest=".">
 //            <patternset>
@@ -39,7 +38,7 @@ android {
 	}
 
 	defaultConfig {
-		minSdkVersion 9
+		minSdkVersion 14
 		targetSdkVersion 21
 
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
@@ -209,13 +208,13 @@ task collectRoutingResources(type: Sync) {
 }
 
 task collectMiscResources(type: Copy) {
-	into "src/net/osmand/osm"
-	from("../../resources/obf_creation") {
-		include "rendering_types.xml"
-	}
-	from("../../resources/poi") {
-		include "poi_types.xml"
-	}
+    into "src/net/osmand/osm"
+    from("../../resources/obf_creation") {
+        include "rendering_types.xml"
+    }
+    from("../../resources/poi") {
+        include "poi_types.xml"
+    }
 }
 
 task collectRenderingStylesResources(type: Sync) {
@@ -303,6 +302,7 @@ dependencies {
 	compile project(path: ":OsmAnd-java", configuration: "android")
 	compile project(":eclipse-compile:design")
 	compile project(":cardview")
+	compile project(":recyclerview")
 	compile fileTree(
 			dir: "libs",
 			include: ["*.jar"],

OsmAnd/res/layout/dash_rate_us_fragment.xml

@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/DashboardSubHeader"
-        android:text="@string/we_really_care"
+        android:text="@string/we_really_care_about_your_opinion"
         android:paddingBottom="@dimen/list_content_padding"/>
 
     <View

OsmAnd/res/layout/fragment_edit_poi.xml

@@ -0,0 +1,91 @@
+<android.support.design.widget.CoordinatorLayout
+    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"
+    tools:context="net.osmand.plus.osmedit.EditPoiFragment">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/OsmandLightTheme.DarkActionbar">
+
+        <!-- TODO change theme -->
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="fill_parent"
+            android:layout_height="@dimen/dashboard_map_toolbar"
+            app:contentInsetLeft="72dp"
+            app:contentInsetStart="72dp"
+            app:layout_scrollFlags="scroll"/>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            app:layout_scrollFlags="scroll">
+
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="72dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginTop="16dp">
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Name"
+                    android:text="@string/lorem_ipsum"/>
+
+            </android.support.design.widget.TextInputLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="72dp"
+            app:layout_scrollFlags="scroll">
+
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_weight="1">
+
+                <EditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:drawableRight="@drawable/ic_action_arrow_drop_down"
+                    android:hint="POI Type"
+                    android:text="@string/lorem_ipsum"/>
+
+            </android.support.design.widget.TextInputLayout>
+
+            <ImageButton
+                android:id="@+id/onlineDocumentationButton"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="bottom"
+                android:background="@null"
+                android:src="@drawable/ic_action_help"/>
+        </LinearLayout>
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/color_white"
+            app:tabIndicatorColor="@color/osmand_orange"
+            app:tabSelectedTextColor="@color/osmand_orange"
+            app:tabTextColor="@android:color/darker_gray"/>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+</android.support.design.widget.CoordinatorLayout>

OsmAnd/res/layout/fragment_edit_poi_advanced.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dashboard_background">
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/editTagsList"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:saveEnabled="false"/>
+
+        <include layout="@layout/poi_tag_list_item"/>
+
+        <Button
+            android:id="@+id/addTagButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Add tag"/>
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Added tags"/>
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/added_tags_recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+    </LinearLayout>
+</android.support.v4.widget.NestedScrollView>

OsmAnd/res/layout/fragment_edit_poi_normal.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.NestedScrollView
+    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:background="@color/dashboard_background">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/openHoursTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:text="Open hours"
+            android:textColor="@color/color_black"/>
+
+        <TextView
+            android:id="@+id/contactInfoTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/openHoursTextView"
+            android:layout_marginLeft="16dp"
+            android:text="Contact info"
+            android:textColor="@color/color_black"/>
+
+        <ImageView
+            android:id="@+id/streetImageView"
+            style="@style/edit_poi_imageview_style"
+            android:layout_below="@id/contactInfoTextView"
+            tools:src="@drawable/ic_action_street_name"/>
+
+        <EditText
+            android:id="@+id/streetEditText"
+            style="@style/create_poi_text_field"
+            android:layout_below="@id/contactInfoTextView"
+            android:hint="Street"
+            android:inputType="text"/>
+
+        <ImageView
+            android:id="@+id/houseNumberImageView"
+            style="@style/edit_poi_imageview_style"
+            android:layout_below="@id/streetEditText"
+            tools:src="@drawable/ic_action_building_number"/>
+
+        <EditText
+            android:id="@+id/houseNumberEditText"
+            style="@style/create_poi_text_field"
+            android:layout_below="@id/streetEditText"
+            android:hint="35"
+            android:inputType="text"/>
+
+        <ImageView
+            android:id="@+id/phoneImageView"
+            style="@style/edit_poi_imageview_style"
+            android:layout_below="@id/houseNumberEditText"
+            tools:src="@drawable/ic_action_call_dark"/>
+
+        <EditText
+            android:id="@+id/phoneEditText"
+            style="@style/create_poi_text_field"
+            android:layout_below="@id/houseNumberEditText"
+            android:hint="Phone"
+            android:inputType="phone"/>
+
+        <ImageView
+            android:id="@+id/webSiteImageView"
+            style="@style/edit_poi_imageview_style"
+            android:layout_below="@id/phoneEditText"
+            tools:src="@drawable/ic_world_globe_dark"/>
+
+        <EditText
+            android:id="@+id/webSiteEditText"
+            style="@style/create_poi_text_field"
+            android:layout_below="@id/phoneEditText"
+            android:hint="Web site"
+            android:inputType="textUri"/>
+
+        <ImageView
+            android:id="@+id/descriptionImageView"
+            style="@style/edit_poi_imageview_style"
+            android:layout_below="@id/webSiteEditText"
+            tools:src="@drawable/ic_action_description"/>
+
+        <EditText
+            android:id="@+id/descriptionEditText"
+            style="@style/create_poi_text_field"
+            android:layout_width="match_parent"
+            android:layout_below="@id/webSiteEditText"
+            android:hint="Description"
+            android:inputType="textMultiLine"/>
+
+        <View
+            android:id="@+id/buttonDivider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/descriptionEditText"
+            android:background="@color/divider_color"/>
+
+        <Button
+            android:id="@+id/saveButton"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/buttonDivider"
+            tools:text="Save"
+            android:textColor="@color/dashboard_general_button_text_light"/>
+
+        <Button
+            android:id="@+id/cancelButton"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/buttonDivider"
+            android:layout_toLeftOf="@id/saveButton"
+            android:text="Cancel"
+            android:textColor="@color/dashboard_general_button_text_light"/>
+
+    </RelativeLayout>
+</android.support.v4.widget.NestedScrollView>

OsmAnd/res/layout/main.xml

@@ -46,6 +46,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         layout="@layout/dashboard_over_map" />
+
     <FrameLayout
         android:id="@+id/fragmentContainer"
         android:layout_width="match_parent"

OsmAnd/res/layout/poi_tag_list_item.xml

@@ -0,0 +1,56 @@
+<?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:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <EditText
+                android:id="@+id/tagEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Tag"/>
+
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <EditText
+                android:id="@+id/valueEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Value"/>
+
+        </android.support.design.widget.TextInputLayout>
+
+        <ImageButton
+            android:id="@+id/deleteItemImageButton"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_gravity="bottom"
+            android:src="@drawable/ic_action_close_dark"/>
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/buttonDivider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_below="@id/descriptionEditText"
+        android:background="@color/divider_color"/>
+</LinearLayout>

OsmAnd/res/values-ar/strings.xml

@@ -1962,4 +1962,5 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="use_high_res_maps_descr">عدم تمدد (وطمس) تجانبيات/مربعات الخريطة على شاشات العرض عالية الكثافة</string>
 	<string name="max_level_download_tile_descr">اختر مستوى التقريب الأقصى لتحميل تجانبيات/مربعات الخريطة من الإنترنت</string>
 	<string name="map_tile_source_descr">اختر مصدر تجانبيات/مربعات الخريطة على الإنترنت أو المخزنة مؤقتاً</string>
-	</resources>
+	<string name="user_hates_app_get_feedback_long">فضلًا أخبرنا ما الذي تريد تغييره في هذا التّطبيق.</string>
+</resources>

OsmAnd/res/values-be/phrases.xml

@@ -915,7 +915,7 @@
 	<string name="poi_enforcement_check">Патрабаванне:кантроль</string>
 	<string name="poi_enforcement_access">Патрабаванне:доступ</string>
 	<string name="poi_enforcement_traffic_signals">Патрабаванне:святлафоры</string>
-	<string name="poi_fee">Аплата</string>
+	<string name="poi_fee_yes">Аплата</string>
 
 	<string name="poi_disused">Невыкарыстоўваемы</string>
 
@@ -923,4 +923,133 @@
 	<string name="poi_maxweight">Максімальная вага</string>
 	<string name="poi_maxheight">Максімальная вышыня</string>
 	<string name="poi_service_times">Гадзіны абслугоўвання</string>
+	<string name="poi_abandoned_poi">Закінуты аб\'ект</string>
+	<string name="poi_icn_ref">Сетка вузлоў міжнародных веламаршрутаў</string>
+	<string name="poi_ncn_ref">Сетка вузлоў нацыянальных веламаршрутаў</string>
+	<string name="poi_rcn_ref">Сетка вузлоў рэгіянальных веламаршрутаў</string>
+	<string name="poi_lcn_ref">Сетка вузлоў лякальных веламаршрутаў</string>
+	<string name="poi_iwn_ref">Сетка вузлоў міжнародных пешых маршрутаў</string>
+	<string name="poi_nwn_ref">Сетка вузлоў нацыянальных пешых маршрутаў</string>
+	<string name="poi_rwn_ref">Сетка вузлоў рэгіянальных пешых маршрутаў</string>
+	<string name="poi_lwn_ref">Сетка вузлоў лякальных пешых маршрутаў</string>
+
+	<string name="poi_route_hiking_iwn_poi">Міжнародны пешы маршрут</string>
+	<string name="poi_route_hiking_nwn_poi">Нацыянальны пешы маршрут</string>
+	<string name="poi_route_hiking_rwn_poi">Рэгіянальны пешы маршрут</string>
+	<string name="poi_route_hiking_lwn_poi">Лякальны пешы маршрут</string>
+	<string name="poi_conservation">Абароненая вобласьць</string>
+
+	<string name="poi_node_networks">Вузлы пешаходнай ці рованай сеткі</string>
+		<string name="poi_hiking_routes">Пешыя маршруты</string>
+		<string name="poi_traffic_enforcement">Кантроль руху</string>
+	<string name="poi_collection_times">Гадзіны выманьня</string>
+	<string name="poi_route_hiking_ref_poi">Абазначэньне пешага маршруту</string>
+
+	<string name="poi_access_private">Прыватны доступ</string>
+	<string name="poi_access_no">Няма доступу</string>
+	<string name="poi_access_permissive">Доступ з дазволу</string>
+	<string name="poi_access_customers">Доступ спажыўцам</string>
+	<string name="poi_access_delivery">Доступ для дастаўкі</string>
+	<string name="poi_access_agricultural">Сельгасп. доступ</string>
+
+	<string name="poi_access_destination">Транзіт забаронены</string>
+	<string name="poi_capital">Сталіца</string>
+	<string name="poi_fee_no">Бясплатна</string>
+
+	<string name="poi_monitoring_station">Станцыя назіраньня</string>
+	<string name="poi_email">Эл. пошта</string>
+	<string name="poi_fax">Факс</string>
+	<string name="poi_facebook">Фэйсбук</string>
+	<string name="poi_mobile">Сотавы тэлефон</string>
+	<string name="poi_animal_shelter_dog">Прытулак для сабак</string>
+	<string name="poi_animal_shelter_cat">Прытулак для катоў</string>
+	<string name="poi_animal_shelter_dog_cat">Прытулак для сабак і катоў</string>
+	<string name="poi_animal_shelter_bird">Прытулак для птушак</string>
+
+<string name="poi_shower">Душ</string>
+	<string name="poi_recycling_centre">Пункт прыёму</string>
+	<string name="poi_recycling_container">Кантэйнэр</string>
+	<string name="poi_recycling_glass">Шкло</string>
+	<string name="poi_recycling_paper">Папера</string>
+	<string name="poi_recycling_clothes">Вопратка</string>
+	<string name="poi_recycling_cans">Бляшанкі</string>
+	<string name="poi_recycling_glass_bottles">Шкляныя бутэлькі</string>
+	<string name="poi_recycling_plastic">Плястык</string>
+	<string name="poi_recycling_scrap_metal">Мэталалом</string>
+	<string name="poi_recycling_batteries">Батарэйкі</string>
+	<string name="poi_recycling_plastic_bottles">Плястыкавыя бутэлькі</string>
+	<string name="poi_recycling_green_waste">Расьліннае сьмецьце</string>
+	<string name="poi_recycling_waste">Сьмецьце (чорныя мяхі)</string>
+	<string name="poi_recycling_plastic_packaging">Плястыкавая тара</string>
+	<string name="poi_recycling_newspaper">Газэты</string>
+	<string name="poi_recycling_magazines">Часопісы</string>
+	<string name="poi_recycling_books">Кнігі</string>
+	<string name="poi_recycling_shoes">Абутак</string>
+	<string name="poi_seasonal_winter">Зіма</string>
+
+	<string name="poi_seasonal_autumn">Восень</string>
+	<string name="poi_seasonal_summer">Лета</string>
+	<string name="poi_seasonal_spring">Вясна</string>
+	<string name="poi_recycling_cartons">Картон для харчовых пакункаў</string>
+	<string name="poi_recycling_cardboard">Пакавальны картон</string>
+	<string name="poi_recycling_paper_packaging">Пакавальная папера</string>
+	<string name="poi_recycling_small_appliances">Кухонная бытавая тэхніка</string>
+	<string name="poi_recycling_wood">Драўніна</string>
+	<string name="poi_recycling_aluminium">Алюміній</string>
+	<string name="poi_recycling_organic">Арганічныя харчовыя адходы</string>
+	<string name="poi_recycling_beverage_cartons">Скрынкі з-пад гародніны</string>
+	<string name="poi_recycling_garden_waste">Садовае сьмецьце</string>
+	<string name="poi_recycling_low_energy_bulbs">Энэргазьберагальныя лямпы</string>
+	<string name="poi_recycling_fluorescent_tubes">Люмінесцэнтныя лямпы</string>
+	<string name="poi_recycling_metal">Мэталь</string>
+	<string name="poi_recycling_electrical_items">Буйная бытавая тэхніка</string>
+	<string name="poi_recycling_white_goods">Бытавая тэхніка</string>
+	<string name="poi_recycling_cooking_oil">Алей для смажаньня</string>
+	<string name="poi_recycling_engine_oil">Аліва</string>
+	<string name="poi_recycling_plastic_bags">Плястыкавыя мяхі</string>
+	<string name="poi_recycling_hazardous_waste">Небясьпечныя адходы</string>
+	<string name="poi_recycling_mobile_phones">Мабільныя тэлефоны</string>
+	<string name="poi_recycling_hydrargyrum">Ртуць</string>
+	<string name="poi_recycling_computers">Кампутары</string>
+	<string name="poi_recycling_tyres">Шыны</string>
+	<string name="poi_recycling_tv_monitor">Тэлевізары, маніторы</string>
+	<string name="poi_recycling_tetrapak">Упакоўка TetraPak</string>
+	<string name="poi_recycling_rubble">Цэгла ці будаўнічы камень</string>
+	<string name="poi_recycling_cds">Кампакт-дыскі</string>
+	<string name="poi_recycling_bottles">Бутэлькі</string>
+	<string name="poi_recycling_cork">Вінныя коркі</string>
+	<string name="poi_recycling_printer_cartridges">Картрыджы для друкарак</string>
+	<string name="poi_recycling_sheet_metal">Бляшаныя вырабы</string>
+	<string name="poi_recycling_foil">Фальга</string>
+	<string name="poi_recycling_paint">Фарба</string>
+	<string name="poi_recycling_styrofoam">Пенапляст</string>
+	<string name="poi_recycling_drugs">Лекі</string>
+	<string name="poi_recycling_compost">Кампост</string>
+	<string name="poi_recycling_hardcore">Будаўнічае сьмецьце</string>
+	<string name="poi_recycling_christmas_trees">Навагоднія елкі</string>
+	<string name="poi_recycling_light_bulbs">Лямпачкі</string>
+	<string name="poi_recycling_chipboard">ДСП</string>
+	<string name="poi_recycling_polyester">Поліэстэр</string>
+	<string name="poi_recycling_plasterboard">Гіпсакартон</string>
+	<string name="poi_recycling_animal_waste">Гной</string>
+	<string name="poi_recycling_fridge_and_freezer">Халадзільнікі і маразільнікі</string>
+	<string name="poi_recycling_furniture">Мэбля</string>
+	<string name="poi_recycling_diapers">Падгузнікі</string>
+	<string name="poi_recycling_car_batteries">Аўтамабільныя акумулятары</string>
+	<string name="poi_recycling_cars">Аўтамабілі</string>
+	<string name="poi_recycling_bicycles">Ровары</string>
+
+	<string name="poi_drinking_water_yes">Пітная вада</string>
+	<string name="poi_drinking_water_no">Непрыдатная для піцьця вада</string>
+	<string name="poi_supervised_yes">Кантралюемы аб\'ект</string>
+	<string name="poi_supervised_no">Некантралюемы аб\'ект</string>
+	<string name="poi_seasonal_yes">Сэзонны аб\'ект</string>
+	<string name="poi_seasonal_no">Не залежыць ад сэзону</string>
+	<string name="poi_seasonal_dry_season">Сухі сэзон</string>
+	<string name="poi_seasonal_wet_season">Сэзон дажджоў</string>
+	<string name="poi_crossing_traffic_signals">Са сьвятлафорам</string>
+	<string name="poi_crossing_uncontrolled">Нерэгулюемы</string>
+	<string name="poi_crossing_unmarked">Неразьмечаны</string>
+
+	<string name="poi_recycling_waste_oil">Адпрацаваная алiва</string>
 	</resources>

OsmAnd/res/values-be/strings.xml

@@ -815,7 +815,7 @@
 	<string name="level_to_switch_vector_raster_descr">Мінімальнае павелічэньне для выкарыстаньня вектарных мапаў</string>
 	<string name="level_to_switch_vector_raster">Мінімальнае павелічэньне вектарных мапаў</string>
 	<string name="tip_location_sharing">Падзяліцца месцазнаходжаньнем</string>
-	<string name="tip_location_sharing_t">"Вы можаце падзяліцца размяшчэньнем цікавых месцаў з вашага падарожжа з сям\'ёй або сябрамі. Каб падзяліцца месцам: скарыстайцеся пунктам у кантэкстным мэню мапы \'Падзяліцца месцам\'. ↵
+	<string name="tip_location_sharing_t">"Вы можаце падзяліцца разьмяшчэньнем цікавых месцаў з вашага падарожжа з сям\'ёй або сябрамі. Каб падзяліцца месцам: скарыстайцеся пунктам у кантэкстным мэню мапы \'Падзяліцца месцам\'. ↵
 \n\nПотым абярыце спосаб распаўсюду. Гэта можа быць: E-Mail, SMS (тэкст), ці нават капіяваньне каардынат у буфер абмену. ↵ "</string>
 	<string name="tip_favorites">Упадабаныя месцы</string>
 	<string name="error_doing_search">Памылка пры аўтаномным пошуку</string>
@@ -828,7 +828,7 @@
 	<string name="tip_map_switch">Абраць крыніцу мапы</string>
 	<string name="tip_app_mode">Профіль</string>
 	<string name="tip_app_mode_t_v2">"OsmAnd падтрымлівае розныя профілі для розных рэжымаў. ↵
-\n\nВы можаце змяніць бягучы профіль, націснуўшы кнопку выбару профіляў ў ніжнім левым куце экрана мапы (абразок аўтамабіля, ровара або пешахода) або пры пабудове маршруту (\'рэжым перамяшчэньня\'). ↵ "</string>
+\n\nВы можаце зьмяніць бягучы профіль, націснуўшы кнопку выбару профіляў ў ніжнім левым куце экрана мапы (абразок аўтамабіля, ровара або пешахода) або пры пабудове маршруту (\'рэжым перамяшчэньня\'). ↵ "</string>
 	<string name="tip_search">Пошук</string>
 	<string name="tip_map_context_menu">Кантэкстнае мэню мапы</string>
 	<string name="tip_map_context_menu_t">"\'Кантэкстнае мэню\' мапы зьмяшчае ўсе магчымыя дзеяньні, якія адносяцца да абранай кропкі (месца). ↵
@@ -1918,7 +1918,7 @@
 	<string name="shared_string_currently_recording_track">Бягучы сьлед, які запісваецца</string>
 	<string name="plugin_touringview_name">Турыстычная мапа</string>
 	<string name="rename_failed">Не атрымалася перайменаваць.</string>
-	<string name="days_behind">дз. таму</string>
+	<string name="days_behind">д. таму абнаўлялі</string>
 	<string name="shared_string_release">Выдана</string>
 	<string name="shared_string_my_favorites">Мае ўлюбёныя</string>
 	<string name="confirmation_to_clear_history">Вы хочаце вычысьціць гісторыю?</string>
@@ -2042,4 +2042,20 @@
     <string name="rendering_value_translucent_purple_name">Празрысты фіялетавы</string>
     <string name="rendering_value_default13_name">Па змоўчаньні (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Па змоўчаньні (празрысты сіні)</string>
+    <string name="do_you_like_osmand">Вам падабаецца OsmAnd?</string>
+	<string name="we_really_care">Нам сапраўды важна</string>
+	<string name="rate_this_app">Ацаніце гэту праграму</string>
+	<string name="rate_this_app_long">Калі ласка, дайце ацэнку OsmAnd на Google Play</string>
+	<string name="user_hates_app_get_feedback">Скажыце нам чаму.</string>
+	<string name="user_hates_app_get_feedback_long">Калі ласка, раскажыце нам, што вы хацелі б зьмяніць у гэтай праграме.</string>
+<string name="download_live_updates">Бягучыя абнаўленьні</string>
+	<string name="failed_to_upload">Не ўдалося адаслаць</string>
+	<string name="delete_change">Выдаліць зьмены</string>
+	<string name="successfully_uploaded_pattern">{0}/{1} пасьпяхова адасланыя</string>
+	<string name="try_again">Паўтарыце спробу</string>
+	<string name="error_message_pattern">Памылка: {0}</string>
+<string name="no_updates_available">Няма даступных абнаўленьняў</string>
+    <string name="we_really_care_about_your_opinion">Нас вельмі цікавіць ваша меркаваньне і нам важна пачуць вас.</string>
+	<string name="rendering_value_boldOutline_name">Тлусты абрыс</string>
+    <string name="traffic_warning_hazard">Небясьпека</string>
     </resources>

OsmAnd/res/values-ca/phrases.xml

@@ -550,10 +550,10 @@
 	<string name="poi_club_hunting">Club de caça</string>
 	<string name="poi_club_shooting">Tir</string>
 	<string name="poi_piste">Pista</string>
-	<string name="poi_piste_nordic">Nòrdic</string>
-	<string name="poi_piste_hike">Senderisme</string>
-	<string name="poi_piste_sleigh">Trineu</string>
-	<string name="poi_piste_sled">Trineu</string>
+	<string name="poi_piste_nordic">Pista d\'esquí nòrdic</string>
+	<string name="poi_piste_hike">Pista de senderisme</string>
+	<string name="poi_piste_sleigh">Pista de trineu</string>
+	<string name="poi_piste_sled">Pista de trineu</string>
 	<string name="poi_library">Biblioteca</string>
 	<string name="poi_cinema">Cinema</string>
 	<string name="poi_waterway_turning_point">Punt de canvi de sentit naval</string>
@@ -592,7 +592,7 @@
 	<string name="poi_guest_house">Casa d\'hostes</string>
 	<string name="poi_cabin">Cabana</string>
 	<string name="poi_piste_snow_park">Pista de neu per infants</string>
-	<string name="poi_piste_playground">Pista de joc</string>
+	<string name="poi_piste_playground">Pista infantil</string>
 	<string name="poi_arts_centre">Centre artístic</string>
 	<string name="poi_casino">Casino</string>
 	<string name="poi_community_centre">Centre comunitari</string>
@@ -720,8 +720,8 @@
 	<string name="poi_club_tourism">Associació de viatgers</string>
 	<string name="poi_club_charity">Agrupació benèfica</string>
 
-	<string name="poi_piste_downhill">Esquí alpí</string>
-	<string name="poi_piste_skitour">Esquí alpí i nòrdic</string>
+	<string name="poi_piste_downhill">Pista d\'esquí alpí</string>
+	<string name="poi_piste_skitour">Pista d\'esquí alpí i nòrdic</string>
 	<string name="poi_craft_metal_construction">Distribució i manipulació de metalls</string>
 	<string name="poi_craft_rigger">Tramoista</string>
 	<string name="poi_craft_roofer">Muntatge de teulades</string>
@@ -928,7 +928,107 @@
 	<string name="poi_basin">Bassa</string>
 	<string name="poi_bump_gate">Porta batent de tancament controlat</string>
 	<string name="poi_country">País</string>
-	<string name="poi_fee">Pagament</string>
+	<string name="poi_fee_yes">Pagament</string>
 
 	<string name="poi_abandoned_poi">Objectes perduts</string>
+	<string name="poi_node_networks">Xarxa de nodes de senderisme/ciclisme</string>
+		<string name="poi_hiking_routes">Rutes de senderisme</string>
+		<string name="poi_traffic_enforcement">Control de tràfic</string>
+	<string name="poi_route_hiking_iwn_poi">Ruta internacional de senderisme</string>
+	<string name="poi_route_hiking_nwn_poi">Ruta nacional de senderisme</string>
+	<string name="poi_route_hiking_rwn_poi">Ruta senderista regional</string>
+	<string name="poi_route_hiking_lwn_poi">Ruta senderista local</string>
+	<string name="poi_route_hiking_ref_poi">Referència de ruta senderista</string>
+
+	<string name="poi_access_private">Accés privat</string>
+	<string name="poi_access_no">Sense accés</string>
+	<string name="poi_access_destination">Accés a la destinació</string>
+	<string name="poi_access_permissive">Accés tolerat</string>
+	<string name="poi_access_customers">Accés de clients</string>
+	<string name="poi_access_delivery">Accés per lliuraments</string>
+	<string name="poi_access_agricultural">Accés per activitats agrícoles</string>
+
+	<string name="poi_monitoring_station">Centre de control</string>
+	<string name="poi_capital">Capital</string>
+	<string name="poi_fee_no">Sense cap cost</string>
+
+	<string name="poi_email">e-mail</string>
+	<string name="poi_fax">Fax</string>
+	<string name="poi_facebook">Facebook</string>
+	<string name="poi_mobile">Mòbil</string>
+	<string name="poi_animal_shelter_dog">Refugi per gossos</string>
+	<string name="poi_animal_shelter_cat">Refugi per gats</string>
+	<string name="poi_animal_shelter_dog_cat">Refugi per gossos i gats</string>
+	<string name="poi_animal_shelter_bird">Refugi per ocells</string>
+
+<string name="poi_recycling_centre">Deixalleria</string>
+	<string name="poi_recycling_container">Contenidor</string>
+	<string name="poi_recycling_glass">Vidre</string>
+	<string name="poi_recycling_paper">Paper</string>
+	<string name="poi_recycling_clothes">Roba</string>
+	<string name="poi_recycling_cans">Llaunes</string>
+	<string name="poi_recycling_glass_bottles">Ampolles de vidre</string>
+	<string name="poi_recycling_plastic">Plàstic</string>
+	<string name="poi_recycling_scrap_metal">Ferralla</string>
+	<string name="poi_recycling_batteries">Piles</string>
+	<string name="poi_recycling_plastic_bottles">Ampolles de plàstic</string>
+	<string name="poi_recycling_green_waste">Biodegradables nitrogenats</string>
+	<string name="poi_recycling_plastic_packaging">Envasos de plàstic</string>
+	<string name="poi_recycling_newspaper">Diaris</string>
+	<string name="poi_recycling_cartons">Cartró</string>
+	<string name="poi_recycling_magazines">Revistes</string>
+	<string name="poi_recycling_small_appliances">Petits electrodomèstics</string>
+	<string name="poi_recycling_wood">Fusta</string>
+	<string name="poi_recycling_books">Llibres</string>
+	<string name="poi_recycling_shoes">Sabates</string>
+	<string name="poi_recycling_aluminium">Alumini</string>
+	<string name="poi_recycling_organic">Orgànica</string>
+	<string name="poi_recycling_garden_waste">Residus de jardí</string>
+	<string name="poi_recycling_low_energy_bulbs">Bombetes de baix consum</string>
+	<string name="poi_recycling_fluorescent_tubes">Fluorescents</string>
+	<string name="poi_recycling_metal">Metall</string>
+	<string name="poi_recycling_electrical_items">Elements elèctrics</string>
+	<string name="poi_recycling_white_goods">Línia blanca</string>
+	<string name="poi_recycling_cooking_oil">Oli de cuina</string>
+	<string name="poi_recycling_engine_oil">Oli de motor</string>
+	<string name="poi_recycling_plastic_bags">Bosses de plàstic</string>
+	<string name="poi_recycling_hazardous_waste">Residus perillosos</string>
+	<string name="poi_recycling_mobile_phones">Telèfons mòbils</string>
+	<string name="poi_recycling_computers">Ordinadors</string>
+	<string name="poi_recycling_tyres">Pneumàtics</string>
+	<string name="poi_recycling_tv_monitor">TV, monitors</string>
+	<string name="poi_recycling_rubble">Runes</string>
+	<string name="poi_recycling_cds">CDs</string>
+	<string name="poi_recycling_waste_oil">Oli residual</string>
+	<string name="poi_recycling_bottles">Ampolles</string>
+	<string name="poi_recycling_cork">Suro</string>
+	<string name="poi_recycling_printer_cartridges">Cartutxos d\'impressora</string>
+	<string name="poi_recycling_paint">Pintura</string>
+	<string name="poi_recycling_drugs">Fàrmacs</string>
+	<string name="poi_recycling_compost">Abonament</string>
+	<string name="poi_recycling_christmas_trees">Arbres de nadal</string>
+	<string name="poi_recycling_light_bulbs">Bombetes</string>
+	<string name="poi_recycling_polyester">Polièster</string>
+	<string name="poi_recycling_animal_waste">Residus animals</string>
+	<string name="poi_recycling_fridge_and_freezer">Neveres i congeladors</string>
+	<string name="poi_recycling_furniture">Mobles</string>
+	<string name="poi_recycling_car_batteries">Bateries de cotxe</string>
+	<string name="poi_recycling_cars">Cotxes</string>
+	<string name="poi_recycling_bicycles">Bicicletes</string>
+
+	<string name="poi_shower">Dutxa</string>
+	<string name="poi_drinking_water_yes">Aigua potable</string>
+	<string name="poi_drinking_water_no">Aigua no potable</string>
+	<string name="poi_seasonal_yes">De temporada</string>
+	<string name="poi_seasonal_no">Tot l\'any</string>
+	<string name="poi_seasonal_dry_season">Estació seca</string>
+	<string name="poi_seasonal_wet_season">Estació humida</string>
+	<string name="poi_seasonal_spring">Primavera</string>
+	<string name="poi_seasonal_summer">Estiu</string>
+	<string name="poi_seasonal_autumn">Tardor</string>
+	<string name="poi_seasonal_winter">Hivern</string>
+
+	<string name="poi_recycling_waste">Rebuig (bosses de negres)</string>
+	<string name="poi_recycling_paper_packaging">Embalatge de paper</string>
+	<string name="poi_recycling_tetrapak">Tetra Pak</string>
 	</resources>

OsmAnd/res/values-ca/strings.xml

@@ -726,10 +726,10 @@
 <string name="auto_zoom_map_descr">Zoom automàtic del mapa en funció de la velocitat (mentre el mapa està sincronitzat amb la posició actual)</string>
 <string name="auto_zoom_map">Zoom automàtic del mapa</string>
 <string name="tip_recent_changes_0_8_3_t">"Canvis a la versió 0.8.3:
+\n\t* Fites
 \n\t* Millora en el guiatge de rutes
 \n\t* Opció per evitar autopistes
 \n\t* Permet mostrar Cycleway=track
-\n\t* Millora en l\'acabat de les IU (icones)
 \n\t* S\'han corregit alguns errors de programació "</string>
 <string name="snap_to_road_descr">Ajusta la posició a les carreteres durant la navegació</string>
 <string name="snap_to_road">Desplaça a la carretera</string>
@@ -2073,4 +2073,20 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="restart_is_required">Per aplicar totalment els canvis, cal que reinicieu manualment l\'aplicació.</string>
     <string name="rendering_value_default13_name">Per defecte (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Per defecte (cian translúcid)</string>
+    <string name="do_you_like_osmand">Us agrada OsmAnd?</string>
+	<string name="we_really_care">Som molt receptius</string>
+	<string name="rate_this_app">Avalua aquesta aplicació</string>
+	<string name="rate_this_app_long">Us agrairíem que avaluéssiu OsmAnd en el Google Play</string>
+	<string name="user_hates_app_get_feedback">Digueu-nos el motiu.</string>
+	<string name="user_hates_app_get_feedback_long">Us agrairíem que ens diguéssiu que voldríeu canviar d\'aquesta aplicació.</string>
+<string name="download_live_updates">Actualitzacions al moment</string>
+	<string name="failed_to_upload">S\'ha produït un error en la pujada</string>
+	<string name="delete_change">Suprimeix les modificacions</string>
+	<string name="successfully_uploaded_pattern">S\'ha pujat amb èxit {0}/{1}</string>
+	<string name="try_again">Torneu a provar-ho</string>
+	<string name="error_message_pattern">Error: {0}</string>
+<string name="no_updates_available">No hi ha actualitzacions disponibles</string>
+    <string name="we_really_care_about_your_opinion">"Valorem molt la vostra opinió i és important per nosaltres  disposar dels vostres comentaris."</string>
+	<string name="rendering_value_boldOutline_name">Contorn destacat</string>
+    <string name="traffic_warning_hazard">Perill informat</string>
     </resources>

OsmAnd/res/values-cs/phrases.xml

@@ -628,12 +628,12 @@
 	<string name="poi_club_tourism">Turistický klub</string>
 	<string name="poi_club_charity">Charitativní klub</string>
 
-	<string name="poi_piste_downhill">Sjezd</string>
-	<string name="poi_piste_hike">Pěší</string>
-	<string name="poi_piste_sleigh">Koňské saně</string>
-	<string name="poi_piste_sled">Sáně</string>
+	<string name="poi_piste_downhill">Sjezdová trať</string>
+	<string name="poi_piste_hike">Výletní lyžařská trasa</string>
+	<string name="poi_piste_sleigh">Trať pro tažené saně</string>
+	<string name="poi_piste_sled">Trať pro saně</string>
 	<string name="poi_piste_snow_park">Zábavní sněhový park</string>
-	<string name="poi_piste_playground">Dětské hřiště</string>
+	<string name="poi_piste_playground">Lyžařská škola</string>
 	<string name="poi_piste_ice_skate">Kluziště</string>
 
 	<string name="poi_arts_centre">Umělecké středisko</string>
@@ -784,7 +784,7 @@
 	<string name="poi_ski_resort">Lyžařské středisko</string>
 	<string name="poi_trail_riding_station">Jezdecká stanice</string>
 
-	<string name="poi_piste_nordic">Klasické lyžování</string>
+	<string name="poi_piste_nordic">Trať pro klasické lyžování</string>
 	<string name="poi_hunting_lodge">Lovecká chata</string>
 
 	<string name="poi_hanami">Hanami</string>
@@ -921,6 +921,77 @@
 	<string name="poi_enforcement_access">Vynucení:přístup</string>
 	<string name="poi_enforcement_toll">Vynucení:mýto</string>
 
-<string name="poi_fee">Poplatek</string>
+<string name="poi_fee_yes">Poplatek</string>
 
+	<string name="poi_country">Krajina</string>
+	<string name="poi_abandoned_poi">Opuštěný objekt</string>
+	<string name="poi_recycling_centre">Centrum</string>
+	<string name="poi_recycling_container">Kontejner</string>
+	<string name="poi_recycling_glass">Sklo</string>
+	<string name="poi_recycling_paper">Papír</string>
+	<string name="poi_recycling_clothes">Oblečení</string>
+	<string name="poi_recycling_cans">Plechovky</string>
+	<string name="poi_recycling_glass_bottles">Skleněné láhve</string>
+	<string name="poi_recycling_plastic">Plasty</string>
+	<string name="poi_recycling_scrap_metal">Železný šrot</string>
+	<string name="poi_recycling_batteries">Baterie</string>
+	<string name="poi_recycling_plastic_bottles">Plastové láhve</string>
+	<string name="poi_recycling_green_waste">Zelený odpad</string>
+	<string name="poi_recycling_waste">Odpad (černé pytle)</string>
+	<string name="poi_recycling_plastic_packaging">Plastové obaly</string>
+	<string name="poi_recycling_newspaper">Noviny</string>
+	<string name="poi_recycling_cartons">Kartony</string>
+	<string name="poi_recycling_cardboard">Lepenka</string>
+	<string name="poi_recycling_magazines">Časopisy</string>
+	<string name="poi_recycling_paper_packaging">Papírové obaly</string>
+	<string name="poi_recycling_small_appliances">Malé spotřebiče</string>
+	<string name="poi_recycling_wood">Dřevo</string>
+	<string name="poi_recycling_books">Knihy</string>
+	<string name="poi_recycling_shoes">Boty</string>
+	<string name="poi_recycling_aluminium">Hliník</string>
+	<string name="poi_recycling_organic">Přírodní</string>
+	<string name="poi_recycling_beverage_cartons">Nápojové kartony</string>
+	<string name="poi_recycling_garden_waste">Zahradní odpad</string>
+	<string name="poi_recycling_low_energy_bulbs">Nízkoenergetické žárovky</string>
+	<string name="poi_recycling_fluorescent_tubes">Zářivky</string>
+	<string name="poi_recycling_metal">Železo</string>
+	<string name="poi_recycling_electrical_items">Elektrospotřebiče</string>
+	<string name="poi_recycling_white_goods">Bílé zboží</string>
+	<string name="poi_recycling_cooking_oil">Fritovací olej</string>
+	<string name="poi_recycling_engine_oil">Motorový olej</string>
+	<string name="poi_recycling_plastic_bags">Plastové pytle</string>
+	<string name="poi_recycling_hazardous_waste">Nebezpečný odpad</string>
+	<string name="poi_recycling_mobile_phones">Mobilní telefony</string>
+	<string name="poi_recycling_hydrargyrum">Rtuť</string>
+	<string name="poi_recycling_computers">Počítače</string>
+	<string name="poi_recycling_tyres">Pneumatiky</string>
+	<string name="poi_recycling_tv_monitor">Televize, monitory</string>
+	<string name="poi_recycling_tetrapak">Obaly TetraPak</string>
+	<string name="poi_recycling_rubble">Suť</string>
+	<string name="poi_recycling_cds">CD média</string>
+	<string name="poi_recycling_waste_oil">Odpadní olej</string>
+	<string name="poi_recycling_bottles">Láhve</string>
+	<string name="poi_recycling_cork">Korek</string>
+	<string name="poi_recycling_printer_cartridges">Náplně do tiskáren</string>
+	<string name="poi_recycling_sheet_metal">Plech</string>
+	<string name="poi_recycling_foil">Fólie</string>
+	<string name="poi_recycling_paint">Barva</string>
+	<string name="poi_recycling_styrofoam">Polystyrén</string>
+	<string name="poi_recycling_drugs">Léky</string>
+	<string name="poi_recycling_compost">Kompost</string>
+	<string name="poi_recycling_christmas_trees">Vánoční stromky</string>
+	<string name="poi_recycling_light_bulbs">Žárovky</string>
+	<string name="poi_recycling_chipboard">Dřevotříska</string>
+	<string name="poi_recycling_polyester">Polyester</string>
+	<string name="poi_recycling_plasterboard">Sádrokarton</string>
+	<string name="poi_recycling_animal_waste">Zvířecí odpad</string>
+	<string name="poi_recycling_fridge_and_freezer">Lednice a mrazák</string>
+	<string name="poi_recycling_furniture">Nábytek</string>
+	<string name="poi_recycling_diapers">Pleny</string>
+	<string name="poi_recycling_car_batteries">Autobaterie</string>
+	<string name="poi_recycling_cars">Vozy</string>
+	<string name="poi_recycling_bicycles">Kola</string>
+
+	<string name="poi_monitoring_station">Monitorovací stanice</string>
+	<string name="poi_capital">Hlavní město</string>
 	</resources>

OsmAnd/res/values-cs/strings.xml

@@ -1990,4 +1990,8 @@ s často kladenými otázkami.</string>
     <string name="gps_network_not_enabled">Služba zjištění polohy není zapnuta. Chcete ji aktivovat?</string>
     <string name="disable_recording_once_app_killed">Zabránit samotnému logování</string>
     <string name="disable_recording_once_app_killed_descrp">Pozastaví záznam trasy pokud je aplikace ukončena (přes nedávné aplikace). (OsmAnd indikátor zmizí z upozorňovacího řádku Androidu.)</string>
+    <string name="download_live_updates">Živé aktualizace</string>
+	<string name="no_updates_available">Nejsou dostupné žádné aktualizace</string>
+    <string name="traffic_warning_hazard">Nebezpečí</string>
+    <string name="rendering_value_boldOutline_name">Tučný obrys</string>
     </resources>

OsmAnd/res/values-da/phrases.xml

@@ -42,7 +42,7 @@
         <string name="poi_fishing">Fiskegrej</string>
         <string name="poi_florist">Blomsterhandler</string>
         <string name="poi_frame">Rammer</string>
-        <string name="poi_furniture">Møbeler</string>
+        <string name="poi_furniture">Møbelforretning</string>
         <string name="poi_garden_centre">Havecenter</string>
         <string name="poi_gas">Flaskegas</string>
         <string name="poi_general">Landhandel</string>
@@ -716,14 +716,14 @@
 	<string name="poi_silo">Silo</string>
 	<string name="poi_storage_tank">Lagertank</string>
 
-	<string name="poi_piste_downhill">Styrtløb</string>
-	<string name="poi_piste_nordic">Langrend</string>
-	<string name="poi_piste_skitour">Skitouring</string>
-	<string name="poi_piste_hike">Vandring</string>
-	<string name="poi_piste_sleigh">Kane</string>
-	<string name="poi_piste_sled">Slæde</string>
+	<string name="poi_piste_downhill">Styrtløbspiste</string>
+	<string name="poi_piste_nordic">Langrendpiste</string>
+	<string name="poi_piste_skitour">Skitouring piste</string>
+	<string name="poi_piste_hike">Vandrepiste</string>
+	<string name="poi_piste_sleigh">Kanepiste</string>
+	<string name="poi_piste_sled">Slædepiste</string>
 	<string name="poi_piste_snow_park">Snow park</string>
-	<string name="poi_piste_playground">Legeplads</string>
+	<string name="poi_piste_playground">Legepiste</string>
 	<string name="poi_piste_ice_skate">Isskøjte-piste</string>
 
 	<string name="poi_gasometer">Gasbeholder</string>
@@ -777,7 +777,7 @@
 	<string name="poi_wilderness_hut">Vildmarkshytte</string>
 
 	<string name="poi_payment_terminal">Betalingsterminal</string>
-	<string name="poi_piste">Skipiste</string>
+	<string name="poi_piste">Piste</string>
 	<string name="poi_observation_tower">Udsigtstårn</string>
 	<string name="poi_bell_tower">Klokketårn</string>
 	<string name="poi_ski_rental">Skiudlejning</string>
@@ -858,7 +858,7 @@
 	<string name="poi_general_barrier">Almindelig forhindring</string>
 	<string name="poi_stile">Stente</string>
 	<string name="poi_height_restrictor">Højdebegrænser</string>
-	<string name="poi_horse_stile">Hestestente</string>
+	<string name="poi_horse_stile">Stente for heste</string>
 	<string name="poi_kissing_gate">Kissing gate</string>
 	<string name="poi_sally_port">Fæstningssport</string>
 	<string name="poi_swing_gate">Svingport</string>
@@ -900,16 +900,16 @@
 
 	<string name="poi_power_cable_distribution_cabinet">Elskab</string>
 	<string name="poi_basin">Basin</string>
-	<string name="poi_conservation">Landbevaring</string>
+	<string name="poi_conservation">Beskyttet område</string>
 
 	<string name="poi_building_poi">Bygning</string>
 	<string name="poi_crane">Kran</string>
 	<string name="poi_cutline">Brandbælte</string>
 	<string name="poi_tree">Træ</string>
-	<string name="poi_icn_ref">International cykelrute</string>
-	<string name="poi_ncn_ref">National cykelrute</string>
-	<string name="poi_rcn_ref">Regional cykelrute</string>
-	<string name="poi_lcn_ref">Lokal cykelrute</string>
+	<string name="poi_icn_ref">International netværk af cykelruter</string>
+	<string name="poi_ncn_ref">National netværk af cykelruter</string>
+	<string name="poi_rcn_ref">Regional netværk af cykelruter</string>
+	<string name="poi_lcn_ref">Lokal netværk af cykelruter</string>
 
 	<string name="poi_abandoned">Forladt</string>
 	<string name="poi_disused">Nedlagt</string>
@@ -922,25 +922,141 @@
 	<string name="poi_phone">Telefon</string>
 	<string name="poi_description">Beskrivelse</string>
 	<string name="poi_opening_hours">Åbningstider</string>
-	<string name="poi_iwn_ref">International vandrerute</string>
-	<string name="poi_nwn_ref">National vandrerute</string>
-	<string name="poi_rwn_ref">Regional vandrerute</string>
-	<string name="poi_lwn_ref">Lokal vandrerute</string>
+	<string name="poi_iwn_ref">International netværk af vandreruter</string>
+	<string name="poi_nwn_ref">National netværk af vandreruter</string>
+	<string name="poi_rwn_ref">Regional netværk af vandreruter</string>
+	<string name="poi_lwn_ref">Lokal netværk af vandreruter</string>
 
-	<string name="poi_collection_times">Tømnings antal</string>
+	<string name="poi_collection_times">Tømningstider</string>
 	<string name="poi_service_times">Service-tider</string>
 	<string name="poi_brand">Varemærke</string>
 
-	<string name="poi_enforcement_traffic_signals">Håndhævelse: trafiksignaler</string>
-	<string name="poi_enforcement_maxspeed">Håndhævelse: max hastighed</string>
-	<string name="poi_enforcement_maxheight">Håndhævelse: max højde</string>
-	<string name="poi_enforcement_mindistance">Håndhævelse: min afstand</string>
-	<string name="poi_enforcement_check">Håndhævelse: kontrol</string>
-	<string name="poi_enforcement_access">Håndhævelse: adgang</string>
-	<string name="poi_enforcement_toll">Håndhævelse: vejafgift</string>
+	<string name="poi_enforcement_traffic_signals">Trafiksignaler</string>
+	<string name="poi_enforcement_maxspeed">Hastighedskontrol</string>
+	<string name="poi_enforcement_maxheight">Højdekontrol</string>
+	<string name="poi_enforcement_mindistance">Afstandskontrol</string>
+	<string name="poi_enforcement_check">Trafikontrol</string>
+	<string name="poi_enforcement_access">Adgangskontrol</string>
+	<string name="poi_enforcement_toll">Vejafgiftskontrol</string>
 
-<string name="poi_country">Land</string>
-	<string name="poi_fee">Gebyr</string>
+<string name="poi_country">Landlig</string>
+	<string name="poi_fee_yes">Gebyr</string>
 
 	<string name="poi_abandoned_poi">Forladt objekt</string>
+	<string name="poi_route_hiking_iwn_poi">International vandrerute</string>
+	<string name="poi_route_hiking_nwn_poi">National vandrerute</string>
+	<string name="poi_route_hiking_rwn_poi">Regional vandrerute</string>
+	<string name="poi_route_hiking_lwn_poi">Lokal vandrerute</string>
+	<string name="poi_route_hiking_ref_poi">Vandrerute reference</string>
+
+	<string name="poi_node_networks">Vandre-/cykelrutepunkter</string>
+		<string name="poi_hiking_routes">Vandreruter</string>
+		<string name="poi_traffic_enforcement">Trafikovervågning</string>
+	<string name="poi_access_private">Adgang privat</string>
+	<string name="poi_access_no">Ingen adgang</string>
+	<string name="poi_access_destination">Adgang destination</string>
+	<string name="poi_access_permissive">Adgang tolerant</string>
+	<string name="poi_access_customers">Adgang for kunde</string>
+	<string name="poi_access_delivery">Adgang for levering</string>
+	<string name="poi_access_agricultural">Adgang for landbrug</string>
+
+	<string name="poi_monitoring_station">Målestation</string>
+	<string name="poi_capital">Hovedstad</string>
+	<string name="poi_fee_no">Inget gebyr</string>
+
+	<string name="poi_email">E-mail</string>
+	<string name="poi_fax">Fax</string>
+	<string name="poi_facebook">Facebook</string>
+	<string name="poi_mobile">Mobiltelefon</string>
+	<string name="poi_animal_shelter_dog">Hundenternat</string>
+	<string name="poi_animal_shelter_cat">Katteinternat</string>
+	<string name="poi_animal_shelter_dog_cat">Hunde- og katteinternat</string>
+	<string name="poi_animal_shelter_bird">Fugleinternat</string>
+
+<string name="poi_shower">Bruser</string>
+	<string name="poi_recycling_centre">Centrum</string>
+	<string name="poi_recycling_container">Container</string>
+	<string name="poi_recycling_glass">Glas</string>
+	<string name="poi_recycling_paper">Papir</string>
+	<string name="poi_recycling_clothes">Tøj</string>
+	<string name="poi_recycling_cans">Dåser</string>
+	<string name="poi_recycling_glass_bottles">Glasflasker</string>
+	<string name="poi_recycling_plastic">Plast</string>
+	<string name="poi_recycling_scrap_metal">Skrotmetal</string>
+	<string name="poi_recycling_batteries">Batterier</string>
+	<string name="poi_recycling_plastic_bottles">Plastflasker</string>
+	<string name="poi_recycling_green_waste">Grønt affald</string>
+	<string name="poi_recycling_waste">Affald (sorte poser)</string>
+	<string name="poi_recycling_plastic_packaging">Plastemballage</string>
+	<string name="poi_recycling_newspaper">Aviser</string>
+	<string name="poi_recycling_cartons">Kartoner</string>
+	<string name="poi_recycling_cardboard">Pap</string>
+	<string name="poi_recycling_magazines">Tidsskrifter</string>
+	<string name="poi_recycling_paper_packaging">Papiremballage</string>
+	<string name="poi_recycling_small_appliances">Små husholdningsapparater</string>
+	<string name="poi_recycling_wood">Træ</string>
+	<string name="poi_recycling_books">Bøger</string>
+	<string name="poi_recycling_shoes">Sko</string>
+	<string name="poi_recycling_aluminium">Aluminium</string>
+	<string name="poi_recycling_organic">Organisk</string>
+	<string name="poi_recycling_beverage_cartons">Drikkekartoner</string>
+	<string name="poi_recycling_garden_waste">Haveaffald</string>
+	<string name="poi_recycling_low_energy_bulbs">Sparepærer</string>
+	<string name="poi_recycling_fluorescent_tubes">Lysstofrør</string>
+	<string name="poi_recycling_metal">Metal</string>
+	<string name="poi_recycling_electrical_items">Elektriske artikler</string>
+	<string name="poi_recycling_white_goods">Hårde hvidevarer</string>
+	<string name="poi_recycling_cooking_oil">Madolie</string>
+	<string name="poi_recycling_engine_oil">Motorolie</string>
+	<string name="poi_recycling_plastic_bags">Plastikposer</string>
+	<string name="poi_recycling_hazardous_waste">Farligt affald</string>
+	<string name="poi_recycling_mobile_phones">Mobiltelefoner</string>
+	<string name="poi_recycling_hydrargyrum">Kviksølv</string>
+	<string name="poi_recycling_computers">Computere</string>
+	<string name="poi_recycling_tyres">Dæk</string>
+	<string name="poi_recycling_tv_monitor">TV, skærme</string>
+	<string name="poi_recycling_tetrapak">Tetrapak</string>
+	<string name="poi_recycling_rubble">Murbrokker</string>
+	<string name="poi_recycling_cds">Cd\'er</string>
+	<string name="poi_recycling_waste_oil">Spildolie</string>
+	<string name="poi_recycling_bottles">Flasker</string>
+	<string name="poi_recycling_cork">Kork</string>
+	<string name="poi_recycling_printer_cartridges">Printerpatroner</string>
+	<string name="poi_recycling_sheet_metal">Metalplader</string>
+	<string name="poi_recycling_foil">Folie</string>
+	<string name="poi_recycling_paint">Maling</string>
+	<string name="poi_recycling_styrofoam">Flamingo</string>
+	<string name="poi_recycling_drugs">Stoffer</string>
+	<string name="poi_recycling_compost">Kompost</string>
+	<string name="poi_recycling_hardcore">Byggeaffald</string>
+	<string name="poi_recycling_christmas_trees">Juletræer</string>
+	<string name="poi_recycling_light_bulbs">Elpærer</string>
+	<string name="poi_recycling_chipboard">Spånplader</string>
+	<string name="poi_recycling_polyester">Polyester</string>
+	<string name="poi_recycling_plasterboard">Gipsplader</string>
+	<string name="poi_recycling_animal_waste">Animalsk affald</string>
+	<string name="poi_recycling_fridge_and_freezer">Køleskab og fryser</string>
+	<string name="poi_recycling_furniture">Møbler</string>
+	<string name="poi_recycling_diapers">Bleer</string>
+	<string name="poi_recycling_car_batteries">Bilbatterier</string>
+	<string name="poi_recycling_cars">Biler</string>
+	<string name="poi_recycling_bicycles">Cykler</string>
+
+	<string name="poi_drinking_water_yes">Drikkevand</string>
+	<string name="poi_drinking_water_no">Ikke drikkevand</string>
+	<string name="poi_supervised_yes">Overvåget</string>
+	<string name="poi_supervised_no">Ikke overvåget</string>
+	<string name="poi_seasonal_yes">Sæsonbestemt</string>
+	<string name="poi_seasonal_no">Ikke sæsonbestemt</string>
+	<string name="poi_seasonal_dry_season">Tørre årstid</string>
+	<string name="poi_seasonal_wet_season">Våde årstid</string>
+	<string name="poi_seasonal_spring">Forår</string>
+	<string name="poi_seasonal_summer">Sommer</string>
+	<string name="poi_seasonal_autumn">Efterår</string>
+	<string name="poi_seasonal_winter">Vinter</string>
+
+	<string name="poi_crossing_traffic_signals">Med trafiksignaler</string>
+	<string name="poi_crossing_uncontrolled">Ukontrolleret</string>
+	<string name="poi_crossing_unmarked">Ikke markeret</string>
+
 	</resources>

OsmAnd/res/values-da/strings.xml

@@ -340,7 +340,7 @@
 	<string name="modify_transparency">Ændre gennemsigtighed (0 - gennemsigtig, 255 - ugennemsigtig)</string>
 	<string name="confirm_interrupt_download">Afbryd hentning af fil?</string>
 	<string name="first_time_msg">Til mange af funktionerne i programmet skal der bruges nogle regionale offline data som kan hentes via \'Indstillinger\' → \'Administrer kortfiler\'. Bagefter kan man se kort, søge adresser, finde interessepunkter (IP) og finde kolllektivtrafik.</string>    
-	<string name="basemap_was_selected_to_download">Basiskort er nødvendige for korrekt programfunktion og blev automatisk valgt.</string>
+	<string name="basemap_was_selected_to_download">Basiskort er nødvendig for korrekt programfunktion og blev automatisk valgt.</string>
 	<string name="select_index_file_to_download">Fandt intet. Hvis man ikke kan finde sin region kan man lave den selv (se http://osmand.net).</string>
 	<string name="local_indexes_cat_tile">Onlinekort og kortfliser</string>
 	<string name="local_indexes_cat_map">Offlinekort (vektor)</string>
@@ -2087,4 +2087,20 @@
     <string name="rendering_value_translucent_purple_name">Gennemsigtig lilla</string>
     <string name="rendering_value_default13_name">Standard (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Standard (gennemsigtig cyan)</string>
+    <string name="do_you_like_osmand">Kan du lide OsmAnd?</string>
+	<string name="rate_this_app">Bedøm denne app</string>
+	<string name="rate_this_app_long">Vurder OsmAnd på Google Play</string>
+	<string name="user_hates_app_get_feedback">Fortæl os hvorfor.</string>
+	<string name="we_really_care">Dette er vigtigt for os</string>
+	<string name="user_hates_app_get_feedback_long">Fortæl os hvad du ønsker at ændre i denne app.</string>
+<string name="download_live_updates">Live-opdateringer</string>
+	<string name="delete_change">Slet ændring</string>
+	<string name="try_again">Prøv igen</string>
+	<string name="error_message_pattern">Fejl: {0}</string>
+<string name="failed_to_upload">Overførsel mislykkedes</string>
+	<string name="successfully_uploaded_pattern">Overført {0}/{1}</string>
+	<string name="no_updates_available">Ingen opdateringer tilgængelige</string>
+    <string name="we_really_care_about_your_opinion">Vi er meget interesseret i din mening, og det er vigtigt for os at høre fra dig.</string>
+	<string name="rendering_value_boldOutline_name">Fed kontur</string>
+    <string name="traffic_warning_hazard">Fare</string>
     </resources>

OsmAnd/res/values-de/phrases.xml

@@ -95,7 +95,7 @@
 	<string name="poi_car_parts">Autoteilehändler</string>
 	<string name="poi_car_rental">Autovermietung</string>
 	<string name="poi_car_repair">Kfz-Werkstatt</string>
-	<string name="poi_car_sharing">Fahrgemeinschaft</string>
+	<string name="poi_car_sharing">Carsharing Station</string>
 	<string name="poi_car">Autohändler</string>
 	<string name="poi_car_wash">Autowaschanlage</string>
 	<string name="poi_caravan_site">Campingplatz</string>
@@ -536,7 +536,7 @@
 	<string name="poi_toboggan">Rodelschlitten</string>
 	<string name="poi_toilets">Toilette</string>
 	<string name="poi_toll_booth">Mautstelle</string>
-	<string name="poi_information">Fremdenverkehrsamt</string>
+	<string name="poi_information">Information für Touristen</string>
 	<string name="poi_town">Kleinstadt</string>
 	<string name="poi_townhall">Rathaus</string>
 	<string name="poi_toys">Spielwarenhandlung</string>
@@ -691,7 +691,7 @@
 	<string name="poi_landuse_railway">Bahngelände</string>
 
 	<string name="poi_silo">Silo</string>
-	<string name="poi_storage_tank">Speicher</string>
+	<string name="poi_storage_tank">Tanklager</string>
 
 	<string name="poi_residential">Wohngebiet</string>
 
@@ -704,9 +704,9 @@
 	<string name="poi_picnic_table">Picknicktisch</string>
 	<string name="poi_wine_cellar">Weinkeller</string>
 	<string name="poi_piste">Piste</string>
-	<string name="poi_piste_nordic">Nordisch</string>
-	<string name="poi_piste_skitour">Skitour</string>
-	<string name="poi_piste_playground">Spielplatz</string>
+	<string name="poi_piste_nordic">Loipe</string>
+	<string name="poi_piste_skitour">Tourenski-Strecke</string>
+	<string name="poi_piste_playground">Skiübungsgelände</string>
 	<string name="poi_ski_rental">Skiverleih</string>
 
 	<string name="poi_gallery">Kunstgalerie</string>
@@ -728,13 +728,13 @@
 	<string name="poi_tomb">Grab</string>
 	<string name="poi_winery">Weinkellerei</string>
 
-	<string name="poi_piste_hike">Wandern</string>
+	<string name="poi_piste_hike">Wanderstrecke</string>
 	<string name="poi_piste_ice_skate">Eislaufen</string>
 	<string name="poi_payment_terminal">Bezahl-Terminal</string>
 	<string name="poi_transport_construction">Transportkonstruktion</string>
 		<string name="poi_natural">Natürlich</string>
 	<string name="poi_camera">Kameras und Objektive</string>
-	<string name="poi_charity">Karitativer Gebrauchtwarenladen</string>
+	<string name="poi_charity">Sozialkaufhaus</string>
 	<string name="poi_cabin">Hütte</string>
 	<string name="poi_lean_to">Unterstand</string>
 	<string name="poi_wilderness_hut">Wildnishütte</string>
@@ -746,7 +746,7 @@
 	<string name="poi_internet_access_terminal">Internetzugang: Terminal</string>
 	<string name="poi_internet_access_service">Internetzugang: Dienst</string>
 
-	<string name="poi_fee">Gebühr</string>
+	<string name="poi_fee_yes">Gebühr</string>
 
 	<string name="poi_brand">Marke</string>
 	<string name="poi_maxweight">Maximalgewicht</string>
@@ -808,4 +808,100 @@
 	<string name="poi_wiki_lang_lv">Lettisches Wiki</string>
 	<string name="poi_wiki_lang_ms">Malaiisches Wiki</string>
 	<string name="poi_wiki_lang_new">Newarisches Wiki</string>
+	<string name="poi_node_networks">Wander-/Radroutenpunkte</string>
+		<string name="poi_hiking_routes">Wanderrouten</string>
+		<string name="poi_traffic_enforcement">Verkehrsüberwachung</string>
+	<string name="poi_cheese">Käsegeschäft</string>
+	<string name="poi_chocolate">Schokoladengeschäft</string>
+	<string name="poi_coffee">Kaffeeladen</string>
+	<string name="poi_pasta">Nudelgeschäft</string>
+	<string name="poi_pastry">Konditorei</string>
+	<string name="poi_candles">Kerzengeschäft</string>
+	<string name="poi_fashion">Modegeschäft</string>
+	<string name="poi_furnace">Heizungsgeschäft</string>
+	<string name="poi_garden_furniture">Gartenmöbelladen</string>
+	<string name="poi_leather">Ledergeschäft</string>
+	<string name="poi_music">Musikgeschäft</string>
+	<string name="poi_scuba_diving_shop">Tauchzubehörgeschäft</string>
+	<string name="poi_tyres">Reifengeschäft</string>
+	<string name="poi_watches">Uhrengeschäft</string>
+	<string name="poi_swimming_pool_shop">Poolzubehörgeschäft</string>
+	<string name="poi_games">Spiele</string>
+	<string name="poi_model">Modellbau</string>
+	<string name="poi_trophy">Trophäen und Preise</string>
+	<string name="poi_video_games">Videospiele</string>
+	<string name="poi_pyrotechnics">Feuerwerk</string>
+	<string name="poi_weapons">Waffengeschäft</string>
+
+	<string name="poi_breakwater">Wellenbrecher</string>
+	<string name="poi_groyne">Buhne</string>
+
+	<string name="poi_power_cable_distribution_cabinet">Verteilerkasten</string>
+	<string name="poi_basin">Wasserbecken</string>
+	<string name="poi_conservation">Schutzgebiet</string>
+
+	<string name="poi_crane">Kran</string>
+	<string name="poi_country">Land</string>
+	<string name="poi_tourism_attraction">Touristische Attraktion</string>
+	<string name="poi_lodging">Unterkunft</string>
+	<string name="poi_religious">Heilige Stätte</string>
+	<string name="poi_hanami">Kirschblütenschau</string>
+	<string name="poi_piste_downhill">Abfahrtspiste</string>
+	<string name="poi_piste_sleigh">Zugschlitten-Strecke</string>
+	<string name="poi_piste_sled">Schlittenbahn</string>
+	<string name="poi_piste_snow_park">Winter-Funpark</string>
+	<string name="poi_ski_resort">Skigebiet</string>
+	<string name="poi_village_green">Grünfläche</string>
+	<string name="poi_trail_riding_station">Versorgungsstation für Pferde</string>
+
+	<string name="poi_cutline">Waldschneise</string>
+	<string name="poi_wood">Wald</string>
+	<string name="poi_tree">Baum</string>
+	<string name="poi_cycle_barrier">Umlaufsperre</string>
+	<string name="poi_motorcycle_barrier">Motorradsperre</string>
+	<string name="poi_block">Block</string>
+	<string name="poi_bus_trap">Busschleuse</string>
+	<string name="poi_cattle_grid">Weiderost</string>
+	<string name="poi_full_height_turnstile">Personendrehkreuz</string>
+	<string name="poi_bump_gate">Schwingtor</string>
+	<string name="poi_general_barrier">Barriere</string>
+	<string name="poi_height_restrictor">Höhenbegrenzung</string>
+	<string name="poi_sally_port">Ausfalltor</string>
+	<string name="poi_turnstile">Drehkreuz</string>
+	<string name="poi_kent_carriage_gap">Kutschendurchlass</string>
+	<string name="poi_highway_crossing">Kreuzung</string>
+
+	<string name="poi_icn_ref">Internationales Fahrradknotenpunktnetzwerk</string>
+	<string name="poi_ncn_ref">Nationale Radroute</string>
+	<string name="poi_rcn_ref">Regionales Fahrradknotenpunktnetzwerk</string>
+	<string name="poi_lcn_ref">Lokales Fahrradknotenpunktnetzwerk</string>
+	<string name="poi_iwn_ref">Internationales Wanderknotenpunktnetzwerk</string>
+	<string name="poi_nwn_ref">Nationale Wanderroute</string>
+	<string name="poi_rwn_ref">Regionales Wanderknotenpunktnetzwerk</string>
+	<string name="poi_lwn_ref">Lokales Wanderknotenpunktnetzwerk</string>
+
+	<string name="poi_route_hiking_iwn_poi">Internationaler Wanderweg</string>
+	<string name="poi_route_hiking_nwn_poi">Nationaler Wanderweg</string>
+	<string name="poi_route_hiking_rwn_poi">Regionaler Wanderweg</string>
+	<string name="poi_route_hiking_lwn_poi">Örtlicher Wanderweg</string>
+	<string name="poi_route_hiking_ref_poi">Wanderweg Bezeichnung</string>
+
+	<string name="poi_collection_times">Leerungszeiten</string>
+	<string name="poi_service_times">Betriebszeiten</string>
+	<string name="poi_abandoned_poi">Verlassenes Objekt</string>
+	<string name="poi_enforcement_traffic_signals">Ampel-Blitzanlage</string>
+	<string name="poi_enforcement_maxspeed">Geschwindigkeitskontrolle</string>
+	<string name="poi_enforcement_maxheight">Höhenkontrolle</string>
+	<string name="poi_enforcement_mindistance">Abstandskontrolle</string>
+	<string name="poi_enforcement_check">Durchführung:Kontrolle</string>
+	<string name="poi_enforcement_access">Kontrolle Berechtigung</string>
+	<string name="poi_enforcement_toll">Mautkontrolle</string>
+
+<string name="poi_free_flying">Freeflying Zubehörgeschäft</string>
+	<string name="poi_bollard">Poller</string>
+	<string name="poi_energy">Energiespeicher</string>
+	<string name="poi_stile">Zaunübertritt</string>
+	<string name="poi_horse_stile">Zaunübertritt für Pferde</string>
+	<string name="poi_kissing_gate">Schwinggatter</string>
+	<string name="poi_swing_gate">Schwingtor</string>
 	</resources>

OsmAnd/res/values-de/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="gps_network_not_enabled">Kein Standortdienst aktiviert. Aktivieren?</string>
 	<string name="disable_recording_once_app_killed">Eigenständige Streckenaufzeichnung unterbinden</string>
@@ -73,7 +73,7 @@
 	<string name="stop_navigation_service">Unterbrechen</string>
 	<string name="rendering_attr_alpineHiking_name">Alpine Tourenskala (SAC)</string>
 	<string name="rendering_attr_alpineHiking_description">Wege entsprechend der SAC-Wanderskala darstellen</string>
-	<string name="rendering_attr_hikingRoutesOSMC_name">Wandersymbole anzeigen</string>
+	<string name="rendering_attr_hikingRoutesOSMC_name">Wandersymboleinblendung</string>
 	<string name="rendering_attr_hikingRoutesOSMC_description">Wandersymbole anzeigen (OSMC)</string>
 	<string name="arrival_distance_factor_early">Früh</string>
 	<string name="arrival_distance_factor_normally">Normal</string>
@@ -243,13 +243,13 @@
 	<string name="north_west">Nord-West</string>
 	<string name="north_north_west">Nord-Nord-West</string>
 	<string name="front">Vorne</string>
-	<string name="front_right">Vorne rechts</string>
+	<string name="front_right">rechts vorne</string>
 	<string name="right">Auf der rechten Seite</string>
-	<string name="back_right">Hinten rechts</string>
-	<string name="back">Hinten</string>
-	<string name="back_left">Hinten links</string>
+	<string name="back_right">rechts hinten</string>
+	<string name="back">hinten</string>
+	<string name="back_left">links hinten</string>
 	<string name="left">Auf der linken Seite</string>
-	<string name="front_left">Vorne links</string>
+	<string name="front_left">links vorne</string>
 	<string name="oclock">Uhr</string>
 	<string name="towards">nach</string>
 	<string name="accuracy">Genauigkeit</string>
@@ -931,7 +931,7 @@
 	<string name="route_head">Geradeaus</string>
 	<string name="first_time_continue">Weiter</string>
 	<string name="first_time_download">Offline-Daten herunterladen</string>
-	<string name="first_time_msg">Danke, dass Sie OsmAnd verwenden. Für viele Funktionen sind Offline-Karten erforderlich, die Sie in den Einstellungen unter \'Karten-Management\' herunterladen oder selbst erstellen können. Danach können Sie Landkarten ansehen, Adressen, POI und ÖPNV finden.</string>
+	<string name="first_time_msg">Danke, dass Sie OsmAnd verwenden. Für viele Funktionen sind Offline-Karten erforderlich, die Sie in den Einstellungen unter \'Karten-Management\' herunterladen oder selbst erstellen können. Danach können Sie Landkarten ansehen und Adressen, interessante Orte und Informationen zum ÖPNV finden.</string>
 	<string name="search_poi_location">Warte auf Signal…</string>
 	<string name="search_near_map">Suche in der Nähe</string>
 	<string name="search_nearby">Suche um Aufenthaltsort</string>
@@ -1316,7 +1316,7 @@
 	<string name="download_select_map_types">Andere Karten</string>
 	<string name="download_srtm_maps">Höhenlinien</string>
 	<string name="av_camera_pic_size">Bildgröße der Kamera</string>
-	<string name="av_camera_pic_size_descr">interne Größe der Kamerabilder bestimmen</string>
+	<string name="av_camera_pic_size_descr">Bildgröße der internen Kamera auswählen</string>
 	<string name="av_def_action_video">Video aufzeichnen</string>
 	<string name="av_def_action_audio">Audio aufnehmen</string>
 	<string name="av_widget_action_descr">Legt fest, welche Aktion das Widget standardmäßig ausführt</string>
@@ -2060,7 +2060,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="shared_string_disable">Deaktivieren</string>
     <string name="plugin_description_title">Beschreibung</string>
     
-    <string name="plugin_install_needs_network">Die Installation dieses Plugins benötigt eine Internet-Verbindung.</string>
+    <string name="plugin_install_needs_network">Die Installation dieses Plugins benötigt eine Internetverbindung.</string>
     <string name="edit_group">Gruppe bearbeiten</string>
     <string name="free">Frei %1$s </string>
     <string name="device_memory">Gerätespeicher</string>
@@ -2175,7 +2175,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="routing_attr_avoid_borders_description">Überqueren einer Staatsgrenze vermeiden</string>
 	<string name="routing_attr_height_description">Höhe des Fahrzeugs für Streckenberechnung angeben</string>
     <string name="download_wikipedia_maps">Wikipedia</string>
-    <string name="use_fast_recalculation">schnelle Routen-Neuberechnung</string>
+    <string name="use_fast_recalculation">Schnelle Routen-Neuberechnung</string>
 	<string name="use_fast_recalculation_desc">Bei längeren Routen nur den Anfangsteil neu berechnen</string>
 <string name="lang_es_ar">Spanisch (Argentinien)</string>
     <string name="lang_th">Thailändisch</string>
@@ -2208,8 +2208,8 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="lang_nn">Norwegisch (Neunorwegisch)</string>
     <string name="rendering_value_default13_name">Standard (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Standard (transparentes Cyan)</string>
-    <string name="rendering_attr_currentTrackColor_name">GPX -Trackfarbe</string>
-    <string name="rendering_attr_currentTrackWidth_name">GPX-Trackbreite</string>
+    <string name="rendering_attr_currentTrackColor_name">GPX-Farbe</string>
+    <string name="rendering_attr_currentTrackWidth_name">GPX-Breite</string>
     <string name="rendering_value_red_name">Rot</string>
     <string name="rendering_value_translucent_red_name">Transparentes Rot</string>
     <string name="rendering_value_translucent_orange_name">Transparentes Orange</string>
@@ -2233,6 +2233,12 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="lang_ceb">Cebuano</string>
     <string name="local_recordings_delete_all_confirm">%1$d Notizen werden gelöscht. Fortfahren?</string>
 	<string name="lang_te">Telugu</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Routenfarbe gemäß Routenscope</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">Einfärbung gemäß Routenbereich</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Routenfarbe gemäß OSMC</string>
-    </resources>
+    <string name="do_you_like_osmand">Gefällt Ihnen OsmAnd?</string>
+	<string name="rate_this_app">Bewerten Sie diese App</string>
+	<string name="rate_this_app_long">Bitte bewerten Sie OsmAnd auf Google Play</string>
+	<string name="user_hates_app_get_feedback">Sagen Sie uns warum.</string>
+	<string name="user_hates_app_get_feedback_long">Bitte teilen Sie uns mit welche Änderungen Sie sich für diese App wünschen.</string>
+<string name="we_really_care">Wir kümmern uns wirklich</string>
+	</resources>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -573,14 +573,14 @@
 	<string name="poi_club_charity">Club de caridad</string>
 
 	<string name="poi_piste">Pista</string>
-	<string name="poi_piste_downhill">Descenso</string>
-	<string name="poi_piste_nordic">Nórdico</string>
-	<string name="poi_piste_skitour">Esquí de travesía</string>
-	<string name="poi_piste_hike">Caminata</string>
-	<string name="poi_piste_sleigh">Trineo (animales)</string>
-	<string name="poi_piste_sled">Trineo</string>
+	<string name="poi_piste_downhill">Pista de descenso</string>
+	<string name="poi_piste_nordic">Pista nórdica</string>
+	<string name="poi_piste_skitour">Pista de esquí de travesía</string>
+	<string name="poi_piste_hike">Pista de senderismo</string>
+	<string name="poi_piste_sleigh">Pista de trineo (animales)</string>
+	<string name="poi_piste_sled">Pista de trineo</string>
 	<string name="poi_piste_snow_park">Parque de nieve</string>
-	<string name="poi_piste_playground">Parque infantil de esquí</string>
+	<string name="poi_piste_playground">Pista de esquí infantil</string>
 	<string name="poi_piste_ice_skate">Patín sobre hielo</string>
 	<string name="poi_ski_rental">Alquiler de esquí</string>
 
@@ -679,7 +679,7 @@
 	<string name="poi_hairdresser">Peluquería</string>
 	<string name="poi_massage">Salón de masajes</string>
 	<string name="poi_tattoo">Salón de tatuajes</string>
-	<string name="poi_dry_cleaning">Limpieza en seco</string>
+	<string name="poi_dry_cleaning">Tintorería</string>
 	<string name="poi_laundry">Lavandería</string>
 	<string name="poi_car_rental">Alquiler de autos</string>
 	<string name="poi_car_sharing">Coche compartido</string>
@@ -892,10 +892,10 @@
 
 	<string name="poi_tourism_attraction">Atracción turística</string>
 	<string name="poi_cutline">Cortafuegos forestal</string>
-	<string name="poi_icn_ref">Red internacional de ciclismo</string>
-	<string name="poi_ncn_ref">Red nacional de ciclismo</string>
-	<string name="poi_rcn_ref">Red regional de ciclismo</string>
-	<string name="poi_lcn_ref">Red local de ciclismo</string>
+	<string name="poi_icn_ref">Red de nodos ciclista internacional</string>
+	<string name="poi_ncn_ref">Red de nodos ciclista nacional</string>
+	<string name="poi_rcn_ref">Red de nodos ciclista regional</string>
+	<string name="poi_lcn_ref">Red de nodos ciclista local</string>
 
 	<string name="poi_iwn_ref">Red internacional de senderismo</string>
 	<string name="poi_nwn_ref">Red nacional de senderismo</string>
@@ -922,8 +922,122 @@
 	<string name="poi_enforcement_toll">Control de peaje</string>
 
 <string name="poi_country">País</string>
-	<string name="poi_fee">Costo</string>
+	<string name="poi_fee_yes">Costo</string>
 
-	<string name="poi_kent_carriage_gap">Bolardos para vehículos de tracción a sangre</string>
+	<string name="poi_kent_carriage_gap">Bolardos para carros a caballo</string>
 	<string name="poi_abandoned_poi">Objeto abandonado</string>
+	<string name="poi_route_hiking_iwn_poi">Ruta internacional de senderismo</string>
+	<string name="poi_route_hiking_nwn_poi">Ruta nacional de senderismo</string>
+	<string name="poi_route_hiking_rwn_poi">Ruta regional de senderismo</string>
+	<string name="poi_route_hiking_lwn_poi">Ruta local de senderismo</string>
+	<string name="poi_route_hiking_ref_poi">Referencia de ruta de senderismo</string>
+
+	<string name="poi_node_networks">Red de nodos de senderismo/ciclismo</string>
+		<string name="poi_hiking_routes">Rutas de senderismo</string>
+		<string name="poi_traffic_enforcement">Control del tráfico</string>
+	<string name="poi_access_private">Acceso privado</string>
+	<string name="poi_access_no">Sin acceso</string>
+	<string name="poi_access_destination">Acceso a destino</string>
+	<string name="poi_access_permissive">Acceso permisivo</string>
+	<string name="poi_access_customers">Acceso de clientes</string>
+	<string name="poi_access_agricultural">Acceso agrícola</string>
+
+	<string name="poi_access_delivery">Acceso para entregas</string>
+	<string name="poi_monitoring_station">Estación de monitoreo</string>
+	<string name="poi_capital">Capital</string>
+	<string name="poi_fee_no">Sin costo</string>
+
+	<string name="poi_email">Email</string>
+	<string name="poi_fax">Fax</string>
+	<string name="poi_facebook">Facebook</string>
+	<string name="poi_mobile">Celular</string>
+	<string name="poi_animal_shelter_dog">Refugio para perros</string>
+	<string name="poi_animal_shelter_cat">Refugio para gatos</string>
+	<string name="poi_animal_shelter_dog_cat">Refugio para perros y gatos</string>
+	<string name="poi_animal_shelter_bird">Refugio para aves</string>
+
+<string name="poi_recycling_centre">Centro de reciclaje</string>
+	<string name="poi_recycling_container">Contenedor</string>
+	<string name="poi_recycling_glass">Vidrio</string>
+	<string name="poi_recycling_paper">Papel</string>
+	<string name="poi_recycling_clothes">Ropa</string>
+	<string name="poi_recycling_cans">Latas</string>
+	<string name="poi_recycling_glass_bottles">Botellas de vidrio</string>
+	<string name="poi_recycling_plastic">Plastico</string>
+	<string name="poi_recycling_scrap_metal">Chatarra</string>
+	<string name="poi_recycling_batteries">Baterias</string>
+	<string name="poi_recycling_plastic_bottles">Botellas de plástico</string>
+	<string name="poi_recycling_green_waste">Residuos verdes</string>
+	<string name="poi_recycling_waste">Residuos (bolsas negras)</string>
+	<string name="poi_recycling_plastic_packaging">Envases de plástico</string>
+	<string name="poi_recycling_newspaper">Diarios</string>
+	<string name="poi_recycling_cartons">Cartones</string>
+	<string name="poi_recycling_magazines">Revistas</string>
+	<string name="poi_recycling_paper_packaging">Embalajes de papel</string>
+	<string name="poi_recycling_small_appliances">Pequeños electrodomésticos</string>
+	<string name="poi_recycling_wood">Madera</string>
+	<string name="poi_recycling_books">Libros</string>
+	<string name="poi_recycling_shoes">Calzados</string>
+	<string name="poi_recycling_aluminium">Aluminio</string>
+	<string name="poi_recycling_organic">Orgánico</string>
+	<string name="poi_recycling_beverage_cartons">Cajas de cartón</string>
+	<string name="poi_recycling_garden_waste">Residuos de jardín</string>
+	<string name="poi_recycling_low_energy_bulbs">Bombillas de bajo consumo</string>
+	<string name="poi_recycling_fluorescent_tubes">Tubos fluorescentes</string>
+	<string name="poi_recycling_metal">Metal</string>
+	<string name="poi_recycling_electrical_items">Artículos eléctricos</string>
+	<string name="poi_recycling_white_goods">Electrodomésticos</string>
+	<string name="poi_recycling_cooking_oil">Aceite de cocina</string>
+	<string name="poi_recycling_engine_oil">Aceite de motor</string>
+	<string name="poi_recycling_plastic_bags">Bolsas de plástico</string>
+	<string name="poi_recycling_hazardous_waste">Residuos peligrosos</string>
+	<string name="poi_recycling_mobile_phones">Celulares</string>
+	<string name="poi_recycling_computers">Computadoras</string>
+	<string name="poi_recycling_tyres">Llantas</string>
+	<string name="poi_recycling_tv_monitor">TV, monitores</string>
+	<string name="poi_recycling_tetrapak">Tetrapak</string>
+	<string name="poi_recycling_hydrargyrum">Mercurio</string>
+	<string name="poi_recycling_rubble">Escombros</string>
+	<string name="poi_recycling_cds">CDs</string>
+	<string name="poi_recycling_waste_oil">Aceite usado</string>
+	<string name="poi_recycling_bottles">Botellas</string>
+	<string name="poi_recycling_cork">Corchos</string>
+	<string name="poi_recycling_printer_cartridges">Cartuchos de impresoras</string>
+	<string name="poi_recycling_foil">Papel de aluminio</string>
+	<string name="poi_recycling_paint">Pintura</string>
+	<string name="poi_recycling_sheet_metal">Chapas</string>
+	<string name="poi_recycling_styrofoam">Poliestireno extruído</string>
+	<string name="poi_recycling_drugs">Drogas</string>
+	<string name="poi_recycling_compost">Compost</string>
+	<string name="poi_recycling_christmas_trees">Árboles navideños</string>
+	<string name="poi_recycling_light_bulbs">Bombillas</string>
+	<string name="poi_recycling_polyester">Poliéster</string>
+	<string name="poi_recycling_plasterboard">Cartón yeso</string>
+	<string name="poi_recycling_animal_waste">Residuos de animales</string>
+	<string name="poi_recycling_fridge_and_freezer">Heladeras y congeladores</string>
+	<string name="poi_recycling_furniture">Muebles</string>
+	<string name="poi_recycling_diapers">Pañales</string>
+	<string name="poi_recycling_car_batteries">Baterías de autos</string>
+	<string name="poi_recycling_cars">Autos</string>
+	<string name="poi_recycling_bicycles">Bicicletas</string>
+
+	<string name="poi_shower">Duchas</string>
+	<string name="poi_drinking_water_yes">Agua potable</string>
+	<string name="poi_drinking_water_no">Agua no potable</string>
+	<string name="poi_supervised_yes">Supervisado</string>
+	<string name="poi_supervised_no">Sin supervisión</string>
+	<string name="poi_seasonal_yes">Estacional</string>
+	<string name="poi_seasonal_no">No estacional</string>
+	<string name="poi_seasonal_dry_season">Estación seca</string>
+	<string name="poi_seasonal_wet_season">Temporada húmeda</string>
+	<string name="poi_seasonal_spring">Primavera</string>
+	<string name="poi_seasonal_summer">Verano</string>
+	<string name="poi_seasonal_autumn">Otoño</string>
+	<string name="poi_seasonal_winter">Inverno</string>
+	<string name="poi_crossing_traffic_signals">Semaforizado</string>
+	<string name="poi_crossing_uncontrolled">No controlado</string>
+	<string name="poi_crossing_unmarked">Desmarcado</string>
+
+	<string name="poi_recycling_cardboard">Cartón</string>
+	<string name="poi_recycling_hardcore">Escombros</string>
 	</resources>

OsmAnd/res/values-es-rAR/strings.xml

@@ -643,7 +643,7 @@
     <string name="tip_faq_t">Visita https://code.google.com/p/osmand/wiki/FAQ para ver las preguntas más frecuentes.</string>
     <string name="tip_faq">Preguntas más frecuentes</string>
     <string name="local_osm_changes_delete_all_confirm">Borrará %1$d cambio(s) OSM. ¿Estás seguro?</string>
-    <string name="animate_routing_route_not_calculated">Calcule la primera ruta</string>
+    <string name="animate_routing_route_not_calculated">Primero calcule la ruta</string>
     <string name="animate_routing_route">"Simular usando la ruta calculada "</string>
     <string name="animate_routing_gpx">Simular usando traza GPX</string>
 	<string name="route_is_too_long">El cálculo de ruta sin conexión de OsmAnd, podría tardar mucho tiempo (o a veces no funcionar) para tramos mayores de 200km. Tal vez quieras añadir puntos de ruta intermedios para un mejor rendimiento.</string>
@@ -2002,4 +2002,20 @@
     <string name="restart_is_required">Para aplicar los cambios, se necesita reiniciar la aplicación.</string>
     <string name="rendering_value_default13_name">Predefinido (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Predefinido (cian translúcido)</string>
+    <string name="do_you_like_osmand">¿Le gusta OsmAnd?</string>
+	<string name="we_really_care">Realmente nos importa</string>
+	<string name="rate_this_app">Califica la aplicación</string>
+	<string name="rate_this_app_long">Por favor, califica a OsmAnd en Google Play</string>
+	<string name="user_hates_app_get_feedback">Dinos por que.</string>
+	<string name="user_hates_app_get_feedback_long">Por favor, díganos lo que cambiaría en esta aplicación.</string>
+<string name="download_live_updates">Actualizaciones en vivo</string>
+	<string name="failed_to_upload">Subida fallida</string>
+	<string name="delete_change">Borrar cambio</string>
+	<string name="successfully_uploaded_pattern">Subido correctamente {0}/{1}</string>
+	<string name="try_again">Pruebe de nuevo</string>
+	<string name="error_message_pattern">Error: {0}</string>
+<string name="no_updates_available">Sin actualizaciones disponibles</string>
+    <string name="we_really_care_about_your_opinion">Nos interesa mucho y es importante oír su opinión.</string>
+	<string name="rendering_value_boldOutline_name">Borde remarcado</string>
+    <string name="traffic_warning_hazard">Advertencia de riesgo</string>
     </resources>

OsmAnd/res/values-es/phrases.xml

@@ -105,7 +105,7 @@
 	<string name="poi_fire_extinguisher">Extintor de incendios</string>
 	<string name="poi_fire_hose">Manguera de incendio</string>
 	<string name="poi_ambulance_station">Estación de ambulancias</string>
-	<string name="poi_ses_station">Estación SES</string>
+	<string name="poi_ses_station">Defensa Civil (SES)</string>
 	<string name="poi_emergency_access_point">Punto de acceso de emergencia</string>
 
 	<string name="poi_mountain_pass_yes">Paso de montaña</string>
@@ -310,7 +310,7 @@
 	<string name="poi_club_veterans">Club de veteranos</string>
 	<string name="poi_club_ethnic">Club étnico</string>
 	<string name="poi_club_nature">Club naturista</string>
-	<string name="poi_piste_playground">Parque de esquí infantil</string>
+	<string name="poi_piste_playground">Pista de esquí infantil</string>
 	<string name="poi_piste_snow_park">Parque de nieve</string>
 	<string name="poi_library">Biblioteca</string>
 	<string name="poi_arts_centre">Centro de arte</string>
@@ -590,10 +590,10 @@
 	<string name="poi_club_tourism">Club de turismo</string>
 	<string name="poi_club_charity">Club de caridad</string>
 
-	<string name="poi_piste_downhill">Descenso</string>
-	<string name="poi_piste_nordic">Nórdico</string>
-	<string name="poi_piste_hike">Caminata</string>
-	<string name="poi_piste_sleigh">Trineo (animales)</string>
+	<string name="poi_piste_downhill">Pista de descenso</string>
+	<string name="poi_piste_nordic">Pista nórdica</string>
+	<string name="poi_piste_hike">Pista de senderismo</string>
+	<string name="poi_piste_sleigh">Pista de trineo (animales)</string>
 	<string name="poi_piste_ice_skate">Patín de hielo</string>
 
 	<string name="poi_dance_floor">Pista de baile</string>
@@ -698,8 +698,8 @@
 	<string name="poi_spring">Manantial</string>
 	<string name="poi_funicular">Funicular</string>
 	<string name="poi_bailiff">Alguacil</string>
-	<string name="poi_piste_skitour">Esquí de travesía</string>
-	<string name="poi_piste_sled">Trineo</string>
+	<string name="poi_piste_skitour">Pista de esquí de travesía</string>
+	<string name="poi_piste_sled">Pista de trineo</string>
 	<string name="poi_craft_pottery">Alfarería</string>
 	<string name="poi_craft_roofer">Techador</string>
 	<string name="poi_funeral_directors">Funeraria</string>
@@ -845,7 +845,7 @@
 	<string name="poi_scuba_diving_shop">Artículos de buceo</string>
 	<string name="poi_tyres">Tienda de neumáticos</string>
 	<string name="poi_energy">Acumulador de energía</string>
-	<string name="poi_watches">Tienda de relojes de pulsera</string>
+	<string name="poi_watches">Tienda de relojes pulsera</string>
 	<string name="poi_swimming_pool_shop">Artículos de piscina</string>
 	<string name="poi_games">Juegos</string>
 	<string name="poi_model">Modelos a escala</string>
@@ -890,7 +890,7 @@
 	<string name="poi_tourism_attraction">Atracción turística</string>
 	<string name="poi_cutline">Cortafuegos forestal</string>
 	<string name="poi_tree">Árbol</string>
-	<string name="poi_icn_ref">Nodo de red ciclista internacional</string>
+	<string name="poi_icn_ref">Red de nodos ciclista internacional</string>
 	<string name="poi_opening_hours">Horario de atención</string>
 	<string name="poi_collection_times">Horario de recolección</string>
 	<string name="poi_description">Descripción</string>
@@ -914,9 +914,9 @@
 
 <string name="poi_kissing_gate">Portilla giratoria</string>
 	<string name="poi_sally_port">Portón de muralla</string>
-	<string name="poi_ncn_ref">Red nacional de ciclismo</string>
-	<string name="poi_rcn_ref">Red regional de ciclismo</string>
-	<string name="poi_lcn_ref">Red local de ciclismo</string>
+	<string name="poi_ncn_ref">Red de nodos ciclista nacional</string>
+	<string name="poi_rcn_ref">Red de nodos ciclista regional</string>
+	<string name="poi_lcn_ref">Red de nodos ciclista local</string>
 
 	<string name="poi_iwn_ref">Red internacional de senderismo</string>
 	<string name="poi_nwn_ref">Red nacional de senderismo</string>
@@ -925,6 +925,122 @@
 
 	<string name="poi_enforcement_access">Control de acceso</string>
 	<string name="poi_country">País</string>
-	<string name="poi_fee">Costo</string>
+	<string name="poi_fee_yes">Costo</string>
 
+	<string name="poi_kent_carriage_gap">Bolardos para carros a caballo</string>
+	<string name="poi_abandoned_poi">Objeto abandonado</string>
+	<string name="poi_route_hiking_iwn_poi">Ruta internacional de senderismo</string>
+	<string name="poi_route_hiking_nwn_poi">Ruta nacional de senderismo</string>
+	<string name="poi_route_hiking_rwn_poi">Ruta regional de senderismo</string>
+	<string name="poi_route_hiking_lwn_poi">Ruta local de senderismo</string>
+	<string name="poi_route_hiking_ref_poi">Referencia de ruta de senderismo</string>
+
+	<string name="poi_node_networks">Red de nodos de senderismo/ciclismo</string>
+		<string name="poi_hiking_routes">Rutas de senderismo</string>
+		<string name="poi_traffic_enforcement">Control del tráfico</string>
+	<string name="poi_access_private">Acceso privado</string>
+	<string name="poi_access_no">Sin acceso</string>
+	<string name="poi_access_destination">Acceso a destino</string>
+	<string name="poi_access_permissive">Acceso permisivo</string>
+	<string name="poi_access_customers">Acceso a clientes</string>
+	<string name="poi_access_agricultural">Acceso agrícola</string>
+
+	<string name="poi_access_delivery">Acceso para entregas</string>
+	<string name="poi_monitoring_station">Estación de monitoreo</string>
+	<string name="poi_capital">Capital</string>
+	<string name="poi_fee_no">Sin costo</string>
+
+	<string name="poi_email">Email</string>
+	<string name="poi_fax">Fax</string>
+	<string name="poi_facebook">Facebook</string>
+	<string name="poi_mobile">Móvil</string>
+	<string name="poi_animal_shelter_dog">Refugio para perros</string>
+	<string name="poi_animal_shelter_cat">Refugio para gatos</string>
+	<string name="poi_animal_shelter_dog_cat">Refugio para perros y gatos</string>
+	<string name="poi_animal_shelter_bird">Refugio para aves</string>
+
+<string name="poi_recycling_centre">Centro de reciclaje</string>
+	<string name="poi_recycling_container">Contenedor</string>
+	<string name="poi_recycling_glass">Vidrio</string>
+	<string name="poi_recycling_paper">Papel</string>
+	<string name="poi_recycling_clothes">Ropa</string>
+	<string name="poi_recycling_cans">Latas</string>
+	<string name="poi_recycling_glass_bottles">Botellas de vidrio</string>
+	<string name="poi_recycling_plastic">Plastico</string>
+	<string name="poi_recycling_scrap_metal">Chatarra</string>
+	<string name="poi_recycling_batteries">Baterias</string>
+	<string name="poi_recycling_plastic_bottles">Botellas de plástico</string>
+	<string name="poi_recycling_green_waste">Residuos verdes</string>
+	<string name="poi_recycling_waste">Residuos (bolsas negras)</string>
+	<string name="poi_recycling_plastic_packaging">Envases de plástico</string>
+	<string name="poi_recycling_newspaper">Diarios</string>
+	<string name="poi_recycling_cartons">Cartones</string>
+	<string name="poi_recycling_cardboard">Cartón</string>
+	<string name="poi_recycling_magazines">Revistas</string>
+	<string name="poi_recycling_paper_packaging">Embalajes de papel</string>
+	<string name="poi_recycling_small_appliances">Pequeños electrodomésticos</string>
+	<string name="poi_recycling_wood">Madera</string>
+	<string name="poi_recycling_books">Libros</string>
+	<string name="poi_recycling_shoes">Calzados</string>
+	<string name="poi_recycling_aluminium">Aluminio</string>
+	<string name="poi_recycling_organic">Orgánico</string>
+	<string name="poi_recycling_beverage_cartons">Cajas de cartón</string>
+	<string name="poi_recycling_garden_waste">Residuos de jardín</string>
+	<string name="poi_recycling_low_energy_bulbs">Bombillas de bajo consumo</string>
+	<string name="poi_recycling_fluorescent_tubes">Tubos fluorescentes</string>
+	<string name="poi_recycling_metal">Metal</string>
+	<string name="poi_recycling_electrical_items">Artículos eléctricos</string>
+	<string name="poi_recycling_white_goods">Electrodomésticos</string>
+	<string name="poi_recycling_cooking_oil">Aceite de cocina</string>
+	<string name="poi_recycling_engine_oil">Aceite de motor</string>
+	<string name="poi_recycling_plastic_bags">Bolsas de plástico</string>
+	<string name="poi_recycling_hazardous_waste">Residuos peligrosos</string>
+	<string name="poi_recycling_mobile_phones">Celulares</string>
+	<string name="poi_recycling_hydrargyrum">Mercurio</string>
+	<string name="poi_recycling_computers">Computadoras</string>
+	<string name="poi_recycling_tyres">Llantas</string>
+	<string name="poi_recycling_tv_monitor">TV, monitores</string>
+	<string name="poi_recycling_tetrapak">Tetrapak</string>
+	<string name="poi_recycling_rubble">Escombros</string>
+	<string name="poi_recycling_cds">CDs</string>
+	<string name="poi_recycling_waste_oil">Aceite usado</string>
+	<string name="poi_recycling_bottles">Botellas</string>
+	<string name="poi_recycling_cork">Corchos</string>
+	<string name="poi_recycling_printer_cartridges">Cartuchos de impresoras</string>
+	<string name="poi_recycling_sheet_metal">Chapas</string>
+	<string name="poi_recycling_foil">Papel de aluminio</string>
+	<string name="poi_recycling_paint">Pintura</string>
+	<string name="poi_recycling_styrofoam">Poliestireno extruído</string>
+	<string name="poi_recycling_drugs">Drogas</string>
+	<string name="poi_recycling_compost">Compost</string>
+	<string name="poi_recycling_christmas_trees">Árboles navideños</string>
+	<string name="poi_recycling_light_bulbs">Bombillas</string>
+	<string name="poi_recycling_polyester">Poliéster</string>
+	<string name="poi_recycling_plasterboard">Cartón yeso</string>
+	<string name="poi_recycling_animal_waste">Residuos de animales</string>
+	<string name="poi_recycling_fridge_and_freezer">Heladeras y congeladores</string>
+	<string name="poi_recycling_furniture">Muebles</string>
+	<string name="poi_recycling_diapers">Pañales</string>
+	<string name="poi_recycling_car_batteries">Baterías de autos</string>
+	<string name="poi_recycling_cars">Autos</string>
+	<string name="poi_recycling_bicycles">Bicicletas</string>
+
+	<string name="poi_shower">Duchas</string>
+	<string name="poi_drinking_water_yes">Agua potable</string>
+	<string name="poi_drinking_water_no">Agua no potable</string>
+	<string name="poi_supervised_yes">Supervisado</string>
+	<string name="poi_supervised_no">Sin supervisión</string>
+	<string name="poi_seasonal_yes">Estacional</string>
+	<string name="poi_seasonal_no">No estacional</string>
+	<string name="poi_seasonal_dry_season">Estación seca</string>
+	<string name="poi_seasonal_wet_season">Temporada húmeda</string>
+	<string name="poi_seasonal_spring">Primavera</string>
+	<string name="poi_seasonal_summer">Verano</string>
+	<string name="poi_seasonal_autumn">Otoño</string>
+	<string name="poi_seasonal_winter">Inverno</string>
+	<string name="poi_crossing_traffic_signals">Semaforizado</string>
+	<string name="poi_crossing_uncontrolled">No controlado</string>
+	<string name="poi_crossing_unmarked">Desmarcado</string>
+
+	<string name="poi_recycling_hardcore">Escombros</string>
 	</resources>

OsmAnd/res/values-es/strings.xml

@@ -1467,7 +1467,7 @@
 	<string name="auto_zoom_close">Para primer plano</string>
 	<string name="auto_zoom_far">Para mediano alcance</string>
 	<string name="auto_zoom_farthest">Para largo alcance</string>
-	<string name="animate_routing_route_not_calculated">Calcule la primera ruta</string>
+	<string name="animate_routing_route_not_calculated">Primero calcule la ruta</string>
     <string name="animate_routing_route">"Simular utilizando la ruta calculada "</string>
     <string name="animate_routing_gpx">Simula utilizando traza GPX</string>
     <string name="app_mode_hiking">Senderismo</string>
@@ -1595,8 +1595,8 @@
 	<string name="interrupt_music">Interrumpir música</string>
 	<string name="osmo_settings_uuid">Identificador único del dispositivo</string>
     <string name="osmo_settings_descr">Configura los ajustes de rastreo y configura el canal de rastreo personal</string>
-    <string name="osmo_plugin_description">"Este complemento proporciona la funcionalidad para la monitorización avanzada en directo llamada OsMo, ver http://osmo.mobi.
-\n\nPuede hacer un seguimiento de todos los dispositivos participando en un grupo en tiempo real, y comunicarse entre sí. Viene con varias opciones para el seguimiento por sesión o seguimiento permanente.
+    <string name="osmo_plugin_description">"Este complemento proporciona la función de monitorización avanzada en directo llamada OsMo, ver http://osmo.mobi.
+\n\nPuede rastrear todos los dispositivos participando en un grupo en tiempo real, y comunicarse entre sí. Viene con varias opciones para el seguimiento por sesión o permanente.
 \n\nLos grupos anónimos pueden crearse espontáneamente para un número de días específico y con características limitadas, por ejemplo, no hay control remoto ni administrador del grupo. Los grupos con funcionalidad completa, por otro lado, se deben crear en el sitio web y sólo los usuarios registrados tienen acceso a ellos. "</string>
     <string name="osmo_plugin_name">OsMo (Monitorización OSM)</string>
     <string name="osmo_settings">OsMo</string>
@@ -2119,7 +2119,7 @@
     <string name="lang_nb">Noruego (Bokmål)</string>
     <string name="lang_vo">Volapuk</string>
     <string name="lang_te">Telugú</string>
-    <string name="lang_new">Newar / Nepal Bhasa</string>
+    <string name="lang_new">Newarí / Nepal Bhasa</string>
     <string name="rendering_value_default13_name">Predeterminado (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Predeterminado (cian translúcido)</string>
     <string name="rendering_attr_currentTrackColor_name">Color del GPX</string>
@@ -2140,4 +2140,20 @@
     <string name="rendering_value_purple_name">Púrpura</string>
     <string name="rendering_value_translucent_purple_name">Púrpura translúcido</string>
     <string name="restart_is_required">Para aplicar los cambios, es necesario reiniciar manualmente la aplicación.</string>
+    <string name="do_you_like_osmand">¿Le gusta OsmAnd?</string>
+	<string name="we_really_care">Realmente nos interesa</string>
+	<string name="rate_this_app">Califica ésta aplicación</string>
+	<string name="rate_this_app_long">Por favor, califique a OsmAnd en Google Play</string>
+	<string name="user_hates_app_get_feedback">Dinos por que.</string>
+	<string name="user_hates_app_get_feedback_long">Por favor, díganos que cambiaría en esta aplicación.</string>
+<string name="download_live_updates">Actualizaciones en vivo</string>
+	<string name="failed_to_upload">Subida fallida</string>
+	<string name="delete_change">Borrar cambio</string>
+	<string name="successfully_uploaded_pattern">Subido con éxito {0}/{1}</string>
+	<string name="try_again">Vuelve a intentarlo</string>
+	<string name="error_message_pattern">Error: {0}</string>
+<string name="no_updates_available">Sin actualizaciones disponibles</string>
+    <string name="we_really_care_about_your_opinion">Nos interesa mucho y es importante para nosotros oír su opinión.</string>
+	<string name="rendering_value_boldOutline_name">Borde remarcado</string>
+    <string name="traffic_warning_hazard">Advertencia de riesgo</string>
     </resources>

OsmAnd/res/values-fa/strings.xml

@@ -268,7 +268,7 @@
 	<string name="add_favorite_dialog_favourite_added_template">نقطه علاقمندی \'{0}\' اضافه شد.</string>
 	<string name="favourites_context_menu_edit">ویرایش علاقمندی</string>
 	<string name="favourites_context_menu_delete">حذف علاقمندی</string>
-	<string name="favourites_remove_dialog_msg">آیا نقطه مورد علاقه \'%s\' حذف شود؟</string>
+	<string name="favourites_remove_dialog_msg">آیا نقطه برگزیده \'%s\' حذف شود؟</string>
 	<string name="favourites_remove_dialog_success">علاقمندی {0} حذف شد.</string>
 	<string name="osb_add_dialog_title">شرح اشکال را وارد کنید</string>
 	<string name="osb_add_dialog_success">اشکال با موفقیت ایجاد شد</string>
@@ -336,8 +336,8 @@
 	<string name="shared_string_downloading">درحال دانلود</string>
 	
 	
-	<string name="fav_points_edited">نقطه مورد علاقه ویرایش شد</string>
-	<string name="fav_points_not_exist">هیچ نقطه مورد علاقه ای وجود ندارد</string>
+	<string name="fav_points_edited">نقطه برگزیده ویرایش شد</string>
+	<string name="fav_points_not_exist">هیچ نقطه برگزیده‌ای وجود ندارد</string>
 	<string name="update_existing">جایگزین کردن</string>
 	<string name="only_show">فقط نشان بده</string>
 	<string name="follow">دنبال کردن</string>
@@ -833,7 +833,7 @@
 	<string name="level_to_switch_vector_raster_descr">حداقل زوم برای استفاده از نقشه های بُرداری</string>
 	<string name="tip_location_sharing">به اشتراک گذاری مکان</string>
 	<string name="error_doing_search">در هنگام جستجوی آفلاین خطایی رخ داد</string>
-	<string name="tip_favorites">نقاط مورد علاقه</string>
+	<string name="tip_favorites">نقاط برگزیده</string>
 	<string name="system_locale">سیستم</string>
 	<string name="incomplete_locale">ناقص</string>
 	<string name="tip_map_switch">انتخاب منبع نقشه</string>
@@ -950,7 +950,7 @@
 	<string name="uploading">درحال آپلود…</string>
 	<string name="uploading_data">درحال آپلود داده‌ها…</string>
 	<string name="shared_string_clear_all">پاک کردن همه</string>
-	<string name="favorite">مورد علاقه</string>
+	<string name="favorite">برگزیده</string>
 	<string name="search_history_building">ساختمان:{0}, {1}, {2}</string>
 	<string name="search_history_street">خیابان: {0}, {1}</string>
 	<string name="search_history_int_streets">تفاطع: {0} x {1} به {2}</string>
@@ -1016,7 +1016,7 @@
 	<string name="thanks_yandex_traffic">با تشکر از Yandex برای فراهم آوردن اطلاعات ترافیک.</string>
 	<string name="layer_yandex_traffic">ترافیک Yandex</string>
 	<string name="layer_route">مسیر</string>
-	<string name="shared_string_favorites">نقاط مورد علاقه</string>
+	<string name="shared_string_favorites">نقاط برگزیده</string>
 	<string name="layer_osm_bugs">یادداشتهای OSM (آنلاین)</string>
 	
 	<string name="shared_string_refresh">بازسازی</string>
@@ -1645,7 +1645,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
     <string name="select_gpx">انتخاب فایل GPX…</string>
     <string name="route_descr_select_destination">انتخاب مقصد</string>
     <string name="shared_string_select_on_map">انتخاب روی نقشه</string>
-    <string name="shared_string_favorite">علاقه‌مندی‌ها</string>
+    <string name="shared_string_favorite">برگزیده</string>
     <string name="route_preferences">تنظیمات مسیر</string>
     <string name="route_info">اطلاعات مسیر</string>
     <string name="use_displayed_track_for_navigation">آیا می‌خواهید از مسیر نمایش داده شده برای مسیریابی استفاده کنید؟</string>
@@ -1823,7 +1823,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
 	<string name="gpx_file_is_empty">GPX مسیر خالی است</string>
     
     <string name="shared_string_my_tracks">همه مسیرها</string>
-    <string name="shared_string_my_favorites">علاقه مندی های من</string>
+    <string name="shared_string_my_favorites">نقاط برگزیده من</string>
     <string name="shared_string_my_places">مکانهای من</string>
     
     <string name="osmo_user_joined">کاربر %1$s تاریخ عضویت %2$s</string>
@@ -1857,7 +1857,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
     <string name="gpx_selection_points">%1$s \n نقاط</string>
     <string name="gpx_selection_track">%1$s \n مسیر %2$s</string>
     
-    <string name="save_as_favorites_points">ذخیره به عنوان گروه مورد علاقه ها</string>
+    <string name="save_as_favorites_points">ذخیره به عنوان گروه برگزیده‌ها</string>
     <string name="select_destination_and_intermediate_points">انتخاب ایستگاههای بین راه</string>
     <string name="layer_amenity_label">برچسب نقطه</string>
     
@@ -1965,7 +1965,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
 
 	
 	<string name="rename_failed">تغییر نام انجام نشد.</string>
-	<string name="days_behind">روزهای قبل</string>
+	<string name="days_behind">روز قبل</string>
 	<string name="shared_string_currently_recording_track">مسیر درحال ضبط</string>
 	<string name="back_to_map">برگشت به نقشه</string>
 	<string name="plugin_touringview_name">نمای نقشه درحال تور</string>
@@ -2047,7 +2047,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
     <string name="anonymous_user">کاربر ناشناس</string>
     <string name="speed_limit_exceed">آستانه حداکثر سرعت</string>
 	<string name="print_route">چاپ مسیر</string>
-    <string name="fav_point_dublicate">نام نقطه مورد علاقه قبلاً وجود دارد</string>
+    <string name="fav_point_dublicate">نام نقطه برگزیده قبلاً وجود دارد</string>
     <string name="text_size_descr">تنطیم اندازه متن روی نقشه.</string>
     <string name="text_size">اندازه متن</string>
     <string name="traffic_warning_speed_limit">جداکثر سرعت</string>
@@ -2167,4 +2167,56 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
 	<string name="osmo_no_connection_msg">سرویس OsMo موجود نیست:\n- ارتباط را بررسی کنید؛\n- تنظیمات را بررسی کنید؛\n- توییتر ما را بررسی کنید: https://twitter.com/OsMomobi</string>
     <string name="anonymous_user_hint">کاربر ناشناس قادر به:\n- ایجاد گروه نیست؛\n- همزمان سازی گروهها و دستگاهها با سرور نمیباشد؛\n- مدیریت گروهها و دستگاهها در دفتر خصوصی نمیباشد.</string>
     <string name="index_name_netherlands">اروپا - هلند</string>
-	</resources>
+	<string name="no_updates_available">به روزرسانی وجود ندارد</string>
+    <string name="download_live_updates">به‌روزرسانی پویا</string>
+	<string name="rendering_value_default13_name">پیش‌فرض</string>
+	<string name="rendering_value_defaultTranslucentCyan_name">پیش‌فرض (فیروزه ای شفاف)</string>
+    <string name="rendering_attr_currentTrackColor_name">رنگ GPX</string>
+    <string name="rendering_attr_currentTrackWidth_name">ضخامت GPX</string>
+    <string name="rendering_value_red_name">قرمز</string>
+    <string name="rendering_value_translucent_red_name">قرمز شفاف</string>
+    <string name="rendering_value_translucent_orange_name">نارنجی شفاف</string>
+    <string name="rendering_value_yellow_name">زرد</string>
+    <string name="rendering_value_translucent_yellow_name">زرد شفاف</string>
+    <string name="rendering_value_lightgreen_name">سبز روشن</string>
+    <string name="rendering_value_translucent_lightgreen_name">سبز روشن شفاف</string>
+    <string name="rendering_value_green_name">سبز</string>
+    <string name="rendering_value_translucent_green_name">سبز شفاف</string>
+    <string name="rendering_value_lightblue_name">آبی روشن</string>
+    <string name="rendering_value_translucent_lightblue_name">آبی روشن شفاف</string>
+    <string name="rendering_value_blue_name">آبی</string>
+    <string name="rendering_value_translucent_blue_name">آبی شفاف</string>
+    <string name="rendering_value_purple_name">بنقش</string>
+    <string name="rendering_value_translucent_purple_name">بنفش شفاف</string>
+    <string name="restart_is_required">جهت اعمال کامل تغییرات لازم است برنامه دوباره راه‌اندازی شود.</string>
+    <string name="light_theme">روشن</string>
+    <string name="dark_theme">تیره</string>
+    <string name="lang_bn">زرد بنگالی</string>
+    <string name="lang_sh">صرب و کرواسی</string>
+    <string name="lang_az">آذری</string>
+    <string name="lang_br">برتون</string>
+    <string name="lang_sq">آلبانیایی</string>
+    <string name="lang_is">ایسلندی</string>
+    <string name="lang_ga">ایرلندی</string>
+    <string name="lang_la">لاتین</string>
+    <string name="lang_ku">کردی</string>
+    <string name="lang_ta">تامیلی</string>
+    <string name="lang_lb">لوکزامبورگی</string>
+    <string name="lang_eo">اسپرانتو</string>
+    <string name="lang_es_ar">اسپانیایی آرژانتینی</string>
+    <string name="lang_th">تایلندی</string>
+    <string name="lang_nn">نروژی</string>
+    <string name="lang_ms">مالزیایی</string>
+    <string name="lang_ht">هائیتی</string>
+    <string name="lang_et">استونیایی</string>
+    <string name="archive_wikipedia_data">شما اطلاعات ویکیپدیای قدیمی را دانلود کرده‌اید. میخواهید بایگانی شوند؟</string>
+    <string name="download_wikipedia_files">مایل هستید اطلاعات تکمیلی ویکیپدیا دانلود شود (%1$s مگابایت)؟</string>
+    <string name="download_wikipedia_item">ویکیپدیا</string>
+    <string name="local_indexes_cat_wiki">ویکیپدیا</string>
+    <string name="shared_string_show_details">نمایش جزییات</string>
+    <string name="lang_tl">تاگالوگ</string>
+    <string name="rendering_value_disabled_name">غیرفعال</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">رنگ‌بندی براساس حوزه مسیر</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">رنگ‌بندی براساس OSMC</string>
+    <string name="osmo_share_my_location">به اشتراک گذاری مکان من</string>
+    </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -85,7 +85,7 @@
 	<string name="poi_castle">Château</string>
 	<string name="poi_cave_entrance">Entrée de grotte</string>
 	<string name="poi_cemetery">Cimetière</string>
-	<string name="poi_chalet">Meublé de tourisme</string>
+	<string name="poi_chalet">Gîte rural</string>
 	<string name="poi_charging_station">Station de recharge</string>
 	<string name="poi_chemist">Magasin de produits d\'hygiène</string>
 	<string name="poi_city">Ville</string>
@@ -408,11 +408,11 @@
 	<string name="poi_interior_decoration">Boutique de décoration</string>
 	<string name="poi_lift_gate">Pont levant</string>
 	<string name="poi_border_control">Poste frontière</string>
-	<string name="poi_traffic_calming_table">Table</string>
+	<string name="poi_traffic_calming_table">Ralentisseur (plateau)</string>
 	<string name="poi_vehicle_inspection">Centre de contrôle technique automobile</string>
 	<string name="poi_pier">Jetée</string>
 	<string name="poi_surveillance">Surveillance</string>
-	<string name="poi_government">Gouvernement</string>
+	<string name="poi_government">Administration publique</string>
 	<string name="poi_pension_fund">Fond de pension</string>
 	<string name="poi_tax_inspection">Centre des impôts</string>
 	<string name="poi_blood_bank">Banque de sang</string>
@@ -486,7 +486,7 @@
 	<string name="poi_astronomical_observatory">Observatoire astronomique</string>
 	<string name="poi_orchard">Verger</string>
 	<string name="poi_prosecutor">Procureur</string>
-	<string name="poi_office_administrative">Centre administratif</string>
+	<string name="poi_office_administrative">Administration publique locale</string>
 	<string name="poi_seamark_rock">Rocher (amer)</string>
 	<string name="poi_distance_mark">Borne</string>
 	<string name="poi_craft_upholsterer">Tapissier</string>
@@ -513,7 +513,7 @@
 	<string name="poi_club_photography">Club de photographie</string>
 	<string name="poi_hot_spring">Source d\'eau chaude</string>
 	<string name="poi_geyser">Geyser</string>
-	<string name="poi_historic_monastery">Monastère historique</string>
+	<string name="poi_historic_monastery">Monastère désaffecté</string>
 	<string name="poi_fort">Fort</string>
 	<string name="poi_american_football">Football américain</string>
 	<string name="poi_bmx">BMX</string>
@@ -524,7 +524,7 @@
 	<string name="poi_occupational_therapist">Ergothérapeute</string>
 	<string name="poi_place_farm">Ferme</string>
 
-	<string name="poi_place_allotments">Lotissement</string>
+	<string name="poi_place_allotments">Jardins familiaux</string>
 	<string name="poi_power_plant">Centrale électrique</string>
 	<string name="poi_telephone_exchange">Central téléphonique</string>
 
@@ -621,9 +621,9 @@
 	<string name="poi_signal_station_warning">Station de signaux, avertissements</string>
 	<string name="poi_small_craft_facility">Facilité pour petites embarcations</string>
 	<string name="poi_military_nuclear_explosion_site">Site d\'essais nucléaires</string>
-<string name="poi_craft_carpet_layer">Couvreur de moquettes</string>
+<string name="poi_craft_carpet_layer">Poseur de moquettes</string>
 	<string name="poi_craft_parquet_layer">Couvreur de parquets</string>
-	<string name="poi_saddle">Selle</string>
+	<string name="poi_saddle">Col</string>
 	<string name="poi_tower">Tour</string>
 	<string name="poi_mast">Mât</string>
 	<string name="poi_radar">Radar</string>
@@ -651,9 +651,9 @@
 	<string name="poi_wine">Caviste</string>
 
 	<string name="poi_public_transport_stop_position">Arrêt de transports en commun</string>
-	<string name="poi_halt">Arrêt ferroviaire</string>
+	<string name="poi_halt">Gare ferroviaire (halte)</string>
 	<string name="poi_lodging">Hébergement</string>
-	<string name="poi_apartment">Appartement</string>
+	<string name="poi_apartment">Meublé de tourisme</string>
 
 	<string name="poi_internet_access_wlan">Accès Internet : sans-fil</string>
 	<string name="poi_internet_access_terminal">Accès Internet : terminal</string>
@@ -696,12 +696,12 @@
 	<string name="poi_silo">Silo</string>
 	<string name="poi_storage_tank">Réservoir de stockage</string>
 
-	<string name="poi_piste_downhill">Ski alpin</string>
-	<string name="poi_piste_nordic">Ski nordique</string>
-	<string name="poi_piste_skitour">Ski de randonnée</string>
-	<string name="poi_piste_hike">Randonnée</string>
-	<string name="poi_piste_sleigh">Traîneau</string>
-	<string name="poi_piste_sled">Luge</string>
+	<string name="poi_piste_downhill">Piste de ski alpin</string>
+	<string name="poi_piste_nordic">Piste de ski nordique</string>
+	<string name="poi_piste_skitour">Itinéraire de ski de randonnée</string>
+	<string name="poi_piste_hike">Chemin de randonnée</string>
+	<string name="poi_piste_sleigh">Piste pour chiens de traîneau</string>
+	<string name="poi_piste_sled">Piste de luge</string>
 	<string name="poi_piste_snow_park">Snow park</string>
 	<string name="poi_piste_playground">Jardin de neige</string>
 	<string name="poi_canal">Canal</string>
@@ -709,7 +709,7 @@
 	<string name="poi_valley">Vallée</string>
 	<string name="poi_water">Eau</string>
 	<string name="poi_wood">Bois</string>
-	<string name="poi_allotments">Lotissement</string>
+	<string name="poi_allotments">Jardins familiaux</string>
 	<string name="poi_fuel_octane_80">Octane 80</string>
 	<string name="poi_fuel_octane_91">Octane 91</string>
 	<string name="poi_fuel_octane_92">Octane 92</string>
@@ -724,7 +724,7 @@
 	<string name="poi_fuel_lh2">Hydrogène liquide</string>
 	<string name="poi_fuel_electricity">Électricité</string>
 	<string name="poi_fuel_e10">E10</string>
-	<string name="poi_farmyard">Cour de ferme</string>
+	<string name="poi_farmyard">Ferme</string>
 	<string name="poi_meadow">Prairie</string>
 	<string name="poi_recreation_ground">Terrain de jeu</string>
 	<string name="poi_industrial">Zone industrielle</string>
@@ -742,14 +742,14 @@
 	<string name="poi_fuel_svo">Huile Végétale Brute (HVB)</string>
 	<string name="poi_junction">Carrefour</string>
 	<string name="poi_forest">Sylviculture</string>
-	<string name="poi_landuse_railway">Zone de chemins de fer</string>
+	<string name="poi_landuse_railway">Zone ferroviaire</string>
 
-	<string name="poi_village_green">Village vert</string>
+	<string name="poi_village_green">Village green (GB)</string>
 
 	<string name="poi_sailing">Navigation à voile</string>
 	<string name="poi_charity">Boutique de charité</string>
 	<string name="poi_tomb">Sépulture</string>
-	<string name="poi_wilderness_hut">Cabane en pleine nature</string>
+	<string name="poi_wilderness_hut">Cabane - refuge</string>
 
 	<string name="poi_payment_terminal">Terminal de paiement</string>
 	<string name="poi_piste">Piste</string>
@@ -760,10 +760,10 @@
 	<string name="poi_ski_resort">Station de ski</string>
 	<string name="poi_general_tourist_attraction_yes">Attraction touristique</string>
 	<string name="poi_cabin">Cabine</string>
-	<string name="poi_lean_to">Appentis</string>
+	<string name="poi_lean_to">Cabane</string>
 	<string name="poi_hunting_lodge">Pavillon de chasse</string>
 
-	<string name="poi_picnic_table">Table de picnic</string>
+	<string name="poi_picnic_table">Table de pique-nique</string>
 	<string name="poi_wine_cellar">Cave à vin</string>
 	<string name="poi_winery">Établissement viticole</string>
 
@@ -819,7 +819,7 @@
 	<string name="poi_wiki_lang_te">Wiki télougou</string>
 	<string name="poi_wiki_lang_th">Wiki thaïlandais</string>
 	<string name="poi_camera">Appareils photos et lentilles</string>
-	<string name="poi_religious">Zone religieuse</string>
+	<string name="poi_religious">Lieu de culte</string>
 	<string name="poi_barrier_entrance">Entrée</string>
 	<string name="poi_entrance_main">Entrée principale</string>
 	<string name="poi_entrance">Entrée</string>
@@ -855,7 +855,7 @@
 	<string name="poi_free_flying">Magasin d\'articles de vol libre</string>
 	<string name="poi_furnace">Boutique d\'articles de chauffage</string>
 	<string name="poi_leather">Boutique de cuir</string>
-	<string name="poi_energy">Réservoir d\'énergie</string>
+	<string name="poi_energy">Commerce de fourniture d\\\'énergie</string>
 	<string name="poi_pyrotechnics">Pyrotechnie</string>
 	<string name="poi_weapons">Armurerie</string>
 
@@ -898,15 +898,15 @@
 	<string name="poi_operator">Opérateur</string>
 	<string name="poi_brand">Marque</string>
 
-	<string name="poi_enforcement_traffic_signals">Réglementation : feux de signalisation</string>
-	<string name="poi_enforcement_maxspeed">Réglementation : vitesse maximale</string>
-	<string name="poi_enforcement_maxheight">Réglementation : hauteur maximale</string>
-	<string name="poi_enforcement_mindistance">Réglementation : distance minimale</string>
-	<string name="poi_enforcement_check">Réglementation : contrôle</string>
-	<string name="poi_enforcement_access">Réglementation : accès</string>
-	<string name="poi_enforcement_toll">Réglementation : péage</string>
+	<string name="poi_enforcement_traffic_signals">Contrôle routier : feux de signalisation</string>
+	<string name="poi_enforcement_maxspeed">Contrôle routier : vitesse maximale</string>
+	<string name="poi_enforcement_maxheight">Contrôle routier : hauteur maximale</string>
+	<string name="poi_enforcement_mindistance">Contrôle routier : distance minimale</string>
+	<string name="poi_enforcement_check">Contrôle routier</string>
+	<string name="poi_enforcement_access">Contrôle routier : accès</string>
+	<string name="poi_enforcement_toll">Contrôle routier : péage</string>
 
-<string name="poi_groyne">Épi (maritime/fluviale)</string>
+<string name="poi_groyne">Épi</string>
 
 	<string name="poi_cutline">Layon de cloisonnement</string>
 	<string name="poi_full_height_turnstile">Tourniquet pleine hauteur</string>
@@ -915,7 +915,97 @@
 	<string name="poi_bus_trap">Passe à bus</string>
 	<string name="poi_rwn_ref">Réseau régional de randonnée pédestre</string>
 	<string name="poi_country">Pays</string>
-	<string name="poi_fee">Tarif</string>
+	<string name="poi_fee_yes">Tarif</string>
+
+	<string name="poi_abandoned_poi">Structure à l\\\'abandon</string>
+	<string name="poi_access_private">Propriété privée</string>
+	<string name="poi_access_no">Accès interdit</string>
+	<string name="poi_access_permissive">Accès autorisé</string>
+	<string name="poi_access_customers">Accès réservé aux clients</string>
+	<string name="poi_access_delivery">Accès réservé aux livraisons</string>
+	<string name="poi_recycling_glass">Verre</string>
+	<string name="poi_recycling_paper">Papier</string>
+	<string name="poi_recycling_clothes">Vêtements</string>
+	<string name="poi_recycling_glass_bottles">Bouteilles en verre</string>
+	<string name="poi_recycling_plastic">Plastique</string>
+	<string name="poi_recycling_batteries">Batteries</string>
+	<string name="poi_recycling_plastic_bottles">Bouteilles en plastique</string>
+	<string name="poi_recycling_newspaper">Journaux</string>
+	<string name="poi_recycling_cartons">Cartons</string>
+	<string name="poi_recycling_wood">Bois</string>
+	<string name="poi_recycling_books">Livres</string>
+	<string name="poi_recycling_shoes">Chaussures</string>
+	<string name="poi_recycling_aluminium">Aluminium</string>
+	<string name="poi_recycling_metal">Métal</string>
+	<string name="poi_recycling_engine_oil">Huile de moteur</string>
+	<string name="poi_recycling_cooking_oil">Huile de cuisine</string>
+	<string name="poi_recycling_mobile_phones">Téléphones mobiles</string>
+	<string name="poi_recycling_computers">Ordinateurs</string>
+	<string name="poi_recycling_tyres">Pneus</string>
+	<string name="poi_recycling_cds">CDs</string>
+	<string name="poi_recycling_bottles">Bouteilles</string>
+	<string name="poi_recycling_printer_cartridges">Cartouches d\'encre</string>
+	<string name="poi_recycling_compost">Compost</string>
+	<string name="poi_recycling_drugs">Médicaments</string>
+	<string name="poi_recycling_christmas_trees">Arbres de Noël</string>
+	<string name="poi_recycling_polyester">Polyester</string>
+	<string name="poi_recycling_car_batteries">Batteries automobiles</string>
+	<string name="poi_recycling_cars">Automobiles</string>
+	<string name="poi_recycling_bicycles">Bicyclettes</string>
+
+	<string name="poi_shower">Douche</string>
+	<string name="poi_email">Email</string>
+	<string name="poi_fax">Fax</string>
+	<string name="poi_facebook">Facebook</string>
+	<string name="poi_drinking_water_yes">Eau potable</string>
+	<string name="poi_drinking_water_no">Eau non potable</string>
+	<string name="poi_seasonal_no">Permanent</string>
+	<string name="poi_seasonal_yes">Saisonnier</string>
+	<string name="poi_seasonal_wet_season">Saison humide</string>
+	<string name="poi_seasonal_dry_season">Saison sèche</string>
+	<string name="poi_seasonal_spring">Printemps</string>
+	<string name="poi_seasonal_summer">Eté</string>
+	<string name="poi_seasonal_autumn">Automne</string>
+	<string name="poi_seasonal_winter">Hiver</string>
+	<string name="poi_animal_shelter_dog">Refuge pour chiens (chenil)</string>
+	<string name="poi_animal_shelter_cat">Refuge pour chats</string>
+	<string name="poi_animal_shelter_dog_cat">Refuge pour chiens et chats</string>
+	<string name="poi_animal_shelter_bird">Refuge pour oiseaux</string>
+
+<string name="poi_recycling_centre">Centre</string>
+	<string name="poi_recycling_container">Containeur</string>
+	<string name="poi_recycling_plastic_packaging">Emballage plastique</string>
+	<string name="poi_recycling_paper_packaging">Emballage en papier</string>
+	<string name="poi_recycling_fluorescent_tubes">Tubes fluorescents</string>
+	<string name="poi_recycling_electrical_items">Appareils électriques</string>
+	<string name="poi_recycling_plastic_bags">Sacs en plastique</string>
+	<string name="poi_recycling_tetrapak">Tetrapak</string>
+	<string name="poi_recycling_paint">Peinture</string>
+	<string name="poi_hiking_routes">Chemins de randonnée</string>
+		<string name="poi_recycling_cans">Boites de conserve</string>
+	<string name="poi_recycling_green_waste">Déchets verts</string>
+	<string name="poi_recycling_garden_waste">Déchets de jardin</string>
+	<string name="poi_recycling_hazardous_waste">Déchets dangereux</string>
+	<string name="poi_recycling_tv_monitor">Télévisions, écrans</string>
+	<string name="poi_recycling_rubble">Gravats</string>
+	<string name="poi_recycling_waste_oil">Huile usagée</string>
+	<string name="poi_recycling_cork">Bouchons</string>
+	<string name="poi_recycling_sheet_metal">Feuille métallique</string>
+	<string name="poi_recycling_animal_waste">Déchets animaliers</string>
+	<string name="poi_recycling_furniture">Meubles</string>
+	<string name="poi_recycling_diapers">Couches</string>
+	<string name="poi_route_hiking_iwn_poi">Chemin de randonnée international</string>
+	<string name="poi_route_hiking_nwn_poi">Chemin de randonnée national</string>
+	<string name="poi_route_hiking_rwn_poi">Chemin de randonnée régional</string>
+	<string name="poi_route_hiking_lwn_poi">Chemin de randonnée local</string>
+	<string name="poi_fee_no">Gratuit</string>
+	<string name="poi_supervised_yes">Surveillé</string>
+	<string name="poi_supervised_no">Non surveillé</string>
+	<string name="poi_monitoring_station">Station de contrôle</string>
+	<string name="poi_traffic_enforcement">Contrôle routier</string>
+	<string name="poi_access_destination">Accès autorisé pour les riverains</string>
+	<string name="poi_crossing_traffic_signals">Avec feux de circulation</string>
+	<string name="poi_crossing_uncontrolled">Sans feux de circulation</string>
+	<string name="poi_crossing_unmarked">Sans marquage au sol, ni feux</string>
 
-	<string name="poi_abandoned_poi">Objet abandonné</string>
 	</resources>

OsmAnd/res/values-fr/strings.xml

@@ -998,7 +998,7 @@
 \nCoucher : %2$s</string>
 <string name="day_night_info">Information jour/nuit</string>
 <string name="filterpoi_activity">Créer un filtre des PI</string>
-<string name="map_widget_renderer">Style de carte</string>
+<string name="map_widget_renderer">Style de la carte</string>
 <string name="int_continuosly">En continu</string>
 <string name="tip_rotation_switching_t_v2">"Vous pouvez modifier l\'orientation de la carte par un appui court sur l\'icône de la boussole
 \n\tLes choix sont :
@@ -1451,7 +1451,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="app_mode_aircraft">Avion</string>
     <string name="app_modes_choose_descr">Choisir les profils d\'utilisation à afficher dans l\'application</string>
     <string name="app_modes_choose">Profils d\'application</string>
-	<string name="map_widget_map_rendering">Affichage de la carte</string>
+	<string name="map_widget_map_rendering">Rendu de la carte</string>
     <string name="amenity_type_seamark">Balise marine</string>
     
     
@@ -1749,7 +1749,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="rendering_attr_showAccess_name">Afficher les restrictions d\'accès</string>
     <string name="rendering_attr_showSurfaceGrade_name">Afficher la qualité des routes</string>
     <string name="rendering_attr_showSurfaces_name">Afficher la surface des routes</string>
-    <string name="rendering_attr_showCycleRoutes_name">Afficher les pistes cyclables</string>
+    <string name="rendering_attr_showCycleRoutes_name">Afficher les itinéraires cyclables</string>
     <string name="lang_fa">perse</string>
 	<string name="lang_al">albanais</string>
 	<string name="lang_ar">arabe</string>
@@ -1762,11 +1762,11 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="osmo_specify_tracker_id">Veuillez spécifier l\'identifiant</string>
     <string name="continue_navigation">Reprendre la navigation</string>
     <string name="pause_navigation">Interrompre la navigation</string>
-	<string name="rendering_attr_subwayMode_name">Itinéraires de métropolitain</string>
- 	<string name="rendering_attr_alpineHiking_name">Difficulté des randonnées en montagne</string>
-    <string name="rendering_attr_alpineHiking_description">Afficher les chemins selon l\'échelle SAC</string>
-    <string name="rendering_attr_hikingRoutesOSMC_name">Surcouche de symboles de rando</string>
-    <string name="rendering_attr_hikingRoutesOSMC_description">Afficher les chemins selon les traces OSMC</string>
+	<string name="rendering_attr_subwayMode_name">Lignes de métro</string>
+ 	<string name="rendering_attr_alpineHiking_name">Difficulté des chemins de randonnée (échelle CAS)</string>
+    <string name="rendering_attr_alpineHiking_description">Afficher la difficulté des chemins selon l\'échelle du CAS</string>
+    <string name="rendering_attr_hikingRoutesOSMC_name">Afficher les itinéraires pédestres</string>
+    <string name="rendering_attr_hikingRoutesOSMC_description">Afficher les itinéraires pédestres</string>
     
 	<string name="rendering_attr_coloredBuildings_name">Bâtiments colorés par type</string>
     <string name="arrival_distance_factor_early">Tôt</string>
@@ -1797,7 +1797,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="int_hour">h</string>
     <string name="duration">Durée</string>
     <string name="distance">Distance</string>
-    <string name="rendering_attr_publicTransportMode_name">Itinéraires de bus, tramways, et navettes</string>
+    <string name="rendering_attr_publicTransportMode_name">Lignes de bus, tramways, et navettes</string>
 	<string name="save_track_to_gpx_globally">Enregistrer l\'itinéraire dans un fichier GPX</string>
 	<string name="save_track_to_gpx_globally_descr">L\'enregistrement des positions dans un fichier GPX peut être activé ou désactivé depuis le gadget de la carte</string>
 	<string name="save_track_interval_globally">Intervalle d\'enregistrement</string>
@@ -1828,8 +1828,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="anonymous_user">Utilisateur anonyme</string>
     <string name="logged_as">Connecté entant que %1$s</string>
 	<string name="rendering_category_details">Détails</string>
-    <string name="rendering_category_transport">Transport</string>
-    <string name="rendering_category_others">Autres éléments de la carte</string>
+    <string name="rendering_category_transport">Transports en commun</string>
+    <string name="rendering_category_others">Autres caractéristiques de la carte</string>
     <string name="map_widget_appearance_rem">Éléments restants</string>
     <string name="map_widget_top">Barre d\'état</string>
 	<string name="map_widget_right">Panneau de droite</string>
@@ -1837,14 +1837,14 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="shared_string_show">Afficher</string>
 	<string name="configure_map">Configurer la carte</string>
     <string name="search_radius_proximity">A proximité de</string>
-    <string name="rendering_category_routes">Routes</string>
+    <string name="rendering_category_routes">Itinéraires</string>
     <string name="tip_recent_changes_1_9_t">"Nouveautés de la version 1.9 : * Mise à jour des styles de cartes faisant état de la nature du revêtement routier, calques de transports public et de symboles de randonnées pédestres * Recherche de PI le long de l\'itinéraire * Marquage temporaire d\'une route non praticable * Amélioration du téléchargement et des mises à jour des cartes * Notification auditive et visuelle à l\'approche des points de passage * Impression de l\'itinéraire détaillé * Gestion des listes de bifurcation * Supporte Android Wear * Nombreuses modifications de l\'interface * Zoom séparé pour la taille du texte de la carte * Notification audible spéciale en cas de hors route * Fonction de connexion OsMo * Corrections des problèmes d\'incompatibilité de versions pour OsMo "</string>
     <string name="rendering_attr_busRoutes_name">Lignes de bus</string>
     <string name="rendering_attr_trolleybusRoutes_name">Lignes de tramway</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Itinéraires de chemin de fer</string>
     <string name="rendering_attr_tramRoutes_name">Voies de tramway</string>
     <string name="rendering_attr_shareTaxiRoutes_name">Voies partagées pour les taxi</string>
-    <string name="rendering_attr_tramTrainRoutes_name">Itinéraires de tramway et train</string>
+    <string name="rendering_attr_tramTrainRoutes_name">Lignes de tramway et train</string>
     
     <string name="impassable_road">Évitez les routes…</string>
     <string name="rendering_category_hide">Masquer</string>
@@ -1880,7 +1880,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="dash_download_msg">Vous avez téléchargé %1$s carte(s)</string>
     <string name="dash_download_new_one">Télécharger une nouvelle carte</string>
     <string name="dash_download_manage">Gérer</string>
-    <string name="rendering_attr_roadStyle_name">Style de route</string>
+    <string name="rendering_attr_roadStyle_name">Style des routes</string>
     <string name="rendering_value_default_name">Par défaut</string>
     <string name="rendering_value_orange_name">Orange</string>
     <string name="traffic_warning_railways">Passage à niveau</string>
@@ -1943,15 +1943,14 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="share_note">Partager la note</string>
 	
 	<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 (ventilées par difficultés grâce à des codes couleurs) ou les remontées mécaniques.\n\nCet affichage peut être annulé soit en le désactivant ici soit en modifiant le Style de carte sous \"Configurer la carte\". "</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, quelque soit le niveau de zoom, fournit le maximum de détails disponibles. Chaque type de route (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 des pistes 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 carte sous \"Configurer la carte\". "</string>
+\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.
-		\n\nUne carte marine mondiale est disponible en une seul téléchargement nommé \"Carte marine\".
-		\n\nCet affichage peut être annulé soit en le désactivant ici soit en modifiant le Style de carte sous \"Configurer la carte\".
-	</string>
+	<string name="plugin_nautical_descr">"Activer cette vue bascule vers le style \"Nautique\", affichant une carte avec le balisage pour la navigation.
+\n\nUne carte marine mondiale est disponible en un seul téléchargement nommé \"Carte marine\".
+\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="location_on_map">Position :\n Lat. %1$s\n Lon. %2$s</string>
 	<string name="days_behind">jours passés</string>
 	<string name="rename_failed">Échec du renommage.</string>
@@ -2018,7 +2017,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="search_poi_category_hint">Rechercher partout</string>
     <string name="index_name_netherlands">Europe - Pays-Bas</string>
 	<string name="rendering_value__name">Par défaut</string>
-    <string name="rendering_value_highContrastRoads_name">Routes en contraste élevé</string>
+    <string name="rendering_value_highContrastRoads_name">Routes avec fort contraste</string>
 	<string name="specified_directiory_not_writeable">Impossible de créer les cartes dans le dossier spécifié</string>
 	<string name="copying_osmand_file_failed">Échec lors de la copie des fichiers</string>    
     <string name="storage_directory_external">Stockage externe</string>
@@ -2039,8 +2038,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 <string name="osmo_share_my_location">Partager ma position</string>
     <string name="shared_string_logoff">Se déconnecter</string>
     <string name="rendering_value_disabled_name">Désactivé</string>
-    <string name="rendering_value_walkingRoutesOSMC_name">Balisage couleur du terrain</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Représentation selon la granularité du réseau</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">Couleur de l\'itinéraire selon OSMC</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">Couleur selon l\'étendue de l\'itinéraire</string>
     <string name="osm_edit_context_menu_delete">Supprimer la modification OSM</string>    
     <string name="shared_string_show_details">Afficher les détails</string>
     <string name="read_full_article">Lire l\'article complet (en ligne)</string>
@@ -2077,8 +2076,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="archive_wikipedia_data">Le format de vos données Wikipédia hors-ligne est obsolète. Voulez-vous archiver ces données ?</string>
     <string name="lang_te">Télougou</string>
     <string name="restart_is_required">Afin de prendre en compte toutes vos modifications, vous devez redémarrer l\'application.</string>
-    <string name="rendering_attr_currentTrackColor_name">Couleur GPX</string>
-    <string name="rendering_attr_currentTrackWidth_name">Largeur GPX</string>
+    <string name="rendering_attr_currentTrackColor_name">Couleur des traces GPX</string>
+    <string name="rendering_attr_currentTrackWidth_name">Largeur des traces GPX</string>
     <string name="rendering_value_red_name">Rouge</string>
     <string name="rendering_value_translucent_red_name">Rouge translucide</string>
     <string name="rendering_value_translucent_orange_name">Orange translucide</string>
@@ -2106,4 +2105,20 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="lang_tl">Tagalog</string>
     <string name="rendering_value_default13_name">Par défaut (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Par défaut (cyan translucide)</string>
+    <string name="do_you_like_osmand">Aimez-vous OsmAnd ?</string>
+	<string name="rate_this_app">Évaluer cette application</string>
+	<string name="rate_this_app_long">Merci d\'évaluer OsmAnd sur Google Play</string>
+	<string name="user_hates_app_get_feedback">Indiquez-nous pourquoi.</string>
+	<string name="user_hates_app_get_feedback_long">Merci de nous faire part de ce que vous voudriez améliorer dans cette application.</string>
+<string name="we_really_care">Nous sommes très attentifs</string>
+	<string name="download_live_updates">Mise à jour automatique</string>
+	<string name="failed_to_upload">Erreur lors de l\'envoi</string>
+	<string name="delete_change">Supprimer les modifications</string>
+	<string name="successfully_uploaded_pattern">Envoi avec succès {0}/{1}</string>
+	<string name="try_again">Merci de re-essayer</string>
+	<string name="error_message_pattern">Erreur : {0}</string>
+<string name="no_updates_available">Aucune mise à jour disponible</string>
+    <string name="we_really_care_about_your_opinion">Nous prêtons beaucoup d\'attention à vos avis, merci pour vos retours.</string>
+	<string name="rendering_value_boldOutline_name">Contour épaissi</string>
+    <string name="traffic_warning_hazard">Danger</string>
     </resources>

OsmAnd/res/values-hu/strings.xml

@@ -2022,4 +2022,19 @@
     <string name="rendering_value_red_name">Piros</string>
     <string name="rendering_value_default13_name">Alapértelmezett (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Alapértelmezett (átlátszó cián)</string>
+    <string name="do_you_like_osmand">Hogy tetszik az OsmAnd?</string>
+	<string name="we_really_care">Minket valóban érdekel</string>
+	<string name="rate_this_app">Értékelje az alkalmazást</string>
+	<string name="user_hates_app_get_feedback">Mondja el, hogy miért.</string>
+	<string name="user_hates_app_get_feedback_long">Mondja el nekünk, hogy mit változtatna az alkalmazáson.</string>
+<string name="rate_this_app_long">Adjon egy pontot az OsmAnd programnak a Google Play áruházban</string>
+	<string name="download_live_updates">Élő frissítések</string>
+	<string name="no_updates_available">Nem érhetők el frissítések</string>
+    <string name="we_really_care_about_your_opinion">Sokat adunk a véleményére és fontos nekünk, hogy visszahalljuk.</string>
+	<string name="failed_to_upload">Nem sikerült feltölteni</string>
+	<string name="delete_change">Változtatás törlése</string>
+	<string name="successfully_uploaded_pattern">Sikeresen feltöltve: {0}/{1}</string>
+	<string name="try_again">Próbálja újra</string>
+	<string name="error_message_pattern">Hiba: {0}</string>
+<string name="rendering_value_boldOutline_name">Félkövér körvonal</string>
     </resources>

OsmAnd/res/values-it/phrases.xml

@@ -350,7 +350,7 @@
 	<string name="poi_traffic_calming_cushion">Cuscini rallentatori</string>
 	<string name="poi_traffic_calming_table">Dosso tavola</string>
 	<string name="poi_traffic_calming_choker">Restringimento di carreggiata rallentatore</string>
-	<string name="poi_traffic_signals">Luce di stop</string>
+	<string name="poi_traffic_signals">Semaforo</string>
 
 	<string name="poi_vehicle_ramp">Rampa per veicoli</string>
 	<string name="poi_tram_stop">Fermata tram (absoleta)</string>
@@ -670,4 +670,46 @@
 	<string name="poi_crane">Gru</string>
 	<string name="poi_industrial">Area industriale</string>
 	<string name="poi_bell_tower">Torre campanaria</string>
+	<string name="poi_water_transport">Trasporto su acqua</string>
+		<string name="poi_bicycle_transport">Trasporto su bici</string>
+		<string name="poi_aerialway_transport">Trasporto aereo</string>
+		<string name="poi_node_networks">Nodo ciclistico/pedonale</string>
+		<string name="poi_hiking_routes">Percorso pedonale</string>
+		<string name="poi_power">Energia</string>
+		<string name="poi_communication">Comunicazioni</string>
+		<string name="poi_landuse">Uso del terreno</string>
+	<string name="poi_sustenance">Cibo</string>
+	<string name="poi_cafe_and_restaurant">Caffè e ristorante</string>
+	<string name="poi_craft">Artigiano</string>
+	<string name="poi_natural">Natura</string>
+	<string name="poi_seamark">Nautico</string>
+	<string name="poi_user_defined_other">Definito dall\'utente</string>
+
+	<string name="poi_cheese">Negozio di latticini</string>
+	<string name="poi_wine"/>
+
+	<string name="poi_camera">Foto-ottica</string>
+	<string name="poi_candles">Negozio di candele</string>
+	<string name="poi_leather">Negozio di pelletteria</string>
+	<string name="poi_music">Negozio di musica</string>
+	<string name="poi_tyres">Gommista</string>
+	<string name="poi_watches">Negozio di orologi</string>
+	<string name="poi_games">Giochi</string>
+	<string name="poi_model">Negozio di modellistica</string>
+	<string name="poi_video_games">Videogiochi</string>
+	<string name="poi_pyrotechnics">Fuochi d\'artifico</string>
+	<string name="poi_weapons">Armeria</string>
+
+	<string name="poi_fuel_biodiesel">Bio-diesel</string>
+	<string name="poi_fuel_lpg">GPL</string>
+	<string name="poi_fuel_octane_80">80 ottani</string>
+	<string name="poi_fuel_octane_91">91 ottani</string>
+	<string name="poi_fuel_octane_92">92 ottani</string>
+	<string name="poi_fuel_octane_95">95 ottani</string>
+	<string name="poi_fuel_octane_98">98 ottani</string>
+	<string name="poi_fuel_octane_100">100 ottani</string>
+	<string name="poi_fuel_ethanol">Etanolo</string>
+	<string name="poi_fuel_methanol">Metanolo</string>
+	<string name="poi_observation_tower">Torre di osservazione</string>
+	<string name="poi_landuse_railway">Area ferroviaria</string>
 	</resources>

OsmAnd/res/values-it/strings.xml

@@ -1408,7 +1408,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="auto_zoom_far">A medio raggio</string>
     <string name="auto_zoom_farthest">A lungo raggio</string>
     
-    <string name="animate_routing_route_not_calculated">Per favore, calcolare il percorso prima</string>
+    <string name="animate_routing_route_not_calculated">Per favore calcolare il percorso prima</string>
     <string name="animate_routing_route">Simula sulla base di un percorso calcolato </string>
     <string name="animate_routing_gpx">Simula usando una traccia GPX</string>
     <string name="edit_tilesource_elliptic_tile">Mercatore ellittico</string>
@@ -1538,7 +1538,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="navigation_intent_invalid">Formato non valido: %s</string>
 <string name="osmo_settings_uuid">ID univoco del dispositivo</string>
     <string name="osmo_settings_descr">Configura le impostazioni di monitoraggio e imposta il canale di monitoraggio personale</string>
-    <string name="osmo_plugin_description">"Questo componente aggiuntivo fornisce le funzionalità per  il monitoraggio avanzato in diretta OsMo, vedi http://osmo.mobi.\n\nPuoi tracciare altri dispositivi ed essere tracciato. Puoi creare gruppo anonimo autonomamente, condividere reciprocamente la posizione e comunicarla. Viene fornito con varie opzioni di monitoraggio della sessione in corso o permanentemente.\n\nI gruppi anonimi sono limitati a un numero specifico di giorni e alcune funzioni es. non c\'è il controllo remoto e l\'amministratore del gruppo. Gruppi con tutte le funzionalità possono essere creati dal sito e solo gli utenti registrati possono accedervi. "</string>
+    <string name="osmo_plugin_description">"Questo componente aggiuntivo fornisce le funzionalità del cosiddetto monitoraggio avanzato in diretta OsMo, vedi http://osmo.mobi.\n\nPuoi tracciare in tempo reale tutti i dispositivi di un gruppo di partecipanti e comunicare con loro. Viene fornito con varie opzioni di monitoraggio della sessione in corso o permanentemente.\n\nI gruppi anonimi possono essere creati autonomamente per uno specifico numero di giorni e sono limitati ad alcune funzioni, es. non ci sono controllo remoto e l\'amministratore del gruppo. Gruppi con tutte le funzionalità possono essere creati dal sito e solo gli utenti registrati possono accedervi. "</string>
     <string name="osmo_plugin_name">OsMo (monitoraggio OSM)</string>
     <string name="osmo_settings">OsMO</string>
    	<string name="keep_informing_never">Solo manualmente (tap sulla freccia)</string>
@@ -1701,7 +1701,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="lang_sw">Swahili</string>
     <string name="forward">Avanti</string>
     <string name="home">Casa</string>
-    <string name="live_monitoring_m_descr">Invia i dati di tracciamento a un specifico servizio web se la registrazione GPX è abilitata.</string>
+    <string name="live_monitoring_m_descr">Invia i dati di tracciamento a uno specifico servizio web se la registrazione GPX è abilitata.</string>
 	<string name="live_monitoring_m">Tracciamento online (GPX richiesto)</string>
     <string name="live_monitoring_start">Avvia il tracciamento online</string>
 	<string name="live_monitoring_stop">Ferma il tracciamento online</string>
@@ -1839,7 +1839,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="dash_download_new_one">Scarica una nuova mappa</string>
     <string name="dash_download_manage">Gestisci</string>
     <string name="rendering_attr_roadStyle_name">Stile disegno delle strade</string>
-    <string name="rendering_value_default_name">Preimpostato</string>
+    <string name="rendering_value_default_name">Predefinito</string>
     <string name="rendering_value_orange_name">Arancione</string>
     <string name="rendering_value_germanRoadAtlas_name">Atlante strade tedesche</string>
     <string name="rendering_value_americanRoadAtlas_name">Atlante strade americane</string>
@@ -1896,7 +1896,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 		\n\nÈ disponibile la mappa contenente tutta la simbologia nautica come singolo download sotto il nome \"World seamarks\".
 		\n\nCiò può essere invertito sia disattivandolo nuovamente da qui che cambiando lo \'Stile della mappa\' in \' Configura mappa\' come desiderato.
 	</string>
-	<string name="plugin_ski_descr">"Questo plugin per OsmAnd ti mette a portata di mano i dettagli delle piste da sci di fondo e alpino mondiali, funivie e ski lift di tutto il mondo. I percorsi e le piste vengono codificate per colore in base alla difficoltà, e raffigurate in uno stile mappa speciale \'Inverno\', che sembra un paesaggio imbiancato dalla neve.\n\nAttivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostrando tutte le caratteristiche dello scenario nelle condizioni invernali. Questa visualizzazione può essere ripristinata sia disattivata nuovamente da qui cambiando lo \'Stile della mappa\' in \'Configura mappa\' come desiderato. "</string>
+	<string name="plugin_ski_descr">"Questo plugin per OsmAnd ti mette a portata di mano i dettagli delle piste da sci di fondo e alpino mondiali, funivie e ski lift di tutto il mondo. I percorsi e le piste vengono codificate per colore in base alla difficoltà e raffigurate in uno stile mappa speciale \'Inverno\', che sembra un paesaggio imbiancato dalla neve.\n\nAttivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostrando tutte le caratteristiche dello scenario nelle condizioni invernali. Questa visualizzazione può essere ripristinata o disattivata nuovamente da qui o cambiando lo \'Stile della mappa\' in \'Configura mappa\' come desiderato. "</string>
 	<string name="plugin_touringview_descr">"Attivando questa visualizzazione lo stile della mappa cambierà in \'Vista turistica\', questa è una visualizzazione speciale particolarmente dettagliata per i turisti e autisti professionali.
 \n\nQuesta visualizzazione fornisce, per ogni livello di zoom, il massimo dei dettagli di viaggio disponibili nei dati della mappa (particolari delle strade, sentieri e segni di orientamento).
 \n\nRappresenta anche chiaramente tutte le strade ambigue tramite la colorazione distintiva, ciò risulta utile per esempio guidando autoveicoli di grandi dimensioni.
@@ -2058,13 +2058,13 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="shared_string_logoff">Esci</string>
     <string name="rendering_value_disabled_name">Disabilitato</string>
     <string name="rendering_value_walkingRoutesScopeOSMC_name">Colorazione in base al tipo di percorso</string>
-    <string name="rendering_value_walkingRoutesOSMC_name">Colorazione in accordo a OSMC</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">Colorazione in base a OSMC</string>
     <string name="osm_edit_context_menu_delete">Cancella le modifiche OSM</string>
     <string name="archive_wikipedia_data">Ci sono dati Wikipedia scaricati desueti e incompatibili. Vuoi archiviarli?</string>
-    <string name="download_wikipedia_files">Vuoi scaricare dati Wikipedia aggiuntivi (%1$s MB) ?</string>
+    <string name="download_wikipedia_files">Vuoi scaricare i dati aggiuntivi di Wikipedia (%1$s MB) ?</string>
     <string name="gps_network_not_enabled">Il servizio di localizzazione non è attivo. Vuoi avviarlo?</string>
     <string name="disable_recording_once_app_killed">Previeni il login remoto</string>
-    <string name="disable_recording_once_app_killed_descrp">"Metterà in pausa la registrazione GPX quando l\'app viene terminata (attraverso le app recenti). (L\'indicatore della modalità OsmAnd quiescente  scomparirà dalla barra delle notifiche Android.)"</string>
+    <string name="disable_recording_once_app_killed_descrp">Metterà in pausa la registrazione GPX quando l\'app viene chiusa (attraverso le app recenti). (L\'indicatore della modalità quiescente di OsmAnd sparisce dalla barra delle notifiche di Android.)</string>
     <string name="shared_string_import2osmand">Importa in OsmAnd</string>
     <string name="read_full_article">Leggi l\'articolo intero (online)</string>
     <string name="download_wikipedia_item">Wikipedia</string>
@@ -2123,4 +2123,20 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="rendering_value_defaultTranslucentCyan_name">Default (Ciano traslucido)</string>
     <string name="rendering_value_red_name">Rosso</string>
     <string name="lang_ht">Haitiano</string>
+    <string name="do_you_like_osmand">Ti piace OsmAnd?</string>
+	<string name="we_really_care">Ci teniamo molto</string>
+	<string name="rate_this_app">Valuta questa app</string>
+	<string name="user_hates_app_get_feedback">Dicci perché.</string>
+	<string name="rate_this_app_long">Per favore dai a OsmAnd la tua valutazione su Google Play</string>
+	<string name="user_hates_app_get_feedback_long">Per favore dicci cosa vorresti cambiare in quest\'app.</string>
+<string name="download_live_updates">Aggiornamenti automatici</string>
+	<string name="failed_to_upload">Caricamento fallito</string>
+	<string name="delete_change">Cancella le modifiche</string>
+	<string name="successfully_uploaded_pattern">Caricato con successo {0}/{1}</string>
+	<string name="try_again">Riprova</string>
+	<string name="error_message_pattern">Errore: {0}</string>
+<string name="no_updates_available">Non ci sono aggiornamenti disponibili</string>
+    <string name="we_really_care_about_your_opinion">Ci teniamo molto alla tua opinione, è molto importante avere un tuo rimando.</string>
+	<string name="rendering_value_boldOutline_name">Contorno in grassetto</string>
+    <string name="traffic_warning_hazard">Pericolo</string>
     </resources>

OsmAnd/res/values-ja/strings.xml

@@ -868,7 +868,7 @@ POIの更新は利用できません</string>
 	<string name="rendering_attr_roadColors_description">道路の配色を選択します:</string>
 	<string name="rendering_attr_roadColors_name">道路の配色</string>
     <string name="map_widget_show_destination_arrow">目的地の方向を表示</string>
-    <string name="enable_plugin_monitoring_services">位置記録サービスを(GPX記録、オンライン追跡)を使用するようにトラッキングプラグインを有効化</string>
+    <string name="enable_plugin_monitoring_services">位置記録サービスを(GPXログ、オンライン追跡)を使用する為に旅行記録プラグインを有効化</string>
     <string name="non_optimal_route_calculation">長距離向けに非最適化ルートで計算</string>
 	<string name="gps_not_available">設定でGPSを有効にしてください</string>
     <string name="map_widget_monitoring_services">ログ保存サービス</string>
@@ -934,7 +934,7 @@ POIの更新は利用できません</string>
 	
 	
 	<string name="map_widget_parking">駐車場</string>
-	<string name="map_widget_monitoring">GPXの記録</string>
+	<string name="map_widget_monitoring">GPXログ</string>
 	<string name="map_widget_speed">速度</string>
 	<string name="map_widget_distance">目的地</string>
 	<string name="map_widget_altitude">高度</string>
@@ -980,7 +980,7 @@ POIの更新は利用できません</string>
 	<string name="osmand_parking_pm">午後</string>
 	<string name="osmand_parking_am">午前</string>
 	<string name="osmand_parking_position_name">駐車位置</string>
-	<string name="osmand_parking_plugin_description">このプラグインは、あなたの車の駐車位置を簡単に記録出来るように開発されました。</string>
+	<string name="osmand_parking_plugin_description">この駐車位置プラグインは、駐車位置、料金、(時間制限がある場合)残り駐車時間のメモを取ることができます。\n場所と時間共にOsmAndのダッシュボードだけでなく、マップ画面上のウィジェットに表示されます。Androidのカレンダー機能にアラームを追加することも出来ます。</string>
 	<string name="osmand_parking_plugin_name">駐車位置</string>
 	<string name="context_menu_item_add_parking_point">駐車位置としてマーク</string>
 	<string name="context_menu_item_delete_parking_point">駐車マーカーを削除</string>
@@ -1030,7 +1030,7 @@ POIの更新は利用できません</string>
 	<string name="prefs_plugins_descr">プラグインの有効化で、より高度な設定や各プラグインの追加機能を利用可能</string>
 	<string name="prefs_plugins">プラグイン設定</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">ベクター形式のマップはすばやく表示されます。一部のデバイスではうまく動作しない場合があります。</string>
-	<string name="play_commands_of_currently_selected_voice">選択した文字列を設定された言語の音声で再生</string>
+	<string name="play_commands_of_currently_selected_voice">文字列(コマンド)を選択した音声で再生</string>
 	<string name="debugging_and_development">OsmAnd開発者向けオプション</string>
 	<string name="native_rendering">ネイティブレンダリング</string>
 	<string name="test_voice_prompts">音声案内テスト用文字列</string>    
@@ -1535,12 +1535,12 @@ POIの更新は利用できません</string>
     <string name="lang_sw">スワヒリ語</string>
     <string name="lang_he">ヘブライ語</string>
     <string name="home">自宅</string>
-    <string name="live_monitoring_m_descr">GPX記録が有効になっている場合、指定したWebサービスへデータを送信。</string>
+    <string name="live_monitoring_m_descr">GPXログが有効になっている場合、指定したWebサービスへデータを送信。</string>
 	<string name="live_monitoring_m">オンライン追跡(GPXが必要)</string>
     <string name="live_monitoring_start">オンライントラッキング開始</string>
 	<string name="live_monitoring_stop">オンライントラッキング停止</string>
-	<string name="gpx_monitoring_start">GPX記録開始</string>
-	<string name="gpx_monitoring_stop">GPS記録停止</string>
+	<string name="gpx_monitoring_start">GPXログ開始</string>
+	<string name="gpx_monitoring_stop">GPSログ停止</string>
     <string name="rendering_attr_hideBuildings_name">建物を隠す</string>
     <string name="rendering_attr_hideNonVehicleHighways_name">自動車以外の専用道路を隠す</string>
     <string name="rendering_attr_hideText_name">文字列を隠す</string>
@@ -1694,7 +1694,7 @@ POIの更新は利用できません</string>
 	<string name="keep_informing_descr">ナビゲーション指示を繰り返す間隔の設定</string>
     <string name="arrival_distance">目的地周辺でのアナウンスタイミング</string>
     <string name="arrival_distance_descr">どのタイミングで目的地周辺のアナウンスをするか設定</string>
-    <string name="osmo_plugin_description">"このプラグインはOsMoの高度なライブモニタリング機能を提供します、http://osmo.mobiを参照して下さい。\n\n他のデバイスとその経路を追跡することが出来ます。匿名のグループを即座に作成でき、互いの位置を共有し、伝え合うことが出来ます。期間を限定した追跡、または永続的な追跡のためにさまざまなオプションが付属しています。\n\n匿名のグループは数日間いくつかの機能が制限されており、その場合遠隔操作は出来ずグループ管理者は存在しません。完全な機能のグループはウェブサイト上で別に作成する必要があり、登録ユーザーのみがそれらにアクセスすることができます。 "</string>
+    <string name="osmo_plugin_description">"このプラグインはOsMoと呼ばれる高度なライブモニタリング機能を提供します、http://osmo.mobiを参照して下さい。\n\n参加しているグループ全てのデバイス経路をリアルタイムで追跡することが出来るので、互いにコミュニケーションを取ることができます。期間を限定した追跡、または永続的な追跡のためにさまざまなオプションが付属しています。\n\n匿名のグループは簡単に作成できますが、指定された数日間いくつかの機能が制限されており、その場合遠隔操作は出来ずグループ管理者は存在しません。完全な機能のグループはウェブサイト上で別に作成する必要があり、登録ユーザーのみがそれらにアクセスすることができます。 "</string>
     <string name="osmo_plugin_name">OsMo(OSMモニタリング)</string>
    	<string name="always_center_position_on_map">位置を常に中央表示</string>
     <string name="voice_pref_title">音声</string>
@@ -1782,7 +1782,7 @@ POIの更新は利用できません</string>
     <string name="keep_informing_never">手動のみ(矢印をタップ)</string>
     
 	<string name="create_poi_link_to_osm_doc"><u>Online OSM</u>画像とマップの分類</string>
-	<string name="import_file_favourites">GPXファイルを保存またはお気に入りにインポートしますか？</string>
+	<string name="import_file_favourites">ポイントをGPXファイルとして保存、またはお気に入りにインポートしますか？</string>
 	
 	<string name="shared_string_share">共有</string>
 	<string name="share_fav_subject">OsmAndを介してお気に入りを共有</string>
@@ -1805,17 +1805,17 @@ POIの更新は利用できません</string>
     <string name="rendering_value_car_name">車</string>
     <string name="rendering_value_bicycle_name">自転車</string>
     <string name="rendering_value_pedestrian_name">歩行者</string>
-    <string name="record_plugin_description">"このプラグインはマップ画面のGPX記録ウィジェットをタッチして経路の記録と保存が出来る機能を有効化します、またログとして自動的にナビゲーションルートをGPXファイルに記録することもできます。\n\n記録された経路は、友人と共有することができ、またOSM発展のためにも使用されます。アスリートなら記録した経路をトレーニングモニターとして利用することが出来ます。ラップタイムや平均速度等いくつかの基本的な経路分析ならOsmAndから直接行うことができ、記録した経路を後で特別なサードパーティ製解析ツールで分析することも出来ます。 "</string>
+    <string name="record_plugin_description">"このプラグインはマップ画面のGPXログウィジェットをタッチして経路の記録と保存が出来る機能を有効化します、またログとして自動的にナビゲーションルートをGPXファイルに記録することもできます。\n\n記録された経路は、友人と共有することができ、またOSM発展のためにも使用されます。アスリートなら記録した経路をトレーニングモニターとして利用することが出来ます。ラップタイムや平均速度等いくつかの基本的な経路分析ならOsmAndから直接行うことができ、記録した経路を後で特別なサードパーティ製解析ツールで分析することも出来ます。 "</string>
     <string name="record_plugin_name">旅程の記録</string>
     <string name="int_hour">時間</string>
     <string name="duration">期限</string>
     <string name="distance">距離</string>
     <string name="rendering_attr_publicTransportMode_name">バス、トロリーバス、シャトルバスルート</string>
 	<string name="save_track_to_gpx_globally">GPXファイルに経路を記録</string>
-	<string name="save_track_to_gpx_globally_descr">GPXファイルへの一般の位置(General position)記録は、マップ画面上のGPX記録ウィジェットを使用してオンとオフを切り替えることができます</string>
+	<string name="save_track_to_gpx_globally_descr">GPXファイルへの一般の位置(General position)記録は、マップ画面上のGPXログウィジェットを使用してオンとオフを切り替えることができます</string>
 	<string name="save_track_interval_globally">記録間隔</string>
 	<string name="confirm_every_run">常に尋ねる</string>
-	<string name="save_global_track_interval_descr">標準的な経路の記録間隔を選択(マップ上のGPX記録ウィジェットで有効化)</string>
+	<string name="save_global_track_interval_descr">標準的な経路の記録間隔を選択(マップ上のGPXログウィジェットで有効化)</string>
 	<string name="save_global_track_interval">標準記録間隔</string>
 	<string name="traffic_warning_speed_limit">制限速度</string>
     <string name="traffic_warning_border_control">出入国管理</string>
@@ -1830,7 +1830,7 @@ POIの更新は利用できません</string>
 	<string name="fav_point_emoticons_message">お気に入り地点名は文字列に絵文字を含んでいるため、ファイルとして正常に保存するため %1$sという名前に変更されました。</string>
     <string name="print_route">経路印刷</string>
     <string name="fav_point_dublicate">お気に入り地点の重複</string>
-    <string name="fav_point_dublicate_message">名前の重複を避けるために、%1$s にお気に入り地点の名前を変更しました。</string>
+    <string name="fav_point_dublicate_message">指定されたお気に入りの名前は既に使われています。重複を避けるために、名前を%1$sに変更しました。</string>
     
     
     <string name="text_size_descr">マップ上の文字サイズを設定します。</string>
@@ -2075,27 +2075,44 @@ POIの更新は利用できません</string>
     <string name="lang_gl">ガリシア語</string>
     <string name="lang_et">エストニア語</string>
     <string name="lang_ceb">セブアノ語</string>
-    <string name="rendering_attr_currentTrackColor_name">現在のGPX経路の色</string>
-    <string name="rendering_attr_currentTrackWidth_name">現在のGPX経路の幅</string>
+    <string name="rendering_attr_currentTrackColor_name">GPX経路の色</string>
+    <string name="rendering_attr_currentTrackWidth_name">GPX経路の幅</string>
     <string name="rendering_value_red_name">レッド</string>
     <string name="rendering_value_translucent_red_name">レッド-半透明</string>
     <string name="rendering_value_translucent_orange_name">オレンジ-半透明</string>
     <string name="rendering_value_yellow_name">イエロー</string>
     <string name="rendering_value_translucent_yellow_name">イエロー-半透明</string>
     <string name="rendering_value_lightgreen_name">ライトグリーン</string>
-    <string name="rendering_value_translucent_lightgreen_name">ライトグリーン-半透明</string>
+    <string name="rendering_value_translucent_lightgreen_name">半透明ライトグリーン</string>
     <string name="rendering_value_green_name">グリーン</string>
     <string name="rendering_value_translucent_green_name">グリーン-半透明</string>
     <string name="rendering_value_lightblue_name">ライトブルー</string>
-    <string name="rendering_value_translucent_lightblue_name">ライトブルー-半透明</string>
+    <string name="rendering_value_translucent_lightblue_name">半透明ライトブルー</string>
     <string name="rendering_value_blue_name">ブルー</string>
     <string name="rendering_value_translucent_blue_name">ブルー-半透明</string>
     <string name="rendering_value_purple_name">パープル</string>
     <string name="rendering_value_translucent_purple_name">パープル-半透明</string>
-    <string name="restart_is_required">変更を有効にするにはアプリケーションの再起動が必要です。</string>
+    <string name="restart_is_required">変更を適用するには手動でアプリケーションを再起動する必要があります。</string>
     <string name="archive_wikipedia_data">互換性のない古いWikipediaデータがあります。アーカイブ化しますか？</string>
     <string name="download_wikipedia_files">Wikipediaの追加データ(%1$s MB)をダウンロードしますか？</string>
     <string name="gps_network_not_enabled">位置情報サービス(GPS)がオフになっています。オンにしますか？</string>
     <string name="disable_recording_once_app_killed">スタンドアロン動作時のログ記録を停止</string>
     <string name="disable_recording_once_app_killed_descrp">アプリは(タスクリストから)停止された場合、GPX記録を一時停止します。 (OsmAndスリープモード動作表示は、Androidの通知エリアに表示されなくなります。)</string>
+    <string name="rendering_value_default13_name">デフォルト (13)</string>
+	<string name="rendering_value_defaultTranslucentCyan_name">デフォルト (半透明シアン)</string>
+    <string name="shared_string_import2osmand">OsmAndにインポート</string>
+    <string name="read_full_article">記事全文を読む (オンライン)</string>
+    <string name="download_wikipedia_item">Wikipedia</string>
+    <string name="local_indexes_cat_wiki">Wikipedia</string>
+    <string name="shared_string_show_details">詳細を表示</string>
+    <string name="local_recordings_delete_all_confirm">%1$d個のメモを削除します。よろしいですか？</string>
+	<string name="download_wikipedia_maps">Wikipedia</string>
+    <string name="do_you_like_osmand">OsmAndを気に入っていただけましたか？</string>
+	<string name="we_really_care">わたしたち、気になります(仮翻訳)</string>
+	<string name="rate_this_app">アプリを評価</string>
+	<string name="rate_this_app_long">Google PlayでOsmAndの評価をお願いします</string>
+	<string name="user_hates_app_get_feedback">理由を教えてください。</string>
+	<string name="user_hates_app_get_feedback_long">このアプリの変更して欲しい箇所を教えて下さい。</string>
+<string name="rendering_value_walkingRoutesScopeOSMC_name">ルート範囲に応じてカラー変更</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">OSMCに応じてカラー変更</string>
     </resources>

OsmAnd/res/values-lt/strings.xml

@@ -2095,4 +2095,20 @@
     <string name="rendering_attr_currentTrackWidth_name">GPX plotis</string>
     <string name="rendering_value_default13_name">Numatytoji (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Numatytoji (skaidri žalsvai mėlyna)</string>
+    <string name="do_you_like_osmand">"Ar jums  patinka OsmAnd?"</string>
+	<string name="we_really_care">Mums tikrai rūpi</string>
+	<string name="rate_this_app">Įvertinkite programėlę</string>
+	<string name="rate_this_app_long">Įvertinkite OsmAnd Google Play puslapyje</string>
+	<string name="user_hates_app_get_feedback">Pasakykite, kodėl.</string>
+	<string name="user_hates_app_get_feedback_long">Pasakykite, ką mes turėtume pakeisti programėlėje.</string>
+<string name="download_live_updates">Naujiniai</string>
+	<string name="no_updates_available">Nauijinių nėra</string>
+    <string name="we_really_care_about_your_opinion">Mums labai svarbi jūsų nuomonė ir jūsų atsiliepimai.</string>
+	<string name="failed_to_upload">Nepavyko išsiųsti</string>
+	<string name="delete_change">Ištrinti pakeitimą</string>
+	<string name="successfully_uploaded_pattern">Sėkmingai išsiųsta {0}/{1}</string>
+	<string name="try_again">Pabandykite vėl</string>
+	<string name="error_message_pattern">Klaida: {0}</string>
+<string name="traffic_warning_hazard">Pavojus</string>
+    <string name="rendering_value_boldOutline_name">Paryškintas kontūras</string>
     </resources>

OsmAnd/res/values-ml/phrases.xml

@@ -7,4 +7,6 @@
 	<string name="poi_kiosk">കിയോസ്ക്</string>
 	<string name="poi_medical_supply">മെഡിക്കല്‍ സ്ടോര്‍</string>
 	<string name="poi_mobile_phone">സെല്‍ഫോണ്‍ കട</string>
-	</resources>
+	<string name="poi_animal_shelter_bird">ബെര്‍ഡ് ഷെല്ട്ടര്‍</string>
+
+</resources>

OsmAnd/res/values-nl/strings.xml

@@ -491,7 +491,7 @@
   <string name="poi_context_menu_call">Toon telefoon</string>
   <string name="website">Website</string>
   <string name="phone">Telefoon</string>
-  <string name="download_type_to_filter">type filtering</string>
+  <string name="download_type_to_filter">Tik om te zoeken</string>
   <string name="use_high_res_maps">Hoge resolutie beeldscherm</string>
   <string name="use_high_res_maps_descr">Rasterkaarten niet rekken op hoge-resolutie beeldschermen</string>
   <string name="unknown_location">Positie nog niet bekend</string>
@@ -917,7 +917,7 @@
   <string name="osmand_parking_pm">\'s-middags</string>
   <string name="osmand_parking_am">\'s-ochtends</string>
   <string name="osmand_parking_position_name">Parkeerplek</string>
-  <string name="osmand_parking_plugin_description">Met de Parkeerplaats plug-in kan eenvoudig de locatie waar de auto geparkeerd staat en de gekozen parkeertijd vastgelegd worden. U kunt uw parkeerplaats en resterende parkeertijd vinden op het kaart scherm en op de kaart widget.\nIndien gewenst kan het een herinnering plaatsen in uw agenda.</string>
+  <string name="osmand_parking_plugin_description">De parkeerplaats-plugin bewaatt de locatie waar de auto geparkeerd staat en de gekozen parkeertijd. U kunt uw parkeerplaats en resterende parkeertijd vinden op het Osmand dashboard en op de kaart zelf.\nKan ter herinnering ook een afspraak in uw agenda zetten.</string>
   <string name="osmand_parking_plugin_name">Parkeerplaats</string>
   <string name="context_menu_item_add_parking_point">Markeer als parkeerpositie</string>
   <string name="context_menu_item_delete_parking_point">Verwijder de parkeerpositie</string>
@@ -1540,7 +1540,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="auto_zoom_far">Zoom naar gemiddelde afstand</string>
     <string name="auto_zoom_farthest">Zoom naar grote afstand</string>
     
-    <string name="animate_routing_route_not_calculated">Eerst de route laten berekenen alsjeblieft</string>
+    <string name="animate_routing_route_not_calculated">U moet eerst een route berekenen</string>
     <string name="animate_routing_route">Simuleer met de berekende route </string>
     <string name="animate_routing_gpx">Simuleer met een GPX-spoor</string>
     
@@ -1839,7 +1839,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="lang_he">Hebreeuws</string>
     <string name="forward">Vooruit</string>
     <string name="home">Thuis</string>
-    <string name="live_monitoring_m_descr">Stuur tracking-data naar een webservice als een GPX-track wordt gemaakt</string>
+    <string name="live_monitoring_m_descr">Stuur tracking-data naar een webservice als een GPX-track wordt gemaakt.</string>
 	<string name="live_monitoring_m">Online tracking (GPX vereist)</string>
     <string name="live_monitoring_start">Start online tracking</string>
 	<string name="live_monitoring_stop">Stop online tracking</string>
@@ -2216,7 +2216,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="archive_wikipedia_data">Er zijn al (verouderde en incompatibele) Wikipedia-gegevens gedownload. Wilt u deze bewaren?</string>
     <string name="download_wikipedia_files">Wilt u Wikipedia-artikelen downloaden (%1$s MB) ?</string>
     <string name="disable_recording_once_app_killed">Voorkom loggen als app wordt gesloten</string>
-    <string name="disable_recording_once_app_killed_descrp">Stopt het opnemen van een GPX-spoort als de app wordt gesloten in de applicatielijst. (De OsmAnd achtergrondindicatie verdwijnt dan ook.)</string>
+    <string name="disable_recording_once_app_killed_descrp">Stopt het opnemen van een GPX-spoor als de app wordt gesloten in de applicatielijst. (De OsmAnd achtergrondindicatie verdwijnt dan ook.)</string>
     <string name="shared_string_import2osmand">Importeren in OsmAnd</string>
     <string name="download_wikipedia_maps">Wikipedia</string>
     <string name="rendering_value_default13_name">Standaard (13)</string>
@@ -2239,4 +2239,34 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="rendering_value_purple_name">Paars</string>
     <string name="rendering_value_translucent_purple_name">Doorschijnend paars</string>
     <string name="restart_is_required">Om alle veranderingen op te slaan, moet de applicatie handmatig herstart worden.</string>
-    </resources>
+    <string name="lang_bn">Bengaals</string>
+    <string name="lang_pms">Piëmontees</string>
+    <string name="lang_bpy">Bishnupriya</string>
+    <string name="lang_ml">Malayalam</string>
+    <string name="traffic_warning_hazard">Gevaar</string>
+    <string name="rendering_value_boldOutline_name">Dik omlijnd</string>
+    <string name="no_updates_available">Geen updates beschikbaar</string>
+    <string name="download_live_updates">Automatische updates</string>
+	<string name="lang_os">Ossetisch</string>
+    <string name="lang_nb">Noors (Bokmål)</string>
+    <string name="lang_vo">Volapük</string>
+    <string name="lang_te">Telugu</string>
+    <string name="lang_nn">Noors (Nynorsk)</string>
+    <string name="lang_new">Newari / Nepalbhasa</string>
+    <string name="lang_ms">Maleis</string>
+    <string name="lang_ht">Haïtiaans Creools</string>
+    <string name="lang_gl">Galicisch</string>
+    <string name="lang_et">Estisch</string>
+    <string name="lang_ceb">Cebuano</string>
+    <string name="do_you_like_osmand">Vind je Osmand fijn?</string>
+	<string name="we_really_care_about_your_opinion">We geven om uw mening en horen graag van u.</string>
+	<string name="rate_this_app">Beoordeel deze app</string>
+	<string name="user_hates_app_get_feedback">Vertel ons waarom.</string>
+	<string name="user_hates_app_get_feedback_long">Vertel ons wat u veranderd wilt hebben in deze app.</string>
+	<string name="failed_to_upload">Uploaden mislukt</string>
+	<string name="delete_change">Verwijder wijziging</string>
+	<string name="successfully_uploaded_pattern">Succesvol geupload {0}/{1}</string>
+	<string name="try_again">Probeer het opnieuw</string>
+	<string name="error_message_pattern">Fout: {0}</string>
+<string name="rate_this_app_long">Wilt u OsmAnd beoordelen op Google Play? Alvast heel erg bedankt.</string>
+	</resources>

OsmAnd/res/values-pl/phrases.xml

@@ -645,7 +645,7 @@
 	<string name="poi_apartment">Apartament</string>
 	<string name="poi_piste_hike">Trasa piesza</string>
 	<string name="poi_piste_sleigh">Trasa saneczkarska</string>
-	<string name="poi_piste_sled">Sanki</string>
+	<string name="poi_piste_sled">Trasa saneczkarska</string>
 	<string name="poi_piste_playground">Plac zabaw dla dzieci</string>
 	<string name="poi_stripclub">Klub ze striptizem</string>
 	<string name="poi_beach_resort">Ośrodek nadmorski</string>
@@ -858,7 +858,7 @@
 	<string name="poi_leather">Galanteria skórzana</string>
 	<string name="poi_scuba_diving_shop">Sklep z wyposażeniem dla nurków</string>
 	<string name="poi_fashion">Pokaz mody</string>
-	<string name="poi_free_flying">Darmowa przechowalnia lotniskowa</string>
+	<string name="poi_free_flying">Sklep ze sprzętem do sportów spadochronowych</string>
 	<string name="poi_energy">Sklep energetyczny</string>
 	<string name="poi_swimming_pool_shop">Sklep ze sprzętem do pływania</string>
 	<string name="poi_games">Gry</string>
@@ -869,7 +869,7 @@
 	<string name="poi_cycle_barrier">Bariera rowerowa</string>
 	<string name="poi_motorcycle_barrier">Bariera motocyklowa</string>
 	<string name="poi_block">Blokada</string>
-	<string name="poi_bus_trap">Pułapka busów</string>
+	<string name="poi_bus_trap">Spowolnienie ruchu</string>
 	<string name="poi_cattle_grid">Przeszkoda dla bydła</string>
 	<string name="poi_full_height_turnstile">Kołowrót pełnej wysokości</string>
 	<string name="poi_bump_gate">Brama na popych</string>
@@ -879,5 +879,59 @@
 	<string name="poi_kissing_gate">Furtka</string>
 	<string name="poi_sally_port">Port wycieczkowy</string>
 	<string name="poi_swing_gate">Brama wahadłowa</string>
-	<string name="poi_turnstile">Bramka</string>
-	</resources>
+	<string name="poi_turnstile">Bramka obrotowa</string>
+	<string name="poi_node_networks">Węzły sieci pieszej/rowerowej</string>
+		<string name="poi_hiking_routes">Trasy piesze</string>
+		<string name="poi_traffic_enforcement">Kontrola ruchu</string>
+	<string name="poi_breakwater">Falochron</string>
+	<string name="poi_groyne">Ostroga brzegowa</string>
+
+	<string name="poi_basin">Umywalka</string>
+	<string name="poi_conservation">Obszar chroniony</string>
+
+	<string name="poi_crane">Dźwig</string>
+	<string name="poi_country">Kraj</string>
+	<string name="poi_tourism_attraction">Atrakcja turystyczna</string>
+	<string name="poi_cutline">Tablica wyjaśniająca</string>
+	<string name="poi_tree">Drzewo</string>
+	<string name="poi_kent_carriage_gap">Bramka (szerokość powozu)</string>
+	<string name="poi_icn_ref">Sieć węzłów międzynarodowej sieci rowerowej</string>
+	<string name="poi_ncn_ref">Sieć węzłów krajowej sieci rowerowej</string>
+	<string name="poi_rcn_ref">Sieć węzłów regionalnej sieci rowerowej</string>
+	<string name="poi_lcn_ref">Sieć węzłów lokalnej sieci rowerowej</string>
+	<string name="poi_iwn_ref">Sieć węzłów międzynarodowej sieci pieszej</string>
+	<string name="poi_nwn_ref">Sieć węzłów krajowej sieci pieszej</string>
+	<string name="poi_rwn_ref">Sieć węzłów regionalnej sieci pieszej</string>
+	<string name="poi_lwn_ref">Sieć węzłów lokalnej sieci pieszej</string>
+
+	<string name="poi_route_hiking_iwn_poi">Międzynarodowa trasa piesza</string>
+	<string name="poi_route_hiking_nwn_poi">Krajowa trasa piesza</string>
+	<string name="poi_route_hiking_rwn_poi">Regionalna trasa piesza</string>
+	<string name="poi_route_hiking_lwn_poi">Lokalna trasa piesza</string>
+	<string name="poi_route_hiking_ref_poi">Zestawienie tras pieszych</string>
+
+	<string name="poi_opening_hours">Godziny otwarcia</string>
+	<string name="poi_collection_times">Godziny urzędowania</string>
+	<string name="poi_description">Opis</string>
+	<string name="poi_phone">Telefon</string>
+	<string name="poi_website">Strona www</string>
+	<string name="poi_service_times">Godziny usług</string>
+	<string name="poi_maxheight">Maksymalna wysokość</string>
+	<string name="poi_maxweight">Maksymalna waga</string>
+	<string name="poi_abandoned">Opuszczony</string>
+	<string name="poi_abandoned_poi">Obiekt opuszczony</string>
+	<string name="poi_disused">Wyłączony z użycia</string>
+
+	<string name="poi_operator">Obsługujący</string>
+	<string name="poi_brand">Marka</string>
+	<string name="poi_fee_yes">Opłata</string>
+
+	<string name="poi_enforcement_traffic_signals">Sygnalizacja świetlna</string>
+	<string name="poi_enforcement_maxspeed">Fotoradar</string>
+	<string name="poi_enforcement_maxheight">Kontrola wysokości pojazdu</string>
+	<string name="poi_enforcement_mindistance">Kontrola minimalnego dystansu</string>
+	<string name="poi_enforcement_check">Kontrola</string>
+	<string name="poi_enforcement_access">Kontrola dostępu</string>
+	<string name="poi_enforcement_toll">Kontrola opłat</string>
+
+</resources>

OsmAnd/res/values-pl/strings.xml

@@ -705,7 +705,7 @@
   <string name="osm_editing_plugin_description">Umożliwia wprowadzanie zmian w zasobach OSM, takich jak dodawanie lub modyfikowanie obiektów POI, zgłaszanie i komentowanie błędów oraz wysyłanie zarejestrowanych plików GPX. OSM jest publicznym projektem tworzenia map przez społeczność. Więcej szczegółów pod adresem http://openstreetmap.org. Aktywny udział jest mile widziany, modyfikacji można dokonywać bezpośrednio z poziomu programu po wprowadzeniu danych uwierzytelniających OSM.</string>
   <string name="vector_maps_may_display_faster_on_some_devices">Mapy wektorowe mogą wyświetlać się szybciej. Może nie działać dobrze na niektórych urządzeniach.</string>
   
-  <string name="play_commands_of_currently_selected_voice">Odtwórz komendy w aktualnie wybranym głosie</string>
+  <string name="play_commands_of_currently_selected_voice">Odtwórz komendy w wybranym głosie</string>
   <string name="debugging_and_development">Rozwój OsmAnd</string>
   <string name="native_rendering">Renderowanie natywne</string>
   
@@ -1655,8 +1655,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="navigation_intent_invalid">Nieprawidłowy format: %s</string>
 <string name="osmo_settings_uuid">Unikatowy identyfikator urządzenia</string>
     <string name="osmo_settings_descr">Skonfiguruj monitorowanie i ustaw osobisty kanał monitorowania</string>
-    <string name="osmo_plugin_description">"Zapewnia funkcjonalność usługi OsMo - zaawansowanego monitorowania na żywo. Więcej szczegółów na http://osmo.mobi.
-\n\nZa jej pomocą można śledzić inne urządzenia lub samemu być śledzonym. Pozwala na tworzenie anonimowych grup, udostępnianie lokalizacji sobie nawzajem i komunikowanie ze sobą. Dostarcza różne opcje dla śledzenia sesji i śledzenia stałego.\n\nAnonimowe grupy tworzone są na określoną liczbę dni i limitowane są określonymi opcjami, np. brak zdalnego sterowania i brak administratora grupy. Natomiast w pełni funkcjonalne grupy mogą zostać utworzone na stronie, a dostęp do nich będą mieć tylko zarejestrowani użytkownicy. "</string>
+    <string name="osmo_plugin_description">"Wtyczka zapewnia funkcjonalność usługi OsMo - zaawansowanego monitorowania na żywo. Więcej szczegółów na http://osmo.mobi.
+\n\nZa jej pomocą można śledzić inne urządzenia lub samemu być śledzonym w obrębie grupy w czasie rzeczywistym oraz komunikować się ze sobą. Dostarcza różne opcje dla śledzenia sesji i śledzenia stałego.\n\nAnonimowe grupy tworzone są na określoną liczbę dni i limitowane są określonymi opcjami, np. brak zdalnego sterowania i brak administratora grupy. Natomiast w pełni funkcjonalne grupy mogą zostać utworzone na stronie, a dostęp do nich będą mieć tylko zarejestrowani użytkownicy. "</string>
     <string name="osmo_plugin_name">OsMo (Monitoring OSM)</string>
     <string name="osmo_settings">OsMo</string>
    	<string name="keep_informing_never">Tylko ręcznie (naciśnij strzałkę)</string>
@@ -1888,8 +1888,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="waypoints">Punkty trasy</string>
     <string name="targets">Kierunki</string>
     <string name="way_alarms">Ostrzeżenia ruchu drogowego</string>
-    <string name="speak_favorites">Okoliczne Ulubione</string>
-    <string name="speak_poi">Okoliczne punkty POI</string>
+    <string name="speak_favorites">Ogłaszaj Ulubione</string>
+    <string name="speak_poi">Ogłaszaj punkty POI</string>
     <string name="save_track_to_gpx_globally">Rejestrowanie śladu do pliku GPX</string>
 	<string name="save_track_to_gpx_globally_descr">Rejestrowanie położenia do pliku GPX można włączyć lub wyłączyć używając widżetu rejestrowania GPX na ekranie mapy</string>
 	<string name="save_track_interval_globally">Częstość rejestrowania</string>
@@ -2183,4 +2183,13 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="rendering_value_purple_name">Fioletowy</string>
     <string name="rendering_value_translucent_purple_name">Półprzezroczysty fioletowy</string>
     <string name="restart_is_required">W celu zastosowania zmian, konieczne jest ponowne uruchomienie programu.</string>
-    </resources>
+    <string name="rendering_value_translucent_red_name">Prześwitujący czerwony</string>
+    <string name="rendering_value_default13_name">Domyślny (13)</string>
+	<string name="rendering_value_defaultTranslucentCyan_name">Domyślny (prześwitujący niebieski)</string>
+    <string name="do_you_like_osmand">Czy lubisz OsmAnd?</string>
+	<string name="we_really_care">Naprawdę nam zależy</string>
+	<string name="rate_this_app">Oceń tę aplikację</string>
+	<string name="rate_this_app_long">Określ jakość OsmAnd w witrynie Google Play</string>
+	<string name="user_hates_app_get_feedback">Powiedz nam, dlaczego.</string>
+	<string name="user_hates_app_get_feedback_long">Powiedz, co zmieniłbyś w aplikacji.</string>
+</resources>

OsmAnd/res/values-pt-rBR/phrases.xml

@@ -76,7 +76,7 @@
 	<string name="poi_computer">Loja de informática</string>
 	<string name="poi_copyshop">Reprografia</string>
 	<string name="poi_curtain">Loja de cortinas</string>
-	<string name="poi_fabric">Loja de indumentárias</string>
+	<string name="poi_fabric">Tecidos</string>
 	<string name="poi_bedding">Loja de roupa de cama</string>
 	<string name="poi_dive">Equipamento de mergulho</string>
 	<string name="poi_doityourself">Artigos para casa</string>
@@ -119,7 +119,7 @@
 	<string name="poi_traffic_calming_table">Faixa elevada</string>
 	<string name="poi_picnic_site">Local de piquenique</string>
 	<string name="poi_hanami">Hanami</string>
-	<string name="poi_piste_sleigh">Trenó</string>
+	<string name="poi_piste_sleigh">Pista de trenó</string>
 	<string name="poi_trail_riding_station">Local de equitação</string>
 
 	<string name="poi_craft_plumber">Encanador</string>
@@ -581,13 +581,13 @@
 	<string name="poi_club_charity">Clube de caridade</string>
 
 	<string name="poi_piste">Pista</string>
-	<string name="poi_piste_downhill">Descida</string>
-	<string name="poi_piste_nordic">Nórdico</string>
-	<string name="poi_piste_skitour">Passeio de esqui</string>
-	<string name="poi_piste_hike">Caminhada</string>
-	<string name="poi_piste_sled">Trenó</string>
+	<string name="poi_piste_downhill">Pista de descida</string>
+	<string name="poi_piste_nordic">Pista nórdica</string>
+	<string name="poi_piste_skitour">Pista de passeio</string>
+	<string name="poi_piste_hike">Pista de caminhada</string>
+	<string name="poi_piste_sled">Pista de trenó (carrinho)</string>
 	<string name="poi_piste_snow_park">Parque de neve</string>
-	<string name="poi_piste_playground">Parque infantil de esqui</string>
+	<string name="poi_piste_playground">Pista de diversão</string>
 	<string name="poi_piste_ice_skate">Patim de gelo</string>
 	<string name="poi_ski_rental">Aluguel de esqui</string>
 
@@ -923,7 +923,123 @@
 	<string name="poi_enforcement_check">Fiscalização:verificação</string>
 	<string name="poi_cutline">Linha de corte</string>
 	<string name="poi_country">País</string>
-	<string name="poi_fee">Taxa</string>
+	<string name="poi_fee_yes">Taxa</string>
 
 	<string name="poi_abandoned_poi">Objeto abandonado</string>
+	<string name="poi_route_hiking_iwn_poi">Rota de caminhada internacional</string>
+	<string name="poi_route_hiking_nwn_poi">Rota de caminhada nacional</string>
+	<string name="poi_route_hiking_rwn_poi">Rota de caminhada regional</string>
+	<string name="poi_route_hiking_lwn_poi">Rota de caminhada local</string>
+	<string name="poi_route_hiking_ref_poi">Referência de rota de caminhada</string>
+
+	<string name="poi_traffic_enforcement">Fiscalização de trânsito</string>
+	<string name="poi_node_networks">Nós da rede de caminhada/ciclismo</string>
+		<string name="poi_hiking_routes">Rotas de caminhada</string>
+		<string name="poi_access_private">Acesso privado</string>
+	<string name="poi_access_no">Acesso proibido</string>
+	<string name="poi_access_destination">Acesso de destino</string>
+	<string name="poi_access_permissive">Acesso autorizado</string>
+	<string name="poi_access_customers">Acesso para clientes</string>
+	<string name="poi_access_delivery">Acesso para entrega</string>
+	<string name="poi_access_agricultural">Acesso agrícola</string>
+
+	<string name="poi_monitoring_station">Estação de medição ambiental</string>
+	<string name="poi_capital">Capital</string>
+	<string name="poi_fee_no">Sem taxa</string>
+
+	<string name="poi_email">Email</string>
+	<string name="poi_fax">Fax</string>
+	<string name="poi_facebook">Facebook</string>
+	<string name="poi_mobile">Celular</string>
+	<string name="poi_animal_shelter_dog">Abrigo para cães</string>
+	<string name="poi_animal_shelter_cat">Abrigo para gatos</string>
+	<string name="poi_animal_shelter_dog_cat">Abrigo para cães e gatos</string>
+	<string name="poi_animal_shelter_bird">Abrigo para aves</string>
+
+<string name="poi_recycling_container">Contêiner</string>
+	<string name="poi_recycling_glass">Vidro</string>
+	<string name="poi_recycling_paper">Papel</string>
+	<string name="poi_recycling_clothes">Roupas</string>
+	<string name="poi_recycling_cans">Latas</string>
+	<string name="poi_recycling_glass_bottles">Garrafas de vidro</string>
+	<string name="poi_recycling_plastic">Plástico</string>
+	<string name="poi_recycling_scrap_metal">Sucata de metal</string>
+	<string name="poi_recycling_batteries">Pilhas</string>
+	<string name="poi_recycling_plastic_bottles">Garrafas de plástico</string>
+	<string name="poi_recycling_green_waste">Resíduo verde</string>
+	<string name="poi_recycling_waste">Resíduos (sacos pretos)</string>
+	<string name="poi_recycling_plastic_packaging">Embalagens de plástico</string>
+	<string name="poi_recycling_newspaper">Jornal</string>
+	<string name="poi_recycling_cartons">Caixas</string>
+	<string name="poi_recycling_cardboard">Papelão</string>
+	<string name="poi_recycling_magazines">Revistas</string>
+	<string name="poi_recycling_paper_packaging">Embalagens de papel</string>
+	<string name="poi_recycling_small_appliances">Pequenos aparelhos</string>
+	<string name="poi_recycling_wood">Madeira</string>
+	<string name="poi_recycling_books">Livros</string>
+	<string name="poi_recycling_shoes">Calçados</string>
+	<string name="poi_recycling_aluminium">Alumínio</string>
+	<string name="poi_recycling_organic">Orgânico</string>
+	<string name="poi_recycling_beverage_cartons">Caixas de bebidas</string>
+	<string name="poi_recycling_garden_waste">Resíduo de jardim</string>
+	<string name="poi_recycling_low_energy_bulbs">Lâmpadas de baixo consumo</string>
+	<string name="poi_recycling_fluorescent_tubes">Lâmpadas fluorescentes</string>
+	<string name="poi_recycling_metal">Metal</string>
+	<string name="poi_recycling_electrical_items">Itens elétricos</string>
+	<string name="poi_recycling_white_goods">Linha branca</string>
+	<string name="poi_recycling_cooking_oil">Óleo de cozinha</string>
+	<string name="poi_recycling_engine_oil">Óleo do motor</string>
+	<string name="poi_recycling_plastic_bags">Sacos plásticos</string>
+	<string name="poi_recycling_hazardous_waste">Resíduo perigoso</string>
+	<string name="poi_recycling_mobile_phones">Telefones celulares</string>
+	<string name="poi_recycling_hydrargyrum">Mercúrio</string>
+	<string name="poi_recycling_computers">Computadores</string>
+	<string name="poi_recycling_tyres">Pneus</string>
+	<string name="poi_recycling_tv_monitor">TV, monitores</string>
+	<string name="poi_recycling_tetrapak">Tetrapak</string>
+	<string name="poi_recycling_rubble">Entulho</string>
+	<string name="poi_recycling_cds">CDs</string>
+	<string name="poi_recycling_waste_oil">Resíduo de óleo</string>
+	<string name="poi_recycling_bottles">Garrafas</string>
+	<string name="poi_recycling_cork">Cortiça</string>
+	<string name="poi_recycling_printer_cartridges">Cartuchos de impressão</string>
+	<string name="poi_recycling_sheet_metal">Chapa metálica</string>
+	<string name="poi_recycling_foil">Papel alumínio</string>
+	<string name="poi_recycling_paint">Tinta</string>
+	<string name="poi_recycling_styrofoam">Isopor</string>
+	<string name="poi_recycling_drugs">Drogas</string>
+	<string name="poi_recycling_compost">Adubo</string>
+	<string name="poi_recycling_christmas_trees">Árvores de Natal</string>
+	<string name="poi_recycling_light_bulbs">Lâmpadas incandescentes</string>
+	<string name="poi_recycling_chipboard">Compensado</string>
+	<string name="poi_recycling_polyester">Poliéster</string>
+	<string name="poi_recycling_plasterboard">Gesso cartonado</string>
+	<string name="poi_recycling_animal_waste">Resíduo animal</string>
+	<string name="poi_recycling_fridge_and_freezer">Frigorífico e congelador</string>
+	<string name="poi_recycling_furniture">Móveis</string>
+	<string name="poi_recycling_diapers">Fraldas</string>
+	<string name="poi_recycling_car_batteries">Baterias de carro</string>
+	<string name="poi_recycling_cars">Carros</string>
+	<string name="poi_recycling_bicycles">Bicicletas</string>
+
+	<string name="poi_shower">Chuveiro</string>
+	<string name="poi_drinking_water_yes">Água potável</string>
+	<string name="poi_drinking_water_no">Água impotável</string>
+	<string name="poi_supervised_yes">Supervisionado</string>
+	<string name="poi_supervised_no">Sem supervisão</string>
+	<string name="poi_seasonal_yes">Sazonal</string>
+	<string name="poi_seasonal_no">Contínuo</string>
+	<string name="poi_seasonal_dry_season">Estação seca</string>
+	<string name="poi_seasonal_wet_season">Estação chuvosa</string>
+	<string name="poi_seasonal_spring">Primavera</string>
+	<string name="poi_seasonal_summer">Verão</string>
+	<string name="poi_seasonal_autumn">Outono</string>
+	<string name="poi_seasonal_winter">Inverno</string>
+
+	<string name="poi_recycling_centre">Centro</string>
+	<string name="poi_recycling_hardcore">Material duro</string>
+	<string name="poi_crossing_traffic_signals">Com semáforos</string>
+	<string name="poi_crossing_uncontrolled">Sem controle</string>
+	<string name="poi_crossing_unmarked">Desmarcado</string>
+
 	</resources>

OsmAnd/res/values-pt-rBR/strings.xml

@@ -158,8 +158,8 @@
 \n\nEssa visão pode ser revertida desativando aqui mesmo ou alterando o \'Estilo do mapa\' em \'Configurar mapa\' quando desejar. "</string>
 	<string name="plugin_nautical_name">Visão de mapa náutico</string>
 	<string name="plugin_nautical_descr">"Este complemento enriquece o mapa do OsmAnd para também produzir mapas náuticos para passeios de barco, vela e outros tipos de desportos aquáticos.
-\n\nUm complemento de mapa especial para OsmAnd fornecerá todas as marcas de navegação náutica e símbolos da cartográficos, para o interior, assim como para navegação próxima à costa. A descrição de cada marca de navegação fornece os detalhes necessários para identificá-los e o seu significado (categoria, forma, cor, sequência, referência, etc.).
-\n\nPara retornar a um dos estilos de mapa convencional do OsmAnd, simplesmente desative este complemento ou altere o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado. "</string>
+\n\nUm complemento de mapa especial para OsmAnd fornecerá todas as marcas de navegação náutica e símbolos cartográficos, para o interior assim como para navegação próxima à costa. A descrição de cada marca de navegação fornece os detalhes necessários para identificá-las e o seu significado (categoria, forma, cor, sequência, referência, etc.).
+\n\nPara retornar a um estilo convencional de mapa do OsmAnd, simplesmente desative este complemento ou altere o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado. "</string>
 	<string name="plugin_ski_name">Visão de mapa de esqui</string>
 	<string name="plugin_ski_descr">"Este complemento para o OsmAnd coloca ao seu alcance detalhes de pistas de descida de esqui, de travessia, rotas de esqui alpino, teleféricos e elevadores de esqui. Rotas e pistas são mostradas com codificação de cores por dificuldade e retratadas em um estilo especial de mapa \'Inverno\' que assimila uma paisagem de inverno cor de neve.
 \n\nAtivando esta mudança na visão do estilo de mapa de \'Inverno e esqui\', mostrando todas as características da paisagem em condições invernais. Essa visão pode ser revertida desativando aqui ou alterando o \'Estilo de mapa\' em \'Configurar mapa\' quando desejado. "</string>
@@ -193,7 +193,7 @@
     <string name="rendering_attr_streetLighting_name">Iluminação pública</string>
     <string name="proxy_pref_title">Proxy</string>
     <string name="track_points">Pontos de trajeto</string>
-	<string name="osmand_srtm_long_description_1000_chars">"Este complemento fornece uma linha de contorno sobreposta e uma camada de sombras das colinas (relevo) por cima dos mapas off-line do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem.\n\nOs dados globais (entre as latitudes 70º norte e 70º sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens da Terra, o principal satélite do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério Japonês da Economia, Comércio e Indústria (METI) e do Sistema Espacial Japonês (J-spacesystems). "</string>
+	<string name="osmand_srtm_long_description_1000_chars">"Este complemento fornece curva de nível e camada de sombra de colinas (relevo) por cima dos mapas off-line do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem.\n\nOs dados globais (entre as latitudes 70º norte e 70º sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens da Terra, o principal satélite do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério Japonês da Economia, Comércio e Indústria (METI) e do Sistema Espacial Japonês (J-spacesystems). "</string>
 	<string name="srtm_plugin_description">"Este complemento fornece uma linha de contorno sobreposta e uma camada de sombras das colinas (relevo) por cima dos mapas off-line do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem.\n\nOs dados globais (entre as latitudes 70º norte e 70º sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens da Terra, o principal satélite do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério Japonês da Economia, Comércio e Indústria (METI) e do Sistema Espacial Japonês (J-spacesystems). "</string>
 	<string name="osmand_parking_plugin_description">O complemento de posição de estacionamento memoriza facilmente onde seu carro está estacionado e quanto tempo resta (se o estacionamento for de tempo limitado).\nVocê pode encontrar o seu lugar e tempo de estacionamento no painel de instrumentos e no widget do mapa. Pode ser adicionado um evento no calendário, se você quiser um lembrete.</string>
 	<string name="osm_editing_plugin_description">Este complemento do OsmAnd pode ser usado para fazer contribuições ao OSM como criar ou modificar POI, abertura ou comentários de erros do OSM e contribuir com arquivos GPX gravados. OSM é um projeto de mapeamento mundial dirigido pela comunidade e de domínio público. Para mais detalhes, consulte http://openstreetmap.org. Participação ativa é apreciada e as contribuições podem ser feitas diretamente do OsmAnd, se você especificar suas credenciais pessoais de OSM no app.</string>
@@ -1771,4 +1771,20 @@
     <string name="rendering_value_translucent_purple_name">Roxo translúcido</string>
     <string name="rendering_value_default13_name">Predefinido (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Predefinido (ciano translúcido)</string>
+    <string name="do_you_like_osmand">Você curte o OsmAnd?</string>
+	<string name="rate_this_app">Avalie este app</string>
+	<string name="rate_this_app_long">Por favor, avalie o OsmAnd no Google Play</string>
+	<string name="user_hates_app_get_feedback">Diga-nos porquê.</string>
+	<string name="user_hates_app_get_feedback_long">Por favor, nos diga o que quer mudar neste app.</string>
+<string name="we_really_care">Nós realmente nos importamos</string>
+	<string name="download_live_updates">Atualizações ao vivo</string>
+	<string name="failed_to_upload">Falha no envio</string>
+	<string name="delete_change">Apagar mudança</string>
+	<string name="successfully_uploaded_pattern">Enviado com sucesso {0}/{1}</string>
+	<string name="try_again">Tentar novamente</string>
+	<string name="error_message_pattern">Erro: {0}</string>
+<string name="no_updates_available">Não há atualizações disponíveis</string>
+    <string name="we_really_care_about_your_opinion">Nos preocupamos muito com sua opinião e é importante para nós ouvi-lo.</string>
+	<string name="rendering_value_boldOutline_name">Títulos com contornos</string>
+    <string name="traffic_warning_hazard">Perigo</string>
     </resources>

OsmAnd/res/values-ru/phrases.xml

@@ -207,6 +207,72 @@
 	<string name="poi_waste_disposal">Мусорный контейнер</string>
 	<string name="poi_waste_basket">Урна для мусора</string>
 
+	<string name="poi_recycling_centre">Пункт приёма</string>
+	<string name="poi_recycling_container">Контейнер</string>
+	<string name="poi_recycling_glass">Стекло</string>
+	<string name="poi_recycling_paper">Бумага</string>
+	<string name="poi_recycling_clothes">Одежда</string>
+	<string name="poi_recycling_cans">Жестяные банки</string>
+	<string name="poi_recycling_glass_bottles">Стеклянные бутылки</string>
+	<string name="poi_recycling_plastic">Пластик</string>
+	<string name="poi_recycling_scrap_metal">Металлолом</string>
+	<string name="poi_recycling_batteries">Батарейки</string>
+	<string name="poi_recycling_plastic_bottles">Пластиковые бутылки</string>
+	<string name="poi_recycling_green_waste">Растительный мусор</string>
+	<string name="poi_recycling_waste">Мусор (черные мешки)</string>
+	<string name="poi_recycling_plastic_packaging">Пластиковая тара</string>
+	<string name="poi_recycling_newspaper">Газеты</string>
+	<string name="poi_recycling_cartons">Картон для пищевых упаковок</string>
+	<string name="poi_recycling_cardboard">Упаковочный картон</string>
+	<string name="poi_recycling_magazines">Глянцевая макулатура (журналы)</string>
+	<string name="poi_recycling_paper_packaging">Упаковочная бумага</string>
+	<string name="poi_recycling_small_appliances">Кухонная бытовая техника</string>
+	<string name="poi_recycling_wood">Древесина</string>
+	<string name="poi_recycling_books">Книги</string>
+	<string name="poi_recycling_shoes">Обувь</string>
+	<string name="poi_recycling_aluminium">Алюминий</string>
+	<string name="poi_recycling_organic">Органические пищевые отходы</string>
+	<string name="poi_recycling_beverage_cartons">Коробки из под овощей</string>
+	<string name="poi_recycling_garden_waste">Садовый мусор</string>
+	<string name="poi_recycling_low_energy_bulbs">Энергосберегающие лампы</string>
+	<string name="poi_recycling_fluorescent_tubes">Люминесцентные лампы</string>
+	<string name="poi_recycling_metal">Металл</string>
+	<string name="poi_recycling_electrical_items">Крупная бытовая техника</string>
+	<string name="poi_recycling_white_goods">Бытовая техника</string>
+	<string name="poi_recycling_cooking_oil">Масло для жарки</string>
+	<string name="poi_recycling_engine_oil">Машинное масло</string>
+	<string name="poi_recycling_plastic_bags">Пластиковые мешки</string>
+	<string name="poi_recycling_hazardous_waste">Опасные отходы</string>
+	<string name="poi_recycling_mobile_phones">Мобильные телефоны</string>
+	<string name="poi_recycling_hydrargyrum">Ртуть</string>
+	<string name="poi_recycling_computers">Компьютеры</string>
+	<string name="poi_recycling_tyres">Шины</string>
+	<string name="poi_recycling_tv_monitor">Телевизоры, мониторы</string>
+	<string name="poi_recycling_rubble">Кирпич или строительный камень</string>
+	<string name="poi_recycling_cds">Компакт-диски</string>
+	<string name="poi_recycling_bottles">Бутылки</string>
+	<string name="poi_recycling_cork">Винные пробки</string>
+	<string name="poi_recycling_printer_cartridges">Картриджи для принтеров</string>
+	<string name="poi_recycling_sheet_metal">Жестяные изделия</string>
+	<string name="poi_recycling_foil">Фольга</string>
+	<string name="poi_recycling_paint">Лако-красочные вещества</string>
+	<string name="poi_recycling_styrofoam">Пенопласт</string>
+	<string name="poi_recycling_drugs">Лекарства</string>
+	<string name="poi_recycling_compost">Компост</string>
+	<string name="poi_recycling_hardcore">Строительный мусор</string>
+	<string name="poi_recycling_christmas_trees">Новогодние ёлки</string>
+	<string name="poi_recycling_light_bulbs">Лампочки</string>
+	<string name="poi_recycling_chipboard">ДСП</string>
+	<string name="poi_recycling_polyester">Полиэстер</string>
+	<string name="poi_recycling_plasterboard">Гипсокартон</string>
+	<string name="poi_recycling_animal_waste">Навоз</string>
+	<string name="poi_recycling_fridge_and_freezer">Холодильники и морозильники</string>
+	<string name="poi_recycling_furniture">Мебель</string>
+	<string name="poi_recycling_diapers">Подгузники</string>
+	<string name="poi_recycling_car_batteries">Автомобильные аккумуляторы</string>
+	<string name="poi_recycling_cars">Автомобили</string>
+	<string name="poi_recycling_bicycles">Велосипеды</string>
+
 	<string name="poi_surveillance">Камера видеонаблюдения</string>
 	<string name="poi_construction">Стройка</string>
 	<string name="poi_works">Завод</string>
@@ -591,6 +657,7 @@
 	<string name="poi_military_naval_base">Военно-морская база</string>
 	<string name="poi_military_nuclear_explosion_site">Место ядерного взрыва</string>
 	<string name="poi_city">Город</string>
+	<string name="poi_capital">Столица</string>
 	<string name="poi_town">Город (небольшой)</string>
 	<string name="poi_village">Деревня</string>
 	<string name="poi_hamlet">Деревня (небольшая)</string>
@@ -750,4 +817,46 @@
 	<string name="poi_recreation_ground">Площадка для игр</string>
 	<string name="poi_dyke">Насыпь</string>
 	<string name="poi_payment_terminal">Платежный терминал</string>
+
+	<string name="poi_opening_hours">Часы работы</string>
+	<string name="poi_collection_times">Время выемки</string>
+	<string name="poi_description">Описание</string>
+	<string name="poi_phone">Телефон</string>
+	<string name="poi_website">Веб-сайт</string>
+	<string name="poi_email">Email</string>
+	<string name="poi_fax">Факс</string>
+	<string name="poi_mobile">Сотовый телефон</string>
+	<string name="poi_service_times">Время обслуживания</string>
+	<string name="poi_abandoned">Заброшено</string>
+	<string name="poi_abandoned_poi">Заброшенный объект</string>
+	<string name="poi_disused">Не используется по назначению</string>
+
+	<string name="poi_operator">Оператор</string>
+	<string name="poi_brand">Торговая марка</string>
+	<string name="poi_fee_yes">Взимается оплата</string>
+	<string name="poi_fee_no">Оплата не взимается</string>
+	<string name="poi_drinking_water_yes">Питьевая вода</string>
+	<string name="poi_drinking_water_no">Непригодная для питья вода</string>
+	<string name="poi_supervised_yes">Контролируемый объект</string>
+	<string name="poi_supervised_no">Неконтролируемый объект</string>
+	<string name="poi_seasonal_yes">Сезонный объект</string>
+	<string name="poi_seasonal_no">Не зависит от сезона</string>
+	<string name="poi_seasonal_dry_season">Сухой сезон</string>
+	<string name="poi_seasonal_wet_season">Сезон дождей</string>
+	<string name="poi_seasonal_spring">Весна</string>
+	<string name="poi_seasonal_summer">Лето</string>
+	<string name="poi_seasonal_autumn">Осень</string>
+	<string name="poi_seasonal_winter">Зима</string>
+	<string name="poi_crossing_traffic_signals">Со светофором</string>
+	<string name="poi_crossing_uncontrolled">Нерегулируемый</string>
+	<string name="poi_crossing_unmarked">Неразмеченный</string>
+
+	<string name="poi_access_private">Частный доступ</string>
+	<string name="poi_access_no">Нет доступа</string>
+	<string name="poi_access_destination">Доступ: пункт назначения</string>
+	<string name="poi_access_permissive">Доступ разрешен владельцем</string>
+	<string name="poi_access_customers">Доступ только для посетителей</string>
+	<string name="poi_access_delivery">Доступ только для доставки</string>
+	<string name="poi_access_agricultural">Доступ только для с/х техники</string>
+
 	</resources>

OsmAnd/res/values-ru/strings.xml

@@ -2032,4 +2032,33 @@
     <string name="light_theme">Светлая</string>
     <string name="dark_theme">Тёмная</string>
     <string name="lang_bn">Бенгальский</string>
-    </resources>
+    <string name="rendering_value_default13_name">По умолчанию (13)</string>
+	<string name="rendering_value_defaultTranslucentCyan_name">По умолчанию (полупрозрачный голубой)</string>
+    <string name="rendering_value_red_name">Красный</string>
+    <string name="rendering_value_translucent_red_name">Полупрозрачный красный</string>
+    <string name="rendering_value_translucent_orange_name">Полупрозрачный оранжевый</string>
+    <string name="rendering_value_yellow_name">Желтый</string>
+    <string name="rendering_value_translucent_yellow_name">Полупрозрачный жёлтый</string>
+    <string name="rendering_value_lightgreen_name">Светло-зеленый</string>
+    <string name="rendering_value_translucent_lightgreen_name">Полупрозрачный светло-зеленый</string>
+    <string name="rendering_value_green_name">Зеленый</string>
+    <string name="rendering_value_translucent_green_name">Полупрозрачный зеленый</string>
+    <string name="rendering_value_lightblue_name">Голубой</string>
+    <string name="rendering_value_translucent_lightblue_name">Полупрозрачный голубой</string>
+    <string name="rendering_value_blue_name">Синий</string>
+    <string name="rendering_value_translucent_blue_name">Полупрозрачный синий</string>
+    <string name="rendering_value_purple_name">Фиолетовый</string>
+    <string name="rendering_value_translucent_purple_name">Полупрозрачный фиолетовый</string>
+    <string name="restart_is_required">Для того, чтобы полностью применить изменения, требуется вручную перезапустить приложение.</string>
+    <string name="do_you_like_osmand">Нравится ли вам приложение?</string>
+	<string name="rate_this_app">Оценить приложение</string>
+	<string name="rate_this_app_long">Пожалуйста, дайте оценку OsmAnd на Google Play</string>
+	<string name="user_hates_app_get_feedback_long">Пожалуйста скажите нам что вы хотите изменить в этом приложении.</string>
+<string name="rendering_attr_currentTrackColor_name">GPX цвет</string>
+    <string name="rendering_attr_currentTrackWidth_name">GPX толщина</string>
+    <string name="no_updates_available">Нет доступных обновлений</string>
+    <string name="failed_to_upload">Не удалось загрузить</string>
+	<string name="delete_change">Удалить изменения</string>
+	<string name="successfully_uploaded_pattern">Успешно загружены {0}/{1}</string>
+	<string name="error_message_pattern">Ошибка: {0}</string>
+</resources>

OsmAnd/res/values-sc/strings.xml

@@ -117,7 +117,7 @@
     <string name="tip_faq">Preguntas fitianas</string>
     <string name="local_osm_changes_delete_all_confirm">Istas pro burrare %1$d modìficas OSM. Seguru ses?</string>
     <string name="shared_string_delete_all">Burra totu</string>
-    <string name="animate_routing_route_not_calculated">Pro piaghere, càlcula s’andala in antis</string>
+    <string name="animate_routing_route_not_calculated">Pro piaghere càlcula s’andala in antis</string>
     <string name="animate_routing_route">Dispinta impreande un\'àndala calculada </string>
     <string name="animate_routing_gpx">Dispinta impreande una caminera GPX</string>
     <string name="shared_string_remember_my_choice">Ammenta s’issèberu meu</string>
@@ -2036,4 +2036,20 @@
     <string name="rendering_value_translucent_red_name">Ruju translùcidu</string>
     <string name="rendering_value_default13_name">Predefinidu (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Predefinidu (cianu translùcidu)</string>
+    <string name="do_you_like_osmand">T\'agradat OsmAnd?</string>
+	<string name="we_really_care">Nos importat meda</string>
+	<string name="rate_this_app">Vota cust’aplicatzione</string>
+	<string name="rate_this_app_long">Pro piaghere dae unu votu a OsmAnd in Google Play</string>
+	<string name="user_hates_app_get_feedback">Narade·nos proite.</string>
+	<string name="user_hates_app_get_feedback_long">Pro piaghere, faghe·nos ischire ite dias bòlere cambiare in custa aplicatzione.</string>
+<string name="no_updates_available">Perunu agiornamentu disponìbile</string>
+    <string name="download_live_updates">Agiornamentos automàticos</string>
+	<string name="we_really_care_about_your_opinion">Nos importat meda de s\'opinione tua, est importante pro nois a ti intendere.</string>
+	<string name="failed_to_upload">Carrigamentu faddidu</string>
+	<string name="delete_change">Burra modìficas</string>
+	<string name="successfully_uploaded_pattern">Carrigamentu resessidu {0}/{1}</string>
+	<string name="try_again">Torra a proare</string>
+	<string name="error_message_pattern">Errore: {0}</string>
+<string name="rendering_value_boldOutline_name">Oru in grassetu</string>
+    <string name="traffic_warning_hazard">Perìgulu</string>
     </resources>

OsmAnd/res/values-sk/phrases.xml

@@ -662,12 +662,12 @@
 
 	<string name="poi_tomb">Hrobka</string>
 	<string name="poi_piste">Zjazdovka</string>
-	<string name="poi_piste_downhill">Zjazdárska</string>
-	<string name="poi_piste_nordic">Beh na lyžiach</string>
+	<string name="poi_piste_downhill">Zjazdovka</string>
+	<string name="poi_piste_nordic">Trať pre beh na lyžiach</string>
 	<string name="poi_piste_skitour">Lyžiarsky okruh</string>
-	<string name="poi_piste_hike">Výletná trasa</string>
-	<string name="poi_piste_sleigh">Sane v záprahu</string>
-	<string name="poi_piste_sled">Sánkovanie</string>
+	<string name="poi_piste_hike">Výletná lyžiarska trasa</string>
+	<string name="poi_piste_sleigh">Trať pre sane v záprahu</string>
+	<string name="poi_piste_sled">Trať pre sánkovanie</string>
 	<string name="poi_piste_snow_park">Areál zimných športov</string>
 	<string name="poi_piste_playground">Lyžiarska škola</string>
 	<string name="poi_piste_ice_skate">Korčuľovanie</string>
@@ -913,7 +913,122 @@
 <string name="poi_country">Krajina</string>
 	<string name="poi_enforcement_mindistance">Vynútenie:minimálna vzdialenosť</string>
 	<string name="poi_enforcement_maxspeed">Vynútenie:maximálna rýchlosť</string>
-	<string name="poi_fee">Poplatok</string>
+	<string name="poi_fee_yes">Poplatok</string>
 
 	<string name="poi_opening_hours">Otváracie hodiny</string>
+	<string name="poi_node_networks">Body cyklistických/turistických sietí</string>
+		<string name="poi_hiking_routes">Turistické trasy</string>
+		<string name="poi_traffic_enforcement">Dopravné vynútenie</string>
+	<string name="poi_free_flying">Obchod pre voľné lietanie</string>
+	<string name="poi_recycling_centre">Stredisko</string>
+	<string name="poi_recycling_container">Kontajner</string>
+	<string name="poi_recycling_glass">Sklo</string>
+	<string name="poi_recycling_paper">Papier</string>
+	<string name="poi_recycling_clothes">Oblečenie</string>
+	<string name="poi_recycling_cans">Plechovky</string>
+	<string name="poi_recycling_glass_bottles">Sklené fľaše</string>
+	<string name="poi_recycling_plastic">Plasty</string>
+	<string name="poi_recycling_scrap_metal">Železný šrot</string>
+	<string name="poi_recycling_batteries">Batérie</string>
+	<string name="poi_recycling_plastic_bottles">Plastové fľaše</string>
+	<string name="poi_recycling_green_waste">Rastlinný odpad</string>
+	<string name="poi_recycling_waste">Odpad (čierne vrecia)</string>
+	<string name="poi_recycling_plastic_packaging">Plastové obaly</string>
+	<string name="poi_recycling_newspaper">Noviny</string>
+	<string name="poi_recycling_cartons">Kartóny</string>
+	<string name="poi_recycling_cardboard">Lepenka</string>
+	<string name="poi_recycling_magazines">Časopisy</string>
+	<string name="poi_recycling_paper_packaging">Papierové obaly</string>
+	<string name="poi_recycling_small_appliances">Malé spotrebiče</string>
+	<string name="poi_recycling_wood">Drevo</string>
+	<string name="poi_recycling_books">Knihy</string>
+	<string name="poi_recycling_shoes">Topánky</string>
+	<string name="poi_recycling_aluminium">Hliník</string>
+	<string name="poi_recycling_organic">Bioodpad</string>
+	<string name="poi_recycling_beverage_cartons">Kartóny z nápojov</string>
+	<string name="poi_recycling_garden_waste">Záhradný odpad</string>
+	<string name="poi_recycling_low_energy_bulbs">Úsporné žiarovky</string>
+	<string name="poi_recycling_fluorescent_tubes">Svetelné trubice</string>
+	<string name="poi_recycling_metal">Kovy</string>
+	<string name="poi_recycling_electrical_items">Elektrické časti</string>
+	<string name="poi_recycling_white_goods">Biela technika</string>
+	<string name="poi_recycling_cooking_oil">Olej na varenie</string>
+	<string name="poi_recycling_engine_oil">Motorový olej</string>
+	<string name="poi_recycling_plastic_bags">Plastové tašky</string>
+	<string name="poi_recycling_hazardous_waste">Nebezpečný odpad</string>
+	<string name="poi_recycling_mobile_phones">Mobily</string>
+	<string name="poi_recycling_hydrargyrum">Hydrargyrum</string>
+	<string name="poi_recycling_computers">Počítače</string>
+	<string name="poi_recycling_tyres">Pneumatiky</string>
+	<string name="poi_recycling_tv_monitor">Obrazovky</string>
+	<string name="poi_recycling_tetrapak">Tetrapaky</string>
+	<string name="poi_recycling_rubble">Drvina</string>
+	<string name="poi_recycling_cds">CD</string>
+	<string name="poi_recycling_waste_oil">Olej</string>
+	<string name="poi_recycling_bottles">Fľaše</string>
+	<string name="poi_recycling_cork">Korok</string>
+	<string name="poi_recycling_printer_cartridges">Tlačové hlavy</string>
+	<string name="poi_recycling_sheet_metal">Kovové platne</string>
+	<string name="poi_recycling_foil">Fólie</string>
+	<string name="poi_recycling_paint">Farby</string>
+	<string name="poi_recycling_styrofoam">Polystyrén</string>
+	<string name="poi_recycling_drugs">Lieky</string>
+	<string name="poi_recycling_compost">Kompost</string>
+	<string name="poi_recycling_christmas_trees">Vianočné stromčeky</string>
+	<string name="poi_recycling_light_bulbs">Žiarovky</string>
+	<string name="poi_recycling_chipboard">Drevotrieska</string>
+	<string name="poi_recycling_polyester">Polyester</string>
+	<string name="poi_recycling_plasterboard">Sadrokartón</string>
+	<string name="poi_recycling_animal_waste">Živočíšny odpad</string>
+	<string name="poi_recycling_fridge_and_freezer">Chladničky</string>
+	<string name="poi_recycling_furniture">Nábytok</string>
+	<string name="poi_recycling_diapers">Plienky</string>
+	<string name="poi_recycling_car_batteries">Autobatérie</string>
+	<string name="poi_recycling_cars">Autá</string>
+	<string name="poi_recycling_bicycles">Bicykle</string>
+
+	<string name="poi_monitoring_station">Meracia stanica</string>
+	<string name="poi_capital">Hlavné mesto</string>
+	<string name="poi_shower">Sprcha</string>
+	<string name="poi_animal_shelter_bird">Prístrešok pre vtáky</string>
+
+<string name="poi_animal_shelter_dog">Prístrešok pre psy</string>
+	<string name="poi_animal_shelter_cat">Prístrešok pre mačky</string>
+	<string name="poi_animal_shelter_dog_cat">Prístrešok pre psy a mačky</string>
+	<string name="poi_fee_no">Bez poplatku</string>
+	<string name="poi_drinking_water_yes">Pitná voda</string>
+	<string name="poi_drinking_water_no">Nepitná voda</string>
+	<string name="poi_supervised_yes">Strážené</string>
+	<string name="poi_supervised_no">Nestrážené</string>
+	<string name="poi_seasonal_yes">Sezónne</string>
+	<string name="poi_seasonal_no">Celoročné</string>
+	<string name="poi_seasonal_dry_season">V suchom období</string>
+	<string name="poi_seasonal_wet_season">V mokrom období</string>
+	<string name="poi_seasonal_spring">Jar</string>
+	<string name="poi_seasonal_summer">Leto</string>
+	<string name="poi_seasonal_autumn">Jeseň</string>
+	<string name="poi_seasonal_winter">Zima</string>
+	<string name="poi_crossing_traffic_signals">So semaforom</string>
+	<string name="poi_crossing_uncontrolled">Neriadený</string>
+	<string name="poi_crossing_unmarked">Nevyznačený</string>
+
+	<string name="poi_access_private">Prístup len pre vlastníka</string>
+	<string name="poi_access_no">Žiadny prístup</string>
+	<string name="poi_access_destination">Prístup len k cieľu</string>
+	<string name="poi_access_permissive">Prístup povolený</string>
+	<string name="poi_access_customers">Prístup len pre zákazníkov</string>
+	<string name="poi_access_delivery">Prístup pre zásobovanie</string>
+	<string name="poi_access_agricultural">Prístup na poľnohospodárske účely</string>
+
+	<string name="poi_abandoned_poi">Opustený objekt</string>
+	<string name="poi_email">E-mailová adresa</string>
+	<string name="poi_fax">Fax</string>
+	<string name="poi_facebook">Facebook</string>
+	<string name="poi_mobile">Mobilný telefón</string>
+	<string name="poi_route_hiking_iwn_poi">Medzinárodná pešia trasa</string>
+	<string name="poi_route_hiking_nwn_poi">Národná pešia trasa</string>
+	<string name="poi_route_hiking_rwn_poi">Regionálna pešia trasa</string>
+	<string name="poi_route_hiking_lwn_poi">Lokálna pešia trasa</string>
+	<string name="poi_route_hiking_ref_poi">Číslo pešej trasy</string>
+
 	</resources>

OsmAnd/res/values-sk/strings.xml

@@ -2236,4 +2236,20 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="rendering_value_default13_name">Predvolená (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Predvolená (priehľadná azúrová)</string>
     <string name="rendering_value_translucent_blue_name">Priehľadná modrá</string>
+    <string name="do_you_like_osmand">Páči sa vám OsmAnd?</string>
+	<string name="we_really_care">Zaujíma nás to</string>
+	<string name="rate_this_app">Ohodnotiť aplikáciu</string>
+	<string name="rate_this_app_long">Prosím dajte OsmAnd hodnotenie na Google Play</string>
+	<string name="user_hates_app_get_feedback">Povedzte nám prečo.</string>
+	<string name="user_hates_app_get_feedback_long">Prosím povedzte nám čo by ste chceli v aplikácii zmeniť.</string>
+<string name="no_updates_available">Nie sú dostupné žiadne aktualizácie</string>
+    <string name="download_live_updates">Živé aktualizácie</string>
+	<string name="we_really_care_about_your_opinion">Zaujíma nás váš názor a je pre nás dôležité počuť vašu odozvu.</string>
+	<string name="failed_to_upload">Nepodarilo sa odoslať</string>
+	<string name="delete_change">Odstrániť zmenu</string>
+	<string name="successfully_uploaded_pattern">Úspešne odoslané {0}/{1}</string>
+	<string name="try_again">Skúste znova</string>
+	<string name="error_message_pattern">Chyba: {0}</string>
+<string name="traffic_warning_hazard">Nebezpečenstvo</string>
+    <string name="rendering_value_boldOutline_name">Hrubý obrys</string>
     </resources>

OsmAnd/res/values-sl/strings.xml

@@ -1930,4 +1930,20 @@
     <string name="rendering_value_green_name">Zelena</string>
     <string name="rendering_value_default13_name">Privzeto (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Privzeto (prosojna sinja)</string>
-    </resources>
+    <string name="do_you_like_osmand">Ali vam je program Osmand všeč?</string>
+	<string name="we_really_care">Ni nam vseeno!</string>
+	<string name="rate_this_app">Ocenite program</string>
+	<string name="rate_this_app_long">Ocenite program na Google Play</string>
+	<string name="user_hates_app_get_feedback">Povejte nam, zakaj.</string>
+	<string name="user_hates_app_get_feedback_long">Povejte nam, kaj želite spremeniti v programu.</string>
+<string name="download_live_updates">Sprotne posodobitve</string>
+	<string name="traffic_warning_hazard">Nevarnost</string>
+    <string name="rendering_value_boldOutline_name">Poudarjen obris</string>
+    <string name="no_updates_available">Ni posodobitev</string>
+    <string name="we_really_care_about_your_opinion">Vaš odziv je zelo pomemben, zato si želimo slišati vsa vaša mnenja in pripombe.</string>
+	<string name="failed_to_upload">Pošiljanje je spodletelo</string>
+	<string name="delete_change">Izbriši spremembe</string>
+	<string name="successfully_uploaded_pattern">Uspešno poslano {0}/{1}</string>
+	<string name="try_again">Poskusi znova</string>
+	<string name="error_message_pattern">Napaka: {0}</string>
+</resources>

OsmAnd/res/values-sv/strings.xml

@@ -1948,4 +1948,19 @@
     <string name="rendering_value_yellow_name">Gul</string>
     <string name="rendering_value_default13_name">Standard (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">Standard (genomskinlig turkos)</string>
+    <string name="do_you_like_osmand">Tycker du om OsmAnd?</string>
+	<string name="we_really_care">Vi bryr oss verkligen</string>
+	<string name="rate_this_app">Betygssätt denna app</string>
+	<string name="rate_this_app_long">Poängsätt OsmAnd på Google Play</string>
+	<string name="user_hates_app_get_feedback">Berätta för oss varför.</string>
+	<string name="user_hates_app_get_feedback_long">Berätta för oss vad du vill förändra i denna app.</string>
+<string name="download_live_updates">Liveuppdateringar</string>
+	<string name="failed_to_upload">Uppladdningen misslyckades</string>
+	<string name="delete_change">Ta bort ändringarna</string>
+	<string name="successfully_uploaded_pattern">Laddade upp {0}/{1} utan problem</string>
+	<string name="try_again">Försök igen</string>
+	<string name="error_message_pattern">Fel: {0}</string>
+<string name="no_updates_available">Inga uppdateringar tillgängliga</string>
+    <string name="we_really_care_about_your_opinion">Vi bryr oss mycket om vad du tycker och det är viktigt för oss att höra din åsikt.</string>
+	<string name="rendering_value_boldOutline_name">Fet kontur</string>
     </resources>

OsmAnd/res/values-tr/strings.xml

@@ -165,8 +165,8 @@
     <string name="recording_context_menu_delete">Kayıt sil</string>
     <string name="recording_description">Kayıt %3$s nın %1$s %2$s</string>
     <string name="recording_default_name">kayıt</string>
-    <string name="shared_string_control_stop">durdur</string>
-    <string name="shared_string_control_start">başlat</string>
+    <string name="shared_string_control_stop">Durdur</string>
+    <string name="shared_string_control_start">Başlat</string>
     <string name="map_widget_av_notes">Ses/video notları</string>
     <string name="osmand_srtm_short_description_80_chars">Çevrimdışı çevreleme çizgileri için OsmAnd eklentisi</string>
     <string name="osmand_srtm_long_description_1000_chars">Bu eklenti OsmAnd adlı çevrimdışı haritalar gösterilebilir kontür çizgileri sağlar. Global veri (70 derece kuzey ve 70 derece güney arasındaki) SRTM (Mekik Radar Topografi Misyonu) ve ASTER (Gelişmiş Uzay Termal Yayılma ve Yansıma Radyometre), bir görüntüleme aracı onboard Terra, NASA&amp;#39;nın Earth Gözlem amiral gemisi uydudan ölçümleri esas Sistemi. ASTER NASA arasında bir kooperatif çabadır, Ekonomi, Ticaret ve Sanayi Odası (METI) ve Japonya Uzay Sistemleri (J-spacesystems) Japonya Bakanlığı.</string>
@@ -257,7 +257,7 @@
 	</string>
 	<string name="day_night_info_description">Gün doğumu:%1$s
 \nGün batımı:%2$s</string>
-	<string name="map_widget_vector_attributes">Rendering öznitelikleri:</string>
+	<string name="map_widget_vector_attributes"/>
 	<string name="map_widget_renderer">Harita tarzı</string>
 	
 	
@@ -1105,7 +1105,7 @@
 	<string name="osb_author_dialog_password">OSM şifresi (isteğe bağlı)</string>
 	<string name="poi_action_succeded_template">{0} olayı başarıyla tamamlandı.</string>
 	<string name="poi_dialog_name">İsim</string>
-	<string name="shared_string_clear">Sıfırla</string>
+	<string name="shared_string_clear">Temizle</string>
 	<string name="filter_current_poiButton">Süzgeç</string>
 	<string name="edit_filter_delete_dialog_title">Seçilen süzgeç silinsin mi?</string>
 	<string name="edit_filter_delete_message">{0} süzgeci silindi</string>
@@ -1179,11 +1179,11 @@
     <string name="tip_faq_t">https://code.google.com/p/osmand/wiki/FAQ Sık sorulan soruları görmek için , karşılaşabileceğinizURL\'ye bakın .</string>
     <string name="tip_faq">SSS</string>
     <string name="local_osm_changes_delete_all_confirm">Siz %1$d osm değişiklikleri kaldırmak üzeresiniz .Emin misin ?</string>
-    <string name="shared_string_delete_all">Tümünü kaldır</string>
+    <string name="shared_string_delete_all">Tümünü sil</string>
     <string name="animate_routing_route_not_calculated">Şimdi rotayı hesaplamak Lütfen</string>
     <string name="animate_routing_route">Hesaplanan rotayı kullanarak simülasyon </string>
     <string name="animate_routing_gpx">GPX Rota kullanarak simülasyonlar</string>
-    <string name="shared_string_remember_my_choice">Seçmeyi unutmayın</string>
+    <string name="shared_string_remember_my_choice">Seçimimi hatırla</string>
     
     <string name="shared_string_and">ve</string>
     <string name="shared_string_or">veya</string>
@@ -1229,4 +1229,124 @@
     <string name="current_route">Şu anki rota</string>
     <string name="mark_to_delete">Silmek için işaretle</string>
 	<string name="confirmation_to_clear_history">Geçmişi temizlemek istiyor musunuz?</string>
-    </resources>
+    <string name="no_updates_available">Kullanılabilir güncelleme yok</string>
+    <string name="download_live_updates">Canlı güncellemeler</string>
+	<string name="rendering_value_default13_name">Varsayılan (13)</string>
+	<string name="rendering_value_defaultTranslucentCyan_name">Varsayılan (yarı saydam camgöbeği)</string>
+    <string name="rendering_attr_currentTrackColor_name">GPX rengi</string>
+    <string name="rendering_attr_currentTrackWidth_name">GPX genişliği</string>
+    <string name="rendering_value_red_name">Kırmızı</string>
+    <string name="rendering_value_translucent_red_name">Yarı saydam kırmızı</string>
+    <string name="rendering_value_orange_name">Turuncu</string>
+    <string name="rendering_value_translucent_orange_name">Yarı saydam turuncu</string>
+    <string name="rendering_value_yellow_name">Sarı</string>
+    <string name="rendering_value_translucent_yellow_name">Yarı saydam sarı</string>
+    <string name="rendering_value_lightgreen_name">Açık yeşil</string>
+    <string name="rendering_value_translucent_lightgreen_name">Yarı saydam açık yeşil</string>
+    <string name="rendering_value_green_name">Yeşil</string>
+    <string name="rendering_value_translucent_green_name">Yarı saydam yeşil</string>
+    <string name="rendering_value_lightblue_name">Açık mavi</string>
+    <string name="rendering_value_translucent_lightblue_name">Yarı saydam açık mavi</string>
+    <string name="rendering_value_blue_name">Mavi</string>
+    <string name="rendering_value_translucent_blue_name">Yarı saydam açık mavi</string>
+    <string name="rendering_value_purple_name">Mor</string>
+    <string name="rendering_value_translucent_purple_name">Yarı saydam mor</string>
+    <string name="restart_is_required">Değişikliklerin geçerli olabilmesi için uygulamayı yeniden başlatmalısınız.</string>
+    <string name="light_theme">Açık</string>
+    <string name="dark_theme">Koyu</string>
+    <string name="lang_pms">Piedmontese</string>
+    <string name="error_message_pattern">Hata: {0}</string>
+<string name="user_hates_app_get_feedback">Nedenini bize söyleyin.</string>
+	<string name="user_hates_app_get_feedback_long">Lütfen bize bu uygulamada ne değişklikler olmasını istediğinizi söyleyin.</string>
+	<string name="failed_to_upload">Yükleme başarısız oldu</string>
+	<string name="delete_change">Değişikliği sil</string>
+	<string name="successfully_uploaded_pattern">Başarıyla yüklendi {0}/{1}</string>
+	<string name="try_again">Tekrar deneyin</string>
+	<string name="archive_wikipedia_data">Daha önce eski ve uyumsuz Wikipedia verisi indirmişsiniz. Bunları arşivlemek ister misiniz?</string>
+    <string name="download_wikipedia_files">Ekstra Wikipedia verisi indirmek ister misiniz? (%1$s MB)</string>
+    <string name="gps_network_not_enabled">Konum servisi devre dışı. Ektinleştirmek ister misiniz?</string>
+    <string name="shared_string_show_details">Detayları göster</string>
+    <string name="rendering_value_disabled_name">Devre dışı</string>
+    <string name="osmo_share_my_location">Konumumu paylaş</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Ev numaralarını gizle</string>
+    <string name="confirm_usage_speed_cameras">Bazı ülkelerde (Almanya, Fransa, İtalya ve diğerleri) hız kamerası uyarılarının kullanımı yasaktır. OsmAnd yasaları çiğnemeniz durumunda sorumluluk kabul etmez. Eğer bu özellik sizin için uygunsa evet\'e tıklayın.</string>
+	<string name="osmo_grop_name_length_alert">Grup ismi en az 3 karakter olmalıdır!</string>
+	<string name="shared_string_go">Git</string>
+	<string name="action_create">Eylem oluştur</string>
+	<string name="action_modify">Eylem düzenle</string>
+	<string name="action_delete">Eylem sil</string>
+	<string name="osm_edits">OSM düzeltmeleri</string>
+	<string name="osmand_parking_hour">sa</string>
+	<string name="osmand_parking_minute">dk</string>
+	<string name="osmand_parking_time_left">sol</string>
+	<string name="your_edits">Düzeltmeleriniz</string>
+    <string name="tips_and_tricks_descr">Sık sorulan sorular, son değişiklikler ve diğerleri</string>
+    <string name="routing_settings_2">Navigasyon ayarları</string>
+    <string name="general_settings_2">Genel ayarlar</string>
+	<string name="shared_string_do_not_use">Kullanma</string>
+	<string name="shared_string_enable">Etkinleştir</string>
+	<string name="shared_string_disable">Devre dışı bırak</string>
+	<string name="shared_string_enabled">Etkin</string>
+	<string name="shared_string_disabled">Devre dışı</string>
+	<string name="shared_string_selected">Seçili</string>
+	<string name="shared_string_never">Hiçbir zaman</string>
+	<string name="shared_string_select_on_map">Haritadan seç</string>
+	<string name="shared_string_share">Paylaş</string>
+	<string name="shared_string_export">Dışa aktar</string>
+	<string name="shared_string_more">Daha…</string>
+	<string name="shared_string_unexpected_error">Beklenmeyen hata oluştu</string>
+	<string name="shared_string_action_template">Eylem {0}</string>
+	<string name="shared_string_show">Göster</string>
+	<string name="shared_string_show_all">Tümünü göster</string>
+	<string name="shared_string_favorite">Favori</string>
+	<string name="shared_string_address">Adres</string>
+	<string name="shared_string_my_location">Konumum</string>
+	<string name="shared_string_my_places">Yerlerim</string>
+	<string name="shared_string_my_favorites">Favorilerim</string>
+	<string name="shared_string_audio">Ses</string>
+	<string name="shared_string_video">Vidyo</string>
+	<string name="shared_string_photo">Fotoğraf</string>
+	<string name="days_behind">gün geride</string>
+	<string name="back_to_map">Haritaya dön</string>
+	<string name="share_note">Not paylaş</string>
+    <string name="watch">İzle</string>
+	<string name="notes">Notlar</string>
+	<string name="online_map">Çevrimiçi harita</string>
+	<string name="roads_only">Sadece yollar</string>
+    <string name="device_memory">Cihaz hafızası</string>
+    <string name="edit_group">Grubu düzenle</string>
+    <string name="parking_place">Park yeri</string>
+    <string name="gps_status">GPS durumu</string>
+    <string name="points">Noktalar</string>
+	<string name="rendering_attr_roadStyle_name">Yol tipi</string>
+    <string name="rendering_value__name">Varsayılan</string>
+    <string name="rendering_value_default_name">Varsayılan</string>
+    <string name="traffic_warning_pedestrian">Yaya geçidi</string>
+	<string name="show_pedestrian_warnings">Yaya geçitlerini göster</string>
+    <string name="dash_download_msg_none">Çevrimdışı haritaları indirmek istiyor musunuz?</string>
+    <string name="dash_download_msg">%1$s harita indirdiniz</string>
+    <string name="dash_download_new_one">Yeni harita indir</string>
+    <string name="dash_download_manage">Yönet</string>
+    <string name="map_locale">Harita dili</string>
+    <string name="download_tab_downloads">Tüm İndirmeler</string>
+    <string name="download_tab_updates">Güncellemeler</string>
+    <string name="download_tab_local">Yerel</string>
+	<string name="everything_up_to_date">Tüm dosyalar güncel</string>
+    <string name="home_button">Ev</string>
+    <string name="osmo_use_https">HTTPS kullan</string>
+	<string name="map_update">%1$s harita için güncelleme var</string>
+	<string name="coordinates">Koordinatlar</string>
+	<string name="rendering_category_details">Ayrıntılar</string>
+    <string name="map_widget_top">Durum çubuğu</string>
+	<string name="map_widget_right">Sağ panel</string>
+	<string name="map_widget_left">Sol panel</string>
+	<string name="configure_map">Haritayı yapılandır</string>
+    <string name="osmo_device_not_found">Cihaz bulunamadı</string>
+    <string name="speed_limit_exceed">Hız limiti toleransı</string>
+	<string name="traffic_warning_speed_limit">Hız limiti</string>
+    <string name="traffic_warning_stop">Dur işareti</string>
+    <string name="traffic_warning_speed_camera">Hız kamerası</string>
+    <string name="traffic_warning">Trafik uyarısı</string>
+	<string name="way_alarms">Trafik uyarıları</string>
+	<string name="confirm_every_run">Her zaman sor</string>
+	</resources>

OsmAnd/res/values-zh-rTW/phrases.xml

@@ -408,7 +408,7 @@
 	<string name="poi_american_football">美式橄榄球</string>
 	<string name="poi_australian_football">澳大利亞足球</string>
 	<string name="poi_base">定點跳傘</string>
-	<string name="poi_piste_sleigh">雪橇</string>
+	<string name="poi_piste_sleigh">雪橇滑雪道</string>
 	<string name="poi_picnic_site">野餐地點</string>
 	<string name="poi_baseball">棒球</string>
 	<string name="poi_basketball">籃球</string>
@@ -575,13 +575,13 @@
 	<string name="poi_club_charity">慈善俱樂部</string>
 
 	<string name="poi_piste">滑雪道</string>
-	<string name="poi_piste_downhill">下坡</string>
-	<string name="poi_piste_nordic">北歐</string>
-	<string name="poi_piste_skitour">滑雪旅行</string>
-	<string name="poi_piste_hike">徒步旅行</string>
-	<string name="poi_piste_sled">雪橇</string>
+	<string name="poi_piste_downhill">下坡滑雪道</string>
+	<string name="poi_piste_nordic">北歐滑雪道</string>
+	<string name="poi_piste_skitour">滑雪旅行滑雪道</string>
+	<string name="poi_piste_hike">徒步旅行滑雪道</string>
+	<string name="poi_piste_sled">雪橇滑雪道</string>
 	<string name="poi_piste_snow_park">雪上公園</string>
-	<string name="poi_piste_playground">遊樂場</string>
+	<string name="poi_piste_playground">遊樂場滑雪道</string>
 	<string name="poi_piste_ice_skate">溜冰鞋</string>
 	<string name="poi_ski_rental">滑雪用具租賃</string>
 
@@ -724,7 +724,7 @@
 	<string name="poi_valley">山谷</string>
 	<string name="poi_water">水</string>
 	<string name="poi_wetland">濕地</string>
-	<string name="poi_wood">樹木</string>
+	<string name="poi_wood">木頭</string>
 	<string name="poi_nature_reserve">自然保護區</string>
 	<string name="poi_strait">海峽</string>
 	<string name="poi_island">島嶼</string>
@@ -922,7 +922,122 @@
 	<string name="poi_enforcement_toll">執法：收費</string>
 
 <string name="poi_country">國家</string>
-	<string name="poi_fee">費用</string>
+	<string name="poi_fee_yes">費用</string>
 
 	<string name="poi_abandoned_poi">已遺棄的物件</string>
+	<string name="poi_route_hiking_iwn_poi">國際步行路線</string>
+	<string name="poi_route_hiking_nwn_poi">全國步行路線</string>
+	<string name="poi_route_hiking_rwn_poi">地區性步行路線</string>
+	<string name="poi_route_hiking_lwn_poi">當地步行路線</string>
+	<string name="poi_route_hiking_ref_poi">徒步旅行路線參考</string>
+
+	<string name="poi_node_networks">徒步旅行/自行車網路節點</string>
+		<string name="poi_hiking_routes">徒步路線</string>
+		<string name="poi_traffic_enforcement">交通執法</string>
+	<string name="poi_access_private">私人通路</string>
+	<string name="poi_access_no">禁止通行</string>
+	<string name="poi_access_destination">指定通行</string>
+	<string name="poi_access_permissive">容許通行</string>
+	<string name="poi_access_customers">顧客通行</string>
+	<string name="poi_access_delivery">交貨通行</string>
+	<string name="poi_access_agricultural">農用通路</string>
+
+	<string name="poi_monitoring_station">監測站</string>
+	<string name="poi_capital">首都</string>
+	<string name="poi_fee_no">不收費</string>
+
+	<string name="poi_email">電子郵件</string>
+	<string name="poi_fax">傳真</string>
+	<string name="poi_facebook">臉書</string>
+	<string name="poi_mobile">行動電話</string>
+	<string name="poi_animal_shelter_dog">流浪狗庇護所</string>
+	<string name="poi_animal_shelter_cat">流浪貓庇護所</string>
+	<string name="poi_animal_shelter_dog_cat">流浪狗和貓庇護所</string>
+	<string name="poi_animal_shelter_bird">野鳥庇護所</string>
+
+<string name="poi_shower">淋浴</string>
+	<string name="poi_recycling_centre">中心</string>
+	<string name="poi_recycling_container">貨櫃</string>
+	<string name="poi_recycling_glass">玻璃</string>
+	<string name="poi_recycling_paper">紙</string>
+	<string name="poi_recycling_clothes">衣服</string>
+	<string name="poi_recycling_cans">罐頭</string>
+	<string name="poi_recycling_glass_bottles">玻璃瓶</string>
+	<string name="poi_recycling_plastic">塑膠</string>
+	<string name="poi_recycling_scrap_metal">廢金屬</string>
+	<string name="poi_recycling_batteries">電池</string>
+	<string name="poi_recycling_plastic_bottles">塑膠瓶</string>
+	<string name="poi_recycling_green_waste">綠色廢棄物</string>
+	<string name="poi_recycling_waste">垃圾 (黑色袋)</string>
+	<string name="poi_recycling_plastic_packaging">塑膠包裝</string>
+	<string name="poi_recycling_newspaper">報紙</string>
+	<string name="poi_recycling_cartons">紙箱</string>
+	<string name="poi_recycling_cardboard">紙板</string>
+	<string name="poi_recycling_magazines">雜誌</string>
+	<string name="poi_recycling_paper_packaging">紙包裝</string>
+	<string name="poi_recycling_small_appliances">小家電</string>
+	<string name="poi_recycling_wood">木頭</string>
+	<string name="poi_recycling_books">書籍</string>
+	<string name="poi_recycling_shoes">鞋子</string>
+	<string name="poi_recycling_aluminium">鋁</string>
+	<string name="poi_recycling_organic">有機的</string>
+	<string name="poi_recycling_beverage_cartons">飲料盒</string>
+	<string name="poi_recycling_garden_waste">園藝廢棄物</string>
+	<string name="poi_recycling_low_energy_bulbs">低能耗燈泡</string>
+	<string name="poi_recycling_fluorescent_tubes">日光燈管</string>
+	<string name="poi_recycling_metal">金屬</string>
+	<string name="poi_recycling_electrical_items">電器用品</string>
+	<string name="poi_recycling_cooking_oil">食用油</string>
+	<string name="poi_recycling_engine_oil">引擎機油</string>
+	<string name="poi_recycling_plastic_bags">塑膠袋</string>
+	<string name="poi_recycling_hazardous_waste">危險廢棄物</string>
+	<string name="poi_recycling_mobile_phones">行動電話</string>
+	<string name="poi_recycling_hydrargyrum">水銀</string>
+	<string name="poi_recycling_computers">電腦</string>
+	<string name="poi_recycling_tyres">輪胎</string>
+	<string name="poi_recycling_tv_monitor">電視、監視器</string>
+	<string name="poi_recycling_tetrapak">利樂包</string>
+	<string name="poi_recycling_rubble">碎石</string>
+	<string name="poi_recycling_cds">光碟</string>
+	<string name="poi_recycling_waste_oil">廢棄油</string>
+	<string name="poi_recycling_bottles">瓶子</string>
+	<string name="poi_recycling_cork">軟木塞</string>
+	<string name="poi_recycling_printer_cartridges">印表機墨水匣</string>
+	<string name="poi_recycling_foil">鋁箔</string>
+	<string name="poi_recycling_paint">油漆</string>
+	<string name="poi_recycling_styrofoam">保麗龍</string>
+	<string name="poi_recycling_drugs">藥物</string>
+	<string name="poi_recycling_compost">堆肥</string>
+	<string name="poi_recycling_christmas_trees">聖誕樹</string>
+	<string name="poi_recycling_light_bulbs">燈泡</string>
+	<string name="poi_recycling_chipboard">膠合板</string>
+	<string name="poi_recycling_polyester">聚酯纖維</string>
+	<string name="poi_recycling_plasterboard">石膏板</string>
+	<string name="poi_recycling_fridge_and_freezer">冰箱和冰櫃</string>
+	<string name="poi_recycling_furniture">傢俱</string>
+	<string name="poi_recycling_diapers">紙尿褲</string>
+	<string name="poi_recycling_car_batteries">汽車電池</string>
+	<string name="poi_recycling_cars">汽車</string>
+	<string name="poi_recycling_bicycles">自行車</string>
+
+	<string name="poi_drinking_water_yes">飲用水</string>
+	<string name="poi_drinking_water_no">非飲用水</string>
+	<string name="poi_seasonal_yes">季節性的</string>
+	<string name="poi_seasonal_no">非季節性的</string>
+	<string name="poi_seasonal_dry_season">乾燥季節</string>
+	<string name="poi_seasonal_wet_season">潮濕季節</string>
+	<string name="poi_seasonal_spring">春季</string>
+	<string name="poi_seasonal_summer">夏季</string>
+	<string name="poi_seasonal_autumn">秋季</string>
+	<string name="poi_seasonal_winter">冬季</string>
+	<string name="poi_crossing_traffic_signals">偕同交通號誌</string>
+	<string name="poi_crossing_uncontrolled">無控制的</string>
+	<string name="poi_crossing_unmarked">無標志的</string>
+
+	<string name="poi_recycling_white_goods">白色家電</string>
+	<string name="poi_recycling_sheet_metal">金屬片</string>
+	<string name="poi_recycling_hardcore">碎石層</string>
+	<string name="poi_recycling_animal_waste">動物廢棄物</string>
+	<string name="poi_supervised_yes">有監管</string>
+	<string name="poi_supervised_no">沒有監管</string>
 	</resources>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -134,7 +134,7 @@
 	<string name="shared_location">分享位置</string>
 	<string name="osmand_parking_event">由停車場取車</string>
 	<string name="osmand_parking_warning">警示</string>
-	<string name="osmand_parking_warning_text">取車通知先前已加到您的行事曆中。它會留在那裡直到您手動刪除它。</string>    
+	<string name="osmand_parking_warning_text">取車通知在先前已加到您的行事曆中。它會一直保留在那裡，直到您手動刪除它。</string>    
 	<string name="osmand_parking_time_limit_title">設定停車時限</string>
 	<string name="osmand_parking_delete_confirm">您要移除停車位置嗎？</string>
 	<string name="osmand_parking_delete">刪除停車位置標記</string>
@@ -470,7 +470,7 @@
 	<string name="tts_language_not_supported_title">該語言未支援</string>
 	<string name="tts_language_not_supported">選用的語言 Android TTS 引擎未支援，您要到 Play 商場找其它引擎嗎？否則使用之前設定的語言。</string>
 	<string name="tts_missing_language_data_title">資料遺失</string>
-	<string name="tts_missing_language_data">您選的語言未安裝，您要到 Play 商場安裝嗎？</string>
+	<string name="tts_missing_language_data">您選的語言未安裝，您要轉到 Play 商場安裝嗎？</string>
 	<string name="gpx_option_reverse_route">反轉 GPX 方向</string>
 	<string name="gpx_option_destination_point">使用目前的目的地</string>
 	<string name="gpx_option_from_start_point">沿著整條軌跡往前</string>
@@ -1127,9 +1127,9 @@
     <string name="files_limit">剩餘 %1$d 個檔</string>
     <string name="layer_recordings">記錄層</string>
 	<string name="intermediate_items_sort_return">在目前的位置到達目的地之間的路途上，沿途的航點已採取了最佳化排列。</string>
-    <string name="osmand_srtm_long_description_1000_chars">"這個外掛元件同時提供了等高線層和（地貌）山體陰影層，顯示在 OsmAnd 的離線地圖頂部。此功能會讓運動選手、徒步旅行者、背包客，和任何感興趣的人對起伏的地貌結構大加讚賞。\n\n全球圖資（在北緯 70 度至南緯 70 度之間）的量測基礎在於 SRTM (Shuttle Radar Topography Mission)和 ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer)，遙測儀器安裝在美國太空總署地球觀測系統的旗艦衛星 Terra 上，ASTER 是美國太空總署、日本經濟產業省(METI)、日本太空系統 (J-spacesystems)之間的通力合作產物。 "</string>
+    <string name="osmand_srtm_long_description_1000_chars">"這個外掛元件同時提供了等高線層和（地貌）山體陰影層，顯示在 OsmAnd 的離線地圖頂部。此功能會讓運動選手、徒步旅行者、背包客，和任何感興趣的人對起伏的地貌結構大加讚賞。\n\n全球圖資（在北緯 70 度至南緯 70 度之間）的量測基礎在於 SRTM (Shuttle Radar Topography Mission)和 ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer)，安裝在美國太空總署地球觀測系統的旗艦衛星 Terra 上的遙測儀器，ASTER 是美國太空總署、日本經濟產業省(METI)、日本太空系統 (J-spacesystems)之間的通力合作產物。 "</string>
     <string name="audionotes_location_not_defined">以位置去關聯的注解尚未下定義。\"使用位置 …\"，把注解分配給指定的位置</string>
-    <string name="srtm_plugin_description">"這個外掛元件同時提供了等高線層和（地貌）山體陰影層，顯示在 OsmAnd 的離線地圖頂部。此功能會讓運動選手、徒步旅行者、背包客，和任何感興趣的人對起伏的地貌結構大加讚賞。\n\n全球圖資（在 70 度以北和 70 度以南之間）的量測基礎在於 SRTM（Shuttle Radar Topography Mission）和 ASTER（Advanced Spaceborne Thermal Emission and Reflection Radiometer），遙測儀器裝載在美國太空總署的地球觀測系統人造衛星 Terra 上，ASTER 是美國太空總署、日本經濟產業省（METI）、日本太空系統（J-spacesystems）之間的通力合作的產物。 "</string>
+    <string name="srtm_plugin_description">"這個外掛元件同時提供了等高線層和（地貌）山體陰影層，顯示在 OsmAnd 的離線地圖頂部。此功能會讓運動選手、徒步旅行者、背包客，和任何感興趣的人對起伏的地貌結構大加讚賞。\n\n全球圖資（在 70 度以北和 70 度以南之間）的量測基礎在於 SRTM（Shuttle Radar Topography Mission）和 ASTER（Advanced Spaceborne Thermal Emission and Reflection Radiometer），安裝在美國太空總署地球觀測系統的旗艦衛星 Terra 上的遙測儀器，ASTER 是美國太空總署、日本經濟產業省（METI）、日本太空系統（J-spacesystems）之間的通力合作的產物。 "</string>
     <string name="tip_recent_changes_0_7_2_t">在0.7.2的變更：
 		\n\t- Native rendering for all devices
 		\n\t- Offline POI editing
@@ -1901,7 +1901,7 @@
 	<string name="shared_string_remember_my_choice">記住我的選擇</string>
 	<string name="shared_string_refresh">重整</string>
 	<string name="shared_string_download">下載</string>
-	<string name="shared_string_downloading">下載中</string>
+	<string name="shared_string_downloading">正在下載</string>
 	<string name="shared_string_download_successful">下載成功</string>
 	<string name="shared_string_unexpected_error">發生意外錯誤</string>
 	<string name="shared_string_action_template">行動 {0}</string>
@@ -2059,4 +2059,20 @@
     <string name="rendering_value_translucent_purple_name">半透明的紫色</string>
     <string name="rendering_value_default13_name">預設 (13)</string>
 	<string name="rendering_value_defaultTranslucentCyan_name">預設 (半透明青色)</string>
+    <string name="do_you_like_osmand">您喜歡 osmand 嗎？</string>
+	<string name="we_really_care">我們真的在意</string>
+	<string name="rate_this_app">評論這個 app</string>
+	<string name="rate_this_app_long">請在 Google Play 給 OsmAnd 分數</string>
+	<string name="user_hates_app_get_feedback">告訴我們為什麼。</string>
+	<string name="user_hates_app_get_feedback_long">請告訴我們這個應用程式您想要更改些什麼。</string>
+<string name="download_live_updates">即時更新</string>
+	<string name="failed_to_upload">上載失敗</string>
+	<string name="delete_change">刪除更改</string>
+	<string name="successfully_uploaded_pattern">已成功上載 {0} / {1}</string>
+	<string name="try_again">再試一次</string>
+	<string name="error_message_pattern">錯誤：{0}</string>
+<string name="no_updates_available">沒可用的更新</string>
+    <string name="we_really_care_about_your_opinion">我們很在乎您的意見，並且聽到您的反映對我們來說是很重要的。</string>
+	<string name="rendering_value_boldOutline_name">粗外框</string>
+    <string name="traffic_warning_hazard">危險</string>
     </resources>

OsmAnd/res/values/colors.xml

@@ -151,4 +151,7 @@
 	<color name="spinner_list_background_light">#eeeeee</color>
 	<color name="spinner_list_background_dark">#303030</color>
 
+	<color name="inactive_iteme_orange">#ffc87f</color>
+	<color name="osmand_orange_dark">#e68200</color>
+	<color name="divider_color">#ccc</color>
 </resources>