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

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

Browse source
This commit is contained in:
xmd5a 2015-09-24 11:50:18 +03:00
commit c8b6c4b0e1
7 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout-land/map_hud_top.xml
View file

@ -194,6 +194,7 @@
android:layout_gravity="top|center"
android:layout_marginTop="@dimen/map_button_margin"
android:background="@drawable/btn_round"
android:visibility="gone"
android:orientation="vertical" >
<ImageView

4
OsmAnd/res/layout/map_hud_top.xml
View file

@ -149,11 +149,11 @@
android:layout_gravity="top|left"
android:orientation="vertical" >
<!--
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget" />
-->
</LinearLayout>
<LinearLayout

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

@ -1371,7 +1371,7 @@
<string name="poi_pump">Pumpe</string>
<string name="poi_piste_difficulty_easy">Pistesværhedsgrad: let</string>
<string name="poi_piste_difficulty_intermediate">Piste sværhedsgrad: mellemliggende</string>
<string name="poi_piste_difficulty_intermediate">Pistesværhedsgrad: medium</string>
<string name="poi_piste_difficulty_advanced">Pistesværhedsgrad: avanceret</string>
<string name="poi_piste_difficulty_novice">Pistesværhedsgrad: nybegynder</string>
<string name="poi_piste_difficulty_expert">Pistesværhedsgrad: ekspert</string>
@ -1379,8 +1379,8 @@
<string name="poi_piste_grooming_classic">Pistepreparering: klassisk</string>
<string name="poi_piste_grooming_classic_skating">Pistepreparering: klassisk+skating</string>
<string name="poi_piste_grooming_backcountry">Pistepreparering: offpiste</string>
<string name="poi_piste_grooming_scooter">Pistepreparering: scooter</string>
<string name="poi_piste_grooming_skating">Pistepreparering: skøjteløb</string>
<string name="poi_piste_grooming_scooter">Pistepreparering: snescooter</string>
<string name="poi_piste_grooming_skating">Pistepreparering: skating</string>
<string name="poi_piste_grooming_no">Pistepreparering: ingen</string>
<string name="poi_piste_grooming_mogul">Pistepreparering: pukkelpist</string>

1
OsmAnd/res/values-sv/strings.xml
View file

@ -2001,4 +2001,5 @@
<string name="unsaved_changes_will_be_lost">Alla osparade ändringar kommer att förloras. Fortsätta ändå?</string>
<string name="simulate_your_location_stop_descr">Sluta simulera din plats</string>
<string name="simulate_your_location_descr">Simulera med inspelad GPX eller beräknad rutt</string>
<string name="downloads_left_template">%1$s nedladdningar kvar</string>
</resources>

2
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -1361,6 +1361,6 @@
<string name="poi_piste_grooming_scooter">滑雪道修整：滑橇車</string>
<string name="poi_piste_grooming_skating">滑雪道修整：滑冰</string>
<string name="poi_piste_grooming_no">滑雪道修整：無</string>
<string name="poi_piste_grooming_mogul">滑雪道修整：障礙</string>
<string name="poi_piste_grooming_mogul">滑雪道修整：障礙 (mogul)</string>
</resources>

1
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -336,7 +336,6 @@ public class MapActivityActions implements DialogProvider {
getMyApplication().getAppCustomization().prepareLocationMenu(mapActivity, adapter);
final Builder builder = new AlertDialog.Builder(mapActivity);
builder.setTitle(R.string.show_point_options);
final ArrayAdapter<?> listAdapter =
adapter.createListAdapter(mapActivity, getMyApplication().getSettings().isLightContent());
builder.setAdapter(listAdapter, new DialogInterface.OnClickListener() {

2
OsmAnd/src/net/osmand/plus/osmo/OsMoService.java
View file

@ -61,7 +61,7 @@ public class OsMoService implements OsMoReactor {
public static final String SHARE_TRACKER_URL = "http://z.osmo.mobi/connect?id=";
public static final String SHARE_GROUP_URL = "http://z.osmo.mobi/join?id=";
public static final String SIGNED_IN_CONTAINS = "z.osmo.mobi/login";
public static final String TRACK_URL = "http://osmo.mobi/u/";
public static final String TRACK_URL = "http://osmo.mobi/s/";
private String lastRegistrationError = null;
private OsMoPlugin plugin;
private boolean enabled = false;