Merge branch '1379-startup-failure-error' into 'master'

Correct startup database failure error messages

Closes #1379

See merge request briar/briar!920

briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java

@@ -46,15 +46,15 @@ public class StartupFailureActivity extends BaseActivity implements
 		String errorMsg;
 		switch (result) {
 			case DATA_TOO_OLD_ERROR:
-				errorMsg = getString(R.string.startup_failed_db_error);
+				errorMsg =
+						getString(R.string.startup_failed_data_too_old_error);
 				break;
 			case DATA_TOO_NEW_ERROR:
 				errorMsg =
 						getString(R.string.startup_failed_data_too_new_error);
 				break;
 			case DB_ERROR:
-				errorMsg =
-						getString(R.string.startup_failed_data_too_old_error);
+				errorMsg = getString(R.string.startup_failed_db_error);
 				break;
 			case SERVICE_ERROR:
 				errorMsg = getString(R.string.startup_failed_service_error);