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-09 23:19:39 +01:00
commit d27f2b3e23
5 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/values-de/phrases.xml
View file

@ -2518,4 +2518,7 @@
<string name="poi_building_type_pyramid">Gebäudetyp: Pyramide</string>
<string name="poi_fitness_centre">Fitnesscenter</string>
<string name="poi_fitness">Fitness</string>
</resources>

5
OsmAnd/res/values-de/strings.xml
View file

@ -2070,4 +2070,7 @@
<string name="av_audio_bitrate">Audio Bitrate</string>
<string name="av_audio_bitrate_descr">Wähle Audio Bitrate</string>
<string name="rendering_attr_horseRoutes_name">Pferdewege</string>
</resources>
<string name="update_every">Aktualisierung jede(n)</string>
<string name="only_download_over_wifi">Nur über WLAN herunterladen</string>
<string name="live_update">Live Aktualisierung</string>
</resources>

4
OsmAnd/res/values-fr/strings.xml
View file

@ -2069,4 +2069,8 @@
<string name="av_audio_bitrate_descr">Sélectionnez le bitrate audio</string>
<string name="no_address_found">Impossible de déterminer l\'adresse</string>
<string name="looking_up_address">Recherche de l\'adresse</string>
<string name="update_every">Mettre à jour tout les</string>
<string name="only_download_over_wifi">Télécharger uniquement en WIFI</string>
<string name="live_update">Mise à jour en temps réel</string>
<string name="rendering_attr_horseRoutes_name">Randonnée à cheval</string>
</resources>

5
OsmAnd/res/values-nl/strings.xml
View file

@ -2122,4 +2122,7 @@
<string name="av_audio_bitrate_descr">Kies audio bitrate</string>
<string name="looking_up_address">Adres wordt gezocht</string>
<string name="rendering_attr_horseRoutes_name">Ruiterroutes</string>
</resources>
<string name="update_every">Update elke</string>
<string name="only_download_over_wifi">"Alleen downloaden via WiFi"</string>
<string name="live_update">Live Update</string>
</resources>

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

@ -646,15 +646,7 @@ public class MapActivityActions implements DialogProvider {
return false;
}
}).reg();
optionsMenuHelper.item(R.string.download_live_updates).iconColor(R.drawable.ic_configure_screen_dark)
.listen(new OnContextMenuClick() {
@Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
Intent intent = new Intent(mapActivity, LiveUpdatesActivity.class);
mapActivity.startActivity(intent);
return false;
}
}).reg();
String d = getString(R.string.index_settings);
if (app.getDownloadThread().getIndexes().isDownloadedFromInternet) {
List<IndexItem> updt = app.getDownloadThread().getIndexes().getItemsToUpdate();
@ -674,6 +666,15 @@ public class MapActivityActions implements DialogProvider {
}
}).reg();
optionsMenuHelper.item(R.string.download_live_updates).iconColor(R.drawable.ic_configure_screen_dark)
.listen(new OnContextMenuClick() {
@Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
Intent intent = new Intent(mapActivity, LiveUpdatesActivity.class);
mapActivity.startActivity(intent);
return false;
}
}).reg();
optionsMenuHelper.item(R.string.prefs_plugins).iconColor(R.drawable.ic_extension_dark)
.listen(new OnContextMenuClick() {