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

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

Browse source
This commit is contained in:
Victor Shcherb 2015-12-01 01:46:46 +01:00
commit b0f0f0ea11
7 changed files with 92 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/values-da/phrases.xml
View file

@ -2574,7 +2574,7 @@
<string name="poi_health_specialty_optometry_yes">Sundhedsspeciale: optometry</string>
<string name="poi_health_specialty_clinical_pathology_yes">Sundhedspeciale: klinisk patologi</string>
<string name="poi_health_specialty_speech_therapy_yes">Sundhedsspeciale: taleterapi</string>
<string name="poi_health_specialty_manual_therapy_yes">Sundhedsspeciale: manuel terapi</string>
<string name="poi_health_specialty_manual_therapy_yes">Sundhedsspeciale: manuelterapi</string>
<string name="poi_health_specialty_sports_medicine_yes">Sundhedsspeciale: sportsmedicin</string>
<string name="poi_health_specialty_podology_yes">Sundhedsspeciale: podology</string>
<string name="poi_health_specialty_adult_psychiatry_yes">Sundhedsspeciale: voksenpsykiatri</string>
@ -2582,10 +2582,10 @@
<string name="poi_health_specialty_homeopathy_yes">Sundhedsspeciale: homøopati</string>
<string name="poi_health_specialty_traditional_chinese_medicine_yes">Sundhedsspeciale: traditionel kinesiskmedicin</string>
<string name="poi_health_specialty_reiki_yes">Sundhedsspeciale: reiki</string>
<string name="poi_health_specialty_herbalism_yes">Sundhedsspeciale: naturmedicin</string>
<string name="poi_health_specialty_herbalism_yes">Sundhedsspeciale: plantemedicin</string>
<string name="poi_health_specialty_chiropractic_yes">Sundhedspeciale: kiropraktik</string>
<string name="poi_health_specialty_naturopathy_yes">Sundhesspeciale: naturopati</string>
<string name="poi_health_specialty_depth_psychology_yes">Sundhedsspeciale: dybde psykologi</string>
<string name="poi_health_specialty_naturopathy_yes">Sundhesspeciale: naturmedicin</string>
<string name="poi_health_specialty_depth_psychology_yes">Sundhedsspeciale: dybdepsykologi</string>
<string name="poi_health_specialty_behavior_yes">Sundhedsspeciale: adfærd</string>

72
OsmAnd/res/values-es/phrases.xml
View file

@ -2494,4 +2494,76 @@
<string name="poi_internet_access_type_yes">Con acceso a Internet</string>
<string name="poi_health_specialty_general_yes">Especialidad médica: Médico general</string>
<string name="poi_health_specialty_ophthalmology_yes">Especialidad médica: Oftalmología</string>
<string name="poi_health_specialty_gynaecology_yes">Especialidad médica: Ginecología</string>
<string name="poi_health_specialty_internal_medicine_yes">Especialidad médica: Medicina interna</string>
<string name="poi_health_specialty_orthopaedics_yes">Especialidad médica: Ortopedia</string>
<string name="poi_health_specialty_otolaryngology_yes">Especialidad médica: Otorrinolaringología</string>
<string name="poi_health_specialty_paediatrics_yes">Especialidad médica: Pediatría</string>
<string name="poi_health_specialty_paediatrics_no">Especialidad médica: Sin pediatría</string>
<string name="poi_health_specialty_dermatology_yes">Especialidad médica: Dermatología</string>
<string name="poi_health_specialty_urology_yes">Especialidad médica: Urología</string>
<string name="poi_health_specialty_surgery_yes">Especialidad médica: Cirugía general</string>
<string name="poi_health_specialty_radiology_yes">Especialidad médica: Radiología</string>
<string name="poi_health_specialty_psychiatry_yes">Especialidad médica: Psiquiatría</string>
<string name="poi_health_specialty_neurology_yes">Especialidad médica: Neurología</string>
<string name="poi_health_specialty_dermatovenereology_yes">Especialidad médica: Dermato-venereología</string>
<string name="poi_health_specialty_cardiology_yes">Especialidad médica: Cardiología</string>
<string name="poi_health_specialty_trauma_yes">Especialidad médica: Traumatología</string>
<string name="poi_health_specialty_biology_yes">Especialidad médica: Biología clínica</string>
<string name="poi_health_specialty_osteopathy_yes">Especialidad médica: Osteopatía</string>
<string name="poi_health_specialty_anaesthetics_yes">Especialidad médica: Anestésicos</string>
<string name="poi_health_specialty_pulmonology_yes">Especialidad médica: Neumología</string>
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Especialidad médica: Cirugía dental, oral y maxilofacial</string>
<string name="poi_health_specialty_maternity_yes">Especialidad médica: Maternidad</string>
<string name="poi_health_specialty_emergency_medicine_yes">Especialidad médica: Medicina de urgencia</string>
<string name="poi_health_specialty_emergency_medicine_no">Especialidad médica: Sin medicina de urgencia</string>
<string name="poi_health_specialty_plastic_surgery_yes">Especialidad médica: Cirugía plástica</string>
<string name="poi_health_specialty_orthodontics_yes">Especialidad médica: Ortodoncia</string>
<string name="poi_health_specialty_physiotherapy_yes">Especialidad médica: Psicoterapia</string>
<string name="poi_health_specialty_biochemistry_yes">Especialidad médica: Bioquímica</string>
<string name="poi_health_specialty_occupational_yes">Especialidad médica: Terapia ocupacional</string>
<string name="poi_health_specialty_child_psychiatry_yes">Especialidad médica: Psiquiatría infantil</string>
<string name="poi_health_specialty_physiatry_yes">Especialidad médica: Medicina física y rehabilitación</string>
<string name="poi_health_specialty_maxillofacial_surgery_yes">Especialidad médica: Cirugía maxilofacial</string>
<string name="poi_health_specialty_diagnostic_radiology_yes">Especialidad médica: Radiología diagnóstica</string>
<string name="poi_health_specialty_gastroenterology_yes">Especialidad médica: Gastroenterología</string>
<string name="poi_health_specialty_dentistry_yes">Especialidad médica: Odontología</string>
<string name="poi_health_specialty_nephrology_yes">Especialidad médica: Nefrología (enfermedades renales)</string>
<string name="poi_health_specialty_neurosurgery_yes">Especialidad médica: Neurocirugía</string>
<string name="poi_health_specialty_neuropsychiatry_yes">Especialidad médica: Neuropsiquiatría</string>
<string name="poi_health_specialty_endocrinology_yes">Especialidad médica: Endocrinología</string>
<string name="poi_health_specialty_nuclear_medicine_yes">Especialidad médica: Medicina nuclear</string>
<string name="poi_health_specialty_pathology_yes">Especialidad médica: Anatomía patológica</string>
<string name="poi_health_specialty_oncology_yes">Especialidad médica: Oncología</string>
<string name="poi_health_specialty_tropical_medicine_yes">Especialidad médica: Medicina tropical</string>
<string name="poi_health_specialty_tropical_medicine_no">Especialidad médica: Sin medicina tropical</string>
<string name="poi_health_specialty_obstetrics_postnatal_yes">Especialidad médica: Obstetricia (postnatal)</string>
<string name="poi_health_specialty_obstetrics_postnatal_no">Especialidad médica: Sin obstetricia (postnatal)</string>
<string name="poi_health_specialty_obstetrics_antenatal_yes">Especialidad médica: Obstetricia (prenatal)</string>
<string name="poi_health_specialty_obstetrics_antenatal_no">Especialidad médica: Sin obstetricia (prenatal)</string>
<string name="poi_health_specialty_social_paediatrics_yes">Especialidad médica: Pediatría social</string>
<string name="poi_health_specialty_social_paediatrics_no">Especialidad médica: Sin pediatría social</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Especialidad médica: Obstetricia (cesárea)</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Especialidad médica: Sin obstetricia (cesárea)</string>
<string name="poi_health_specialty_addiction_medicine_yes">Especialidad médica: Medicina adictiva</string>
<string name="poi_health_specialty_optometry_yes">Especialidad médica: Optometría</string>
<string name="poi_health_specialty_clinical_pathology_yes">Especialidad médica: Patología clínica</string>
<string name="poi_health_specialty_speech_therapy_yes">Especialidad médica: Terapia del habla</string>
<string name="poi_health_specialty_manual_therapy_yes">Especialidad médica: Terapia manual</string>
<string name="poi_health_specialty_sports_medicine_yes">Especialidad médica: Medicina deportiva</string>
<string name="poi_health_specialty_podology_yes">Especialidad médica: Podología</string>
<string name="poi_health_specialty_adult_psychiatry_yes">Especialidad médica: Psiquiatría adulta</string>
<string name="poi_health_specialty_acupuncture_yes">Especialidad médica: Acupuntura</string>
<string name="poi_health_specialty_homeopathy_yes">Especialidad médica: Homeopatía</string>
<string name="poi_health_specialty_traditional_chinese_medicine_yes">Especialidad médica: Medicina china tradicional</string>
<string name="poi_health_specialty_reiki_yes">Especialidad médica: Reiki</string>
<string name="poi_health_specialty_chiropractic_yes">Especialidad médica: Quiropráctica</string>
<string name="poi_health_specialty_naturopathy_yes">Especialidad médica: Naturopatía</string>
<string name="poi_health_specialty_depth_psychology_yes">Especialidad médica: Psicología profunda</string>
<string name="poi_health_specialty_behavior_yes">Especialidad médica: Conducta</string>
<string name="poi_health_specialty_herbalism_yes">Especialidad médica: herbolaria</string>
</resources>

3
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -1936,4 +1936,7 @@
<string name="poi_surface_snow">Superfície: neve</string>
<string name="poi_route_bus_ref">Ônibus</string>
<string name="poi_route_share_taxi_ref">Táxi compartilhado</string>
<string name="poi_route_trolleybus_ref">Trólebus</string>
<string name="poi_route_tram_ref">Bonde</string>
</resources>

4
OsmAnd/res/values/phrases.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version='1.0' encoding='utf-8'?>
<resources>
<!-- categories -->
<string name="poi_shop">Shop</string>
@ -1121,7 +1121,7 @@
<string name="poi_crossing_unmarked">Unmarked</string>
<string name="poi_start_date">Start date</string>
<string name="poi_wheelchair">Wheelchair</string>
<string name="poi_wheelchair_no">Wheelchair: not allowed</string>
<string name="poi_wheelchair_no">Wheelchair: not accessible</string>
<string name="poi_wheelchair_limited">Wheelchair: limited</string>
<string name="poi_wholesale">Wholesale</string>

2
OsmAnd/src/net/osmand/plus/dashboard/DashRateUsFragment.java
View file

@ -9,6 +9,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.Version;
@ -83,7 +84,6 @@ public class DashRateUsFragment extends DashBaseFragment {
positiveButton.setText(getResources().getString(R.string.shared_string_ok));
negativeButton.setText(getResources().getString(R.string.shared_string_no_thanks));
return;
<<<<<<< HEAD
case USER_LIKES_APP:
settings.RATE_US_STATE.set(RateUsBottomSheetDialog.RateUsState.LIKED);
Uri uri = Uri.parse(Version.marketPrefix(getMyApplication()) + getActivity().getPackageName());

2
OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
View file

@ -1,4 +1,5 @@
package net.osmand.plus.osmedit;
import android.app.Activity;
import android.app.Dialog;
import android.app.ProgressDialog;
@ -42,6 +43,7 @@ import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import net.osmand.CallbackWithObject;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;

16
OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
View file

@ -1,7 +1,13 @@
package net.osmand.plus.views;
import java.util.List;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Paint.Style;
import android.graphics.PointF;
import android.graphics.RectF;
import net.osmand.Location;
import net.osmand.PlatformUtil;
@ -15,13 +21,7 @@ import net.osmand.plus.base.MapViewTrackingUtilities;
import org.apache.commons.logging.Log;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Paint.Style;
import android.graphics.PointF;
import android.graphics.RectF;
import java.util.List;
public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider {
private static final Log LOG = PlatformUtil.getLog(PointLocationLayer.class);