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-11-08 00:17:41 +01:00
commit a43eb41ed0
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/res/values-ca/phrases.xml
View file

@ -1596,4 +1596,14 @@
<string name="poi_payment_mastercard_yes">S\'accepta Mastercard</string>
<string name="poi_payment_mastercard_no">No s\'accepta Mastercard</string>
<string name="poi_payment_none">Sense cost</string>
<string name="poi_payment_maestro_yes">S\'accepta tarja Maestro</string>
<string name="poi_payment_maestro_no">No s\'accepta tarja Maestro</string>
<string name="poi_payment_american_express_yes">S\'accepta tarja American Express (AMEX)</string>
<string name="poi_payment_american_express_no">No s\'accepta tarja American Express (AMEX)</string>
<string name="poi_payment_diners_club_yes">S\'accepta tarja Dinners Club</string>
<string name="poi_payment_diners_club_no">No s\'accepta tarja Dinners Club</string>
<string name="poi_payment_dkv_yes">Accepta DKV</string>
<string name="poi_payment_dkv_no">No s\'accepta DKV</string>
<string name="poi_payment_uta_yes">S\'accepten targes UTA</string>
<string name="poi_payment_uta_no">No s\'accepten targes UTA</string>
</resources>

2
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -431,7 +431,7 @@
<string name="lang_mr">Marathi</string>
<string name="osmand_srtm_short_description_80_chars">Complemento OsmAnd para curvas de nivel sin conexión</string>
<string name="srtm_plugin_name">Curvas de nivel</string>
<string name="osmand_distance_planning_plugin_name">Calculador de distancias y herramienta de planificación</string>
<string name="osmand_distance_planning_plugin_name">Distancias y planificación</string>
<string name="rename_failed">Falló el renombrado.</string>
<string name="days_behind">días atrás</string>
<string name="free">"Libre %1$s "</string>

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

@ -2047,7 +2047,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="navigation_item_description">Setup navigation</string>
<string name="planning_trip_item">Planning a trip</string>
<string name="faq_item">FAQ</string>
<string name="faq_item_description">How to use plugins</string>
<string name="faq_item_description">Frequently asked questions</string>
<string name="map_viewing_item">Map viewing</string>
<string name="search_on_the_map_item">Map searching</string>
<string name="instalation_troubleshooting_item">Installation and troubleshooting</string>

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

@ -166,7 +166,7 @@ public class HelpActivity extends OsmandActionBarActivity {
private List<HelpMenuItem> createOtherItems() {
ArrayList<HelpMenuItem> arrayList = new ArrayList<>();
String name = getActivity().getString(R.string.instalation_troubleshooting_item);
//String name = getActivity().getString(R.string.instalation_troubleshooting_item);
arrayList.add(new HelpMenuItem(R.string.instalation_troubleshooting_item, -1, -1,
"feature_articles/installation-and-troubleshooting.html", getActivity()));
arrayList.add(new HelpMenuItem(R.string.techical_articles_item, -1, -1,
@ -180,7 +180,7 @@ public class HelpActivity extends OsmandActionBarActivity {
}
String version = Version.getFullVersion(getOsmandApplication()) + " " + releasedate;
ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener(
"feature_articles/about.html", getActivity(), name);
"feature_articles/about.html", getActivity(), version);
arrayList.add(new HelpMenuItem(getActivity().getString(R.string.shared_string_about), version, listener));
return arrayList;