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-10-31 17:05:17 +01:00
commit 5f6722a4af
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2036,7 +2036,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="show_on_start_description">\'Off\' directly launches map screen</string> <string name="show_on_start_description">\'Off\' directly launches map screen</string>
<string name="enter_country_name">Enter country name</string> <string name="enter_country_name">Enter country name</string>
<string name="new_version">New version</string> <string name="new_version">New version</string>
<string name="begin_with_osmand_menu_group">Begin with OsmAnd</string> <string name="begin_with_osmand_menu_group">First steps with OsmAnd</string>
<string name="features_menu_group">Features</string> <string name="features_menu_group">Features</string>
<string name="help_us_to_improve_menu_group">Help us to improve OsmAnd</string> <string name="help_us_to_improve_menu_group">Help us to improve OsmAnd</string>
<string name="other_menu_group">Other</string> <string name="other_menu_group">Other</string>

2
OsmAnd/src/net/osmand/plus/dialogs/helpscreen/HelpScreenDialogFragment.java
View file

@ -346,7 +346,7 @@ public class HelpScreenDialogFragment extends DialogFragment implements Expandab
String releasedate = ""; String releasedate = "";
if (!this.getString(R.string.app_edition).equals("")) { if (!this.getString(R.string.app_edition).equals("")) {
releasedate = this.getString(R.string.shared_string_release) + " : \t" + this.getString(R.string.app_edition); releasedate = this.getString(R.string.shared_string_release) + ": \t" + this.getString(R.string.app_edition);
} }
String version = Version.getFullVersion(getOsmandApplication()) + "\n" + releasedate; String version = Version.getFullVersion(getOsmandApplication()) + "\n" + releasedate;
// + "\n\n" + this.getString(R.string.about_content); // + "\n\n" + this.getString(R.string.about_content);