From 0e1fb3f77ba60e9988ca5ee8dadb60e63a890342 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 11 Jul 2014 18:23:45 +0400
Subject: [PATCH 1/2] Fixed intermediate points dissapear bug.

---
 .../src/net/osmand/plus/routing/RouteCalculationResult.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
index 7893f08b48..4744ef0f42 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
@@ -24,6 +24,7 @@ import net.osmand.util.MapUtils;
 import android.content.Context;
 
 public class RouteCalculationResult {
+	private static double distanceClosestToIntermediate = 400;
 	// could not be null and immodifiable!
 	private final List<Location> locations;
 	private final List<RouteDirectionInfo> directions;
@@ -151,8 +152,8 @@ public class RouteCalculationResult {
 			double prevDistance = distanceThreshold * 4;
 			while((currentIntermediate < intermediates.size() || prevDistance > distanceThreshold)
 				&& currentLocation < locations.size()){
-				if(currentIntermediate < intermediates.size() && 
-						getDistanceToLocation(locations, intermediates.get(currentIntermediate), currentLocation) < 50) {
+				if(currentIntermediate < intermediates.size() &&
+						getDistanceToLocation(locations, intermediates.get(currentIntermediate), currentLocation) < distanceClosestToIntermediate) {
 					prevDistance = getDistanceToLocation(locations, intermediates.get(currentIntermediate), currentLocation);
 					interLocations[currentIntermediate] = currentLocation;
 					currentIntermediate++;

From 07feb2b7ac09a0690af0ee847491ac995ebee43e Mon Sep 17 00:00:00 2001
From: josep constanti <jconstanti@ovi.com>
Date: Fri, 11 Jul 2014 18:28:56 +0200
Subject: [PATCH 2/2] Translated using Weblate (Catalan)

Currently translated at 100.0% (1454 of 1454 strings)
---
 OsmAnd/res/values-ca/strings.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index e1852835b7..b3d4a9e227 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1879,4 +1879,16 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
     <string name="osmo_group_information">Si us plau, llegiu abans de crear un grup!</string>
     <string name="osmo_auth_error_short">Autorització fallida</string>
     <string name="osmo_auth_error">Trobat error OsMo d\'autorització : %1$s.\n Podria ser una caiguda temporal del servei o l\'expiració del teu usuari.\n Vols procedir a crear un nou usuari?</string>
+    <string name="rendering_attr_hideBuildings_name">Amaga edificis</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Amaga vies sense circulació de vehicles</string>
+    <string name="rendering_attr_hideText_name">Amaga text</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Amaga tipus de vegetació</string>
+    <string name="rendering_attr_buildings15zoom_name">Representació d\'edificis al detall 15 de zoom</string>
+    <string name="rendering_attr_moreDetailed_name">Més detallat</string>
+    <string name="rendering_attr_lessDetailed_name">Menys detallat</string>
+    <string name="rendering_attr_hideAccess_name">Amaga el tipus d\'accés</string>
+    <string name="rendering_attr_showAccess_name">Mostra el tipus d\'accés</string>
+    <string name="rendering_attr_showSurfaceGrade_name">Mostrar la qualitat de les carreteres</string>
+    <string name="rendering_attr_showSurfaces_name">Indica el tipus de superfície de les vies</string>
+    <string name="rendering_attr_cycleRoutes_name">Mostra rutes de ciclista</string>
     </resources>