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-11-11 16:54:01 +01:00
commit d4c37547ae
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/no_translate.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?xml version="1.0" encoding="utf-8" standalone="no"?>
<resources> <resources>
<string name="app_name">OsmAnd~</string> <string name="app_name">OsmAnd~</string>
<string name="app_version">2.3.0</string> <string name="app_version">2.2.0</string>
<!-- <!--
Note: For our dev build apk's, the above "app_version" is provided (via osmand/build.xml) as the base version prefix to our build number in the format: Note: For our dev build apk's, the above "app_version" is provided (via osmand/build.xml) as the base version prefix to our build number in the format:
X.X.X#YYYYZ , where X.X.X#YYYYZ , where
@ -11,7 +11,7 @@
--> -->
<!-- Not translatable --> <!-- Not translatable -->
<string name="release_2_3"> <string name="release_2_2">
\u2022 New context-sensitive UI for tapping locations on the map and on other screens\n\n \u2022 New context-sensitive UI for tapping locations on the map and on other screens\n\n
\u2022 Choice between Dashboard or Menu as primary app control\n\n \u2022 Choice between Dashboard or Menu as primary app control\n\n
\u2022 New Wikipedia data, now downloads per country, and with much more complete data\n\n \u2022 New Wikipedia data, now downloads per country, and with much more complete data\n\n

4
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -65,8 +65,8 @@ public class AppInitializer implements IProgress {
private static final String VERSION_INSTALLED = "VERSION_INSTALLED"; //$NON-NLS-1$ private static final String VERSION_INSTALLED = "VERSION_INSTALLED"; //$NON-NLS-1$
private static final String EXCEPTION_FILE_SIZE = "EXCEPTION_FS"; //$NON-NLS-1$ private static final String EXCEPTION_FILE_SIZE = "EXCEPTION_FS"; //$NON-NLS-1$
// public static final String LATEST_CHANGES_URL = "http://osmand.net/help/changes-2.2.html"; public static final String LATEST_CHANGES_URL = "http://osmand.net/blog?id=osmand-2-2-released";
public static final String LATEST_CHANGES_URL = null; // not enough to read // public static final String LATEST_CHANGES_URL = null; // not enough to read
public static final int APP_EXIT_CODE = 4; public static final int APP_EXIT_CODE = 4;
public static final String APP_EXIT_KEY = "APP_EXIT_KEY"; public static final String APP_EXIT_KEY = "APP_EXIT_KEY";
private OsmandApplication app; private OsmandApplication app;

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

@ -27,7 +27,7 @@ public class WhatsNewDialogFragment extends DialogFragment {
final OsmandApplication osmandApplication = (OsmandApplication) getActivity().getApplication(); final OsmandApplication osmandApplication = (OsmandApplication) getActivity().getApplication();
final String appVersion = Version.getAppVersion(osmandApplication); final String appVersion = Version.getAppVersion(osmandApplication);
builder.setTitle(getString(R.string.whats_new) + " " + appVersion) builder.setTitle(getString(R.string.whats_new) + " " + appVersion)
.setMessage(getString(R.string.release_2_3)) .setMessage(getString(R.string.release_2_2))
.setNegativeButton(R.string.shared_string_close, null); .setNegativeButton(R.string.shared_string_close, null);
if (AppInitializer.LATEST_CHANGES_URL != null) { if (AppInitializer.LATEST_CHANGES_URL != null) {
builder.setPositiveButton(R.string.read_more, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.read_more, new DialogInterface.OnClickListener() {