Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-11-10 00:01:04 +01:00
commit c026c27351

View file

@ -180,7 +180,7 @@ public class HelpActivity extends OsmandActionBarActivity {
if (!this.getString(R.string.app_edition).equals("")) { if (!this.getString(R.string.app_edition).equals("")) {
releasedate = ", " + this.getString(R.string.shared_string_release).toLowerCase() + ": " + this.getString(R.string.app_edition); releasedate = ", " + this.getString(R.string.shared_string_release).toLowerCase() + ": " + this.getString(R.string.app_edition);
} }
String version = Version.getFullVersion(getOsmandApplication()) + " " + releasedate; String version = Version.getFullVersion(getOsmandApplication()) + releasedate;
ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener( ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener(
"feature_articles/about.html", getActivity(), version); "feature_articles/about.html", getActivity(), version);