Merge branch 'master' of https://github.com/osmandapp/Osmand

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

@@ -2024,4 +2024,5 @@
 	<string name="shared_string_skip">Omitir</string>
 	<string name="app_name_osmand">OsmAnd</string>
 	<string name="offline_maps_and_navigation">Mapas y navegación sin conexión</string>
+<string name="commit_poi">Enviar PDI</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -2121,4 +2121,10 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <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>
+    <string name="dahboard_options_dialog_title">Options du tableau de bord</string>
+	<string name="shared_string_undo">Annuler</string>
+	<string name="shared_string_skip">Ignorer</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="offline_maps_and_navigation">Cartes hors-ligne\n&amp; Navigation</string>
+	<string name="commit_poi">Enregistrer le PI</string>
+</resources>

OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java

@@ -189,9 +189,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		final boolean isRecording = app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get();
 		ImageButton stop = ((ImageButton) v.findViewById(R.id.stop));
 		if (isRecording) {
-			stop.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_rec_stop));
+			stop.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_rec_stop, R.color.recording_color));
 		} else {
-			stop.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_rec_start, R.color.recording_color));
+			stop.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_rec_start));
 		}
 		stop.setOnClickListener(new View.OnClickListener() {
 			@Override