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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-12-29 20:18:14 +01:00
commit 609026ca11
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/AndroidManifest.xml
View file

@ -289,7 +289,8 @@
<action android:name="android.app.action.DEVICE_ADMIN_DISABLED" />
</intent-filter>
</receiver>
<activity android:name=".liveupdates.LiveUpdatesActivity"/>
<activity android:name=".liveupdates.LiveUpdatesActivity"
android:label="@string/osm_live"/>
<receiver android:name="net.osmand.plus.liveupdates.LiveUpdatesAlarmReceiver"/>
</application>
</manifest>

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

@ -2147,4 +2147,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="weekly">Weekly</string>
<string name="morning">Morning</string>
<string name="Night">Night</string>
<string name="osm_live">OSM Live</string>
</resources>

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

@ -4,8 +4,6 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
@ -668,7 +666,7 @@ public class MapActivityActions implements DialogProvider {
}
}).reg();
optionsMenuHelper.item(R.string.download_live_updates).iconColor(R.drawable.ic_configure_screen_dark)
optionsMenuHelper.item(R.string.osm_live).iconColor(R.drawable.ic_configure_screen_dark)
.listen(new OnContextMenuClick() {
@Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {

2
OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
View file

@ -246,7 +246,7 @@ public class LiveUpdatesFragment extends Fragment {
@Override
public String getGroup(int groupPosition) {
if (groupPosition == SHOULD_UPDATE_GROUP_POSITION) {
return getString(R.string.live_updates);
return getString(R.string.download_live_updates);
} else if (groupPosition == SHOULD_NOT_UPDATE_GROUP_POSITION) {
return getString(R.string.available_maps);
} else {