Skip to content
Snippets Groups Projects
Commit fe8c2bcb authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix english

parent 44a8525e
Branches
Tags
No related merge requests found
......@@ -129,8 +129,8 @@ public class MainActivity extends Activity{
else if(item.getTitle().equals(getString(R.string.menu_share))) {
if(this._compute) {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
_errorDialog = dialogBuilder.setTitle("Can't show the models list")
.setMessage("The computing have to be finished before you can take a screenshot.")
_errorDialog = dialogBuilder.setTitle("Can't show the model list")
.setMessage("The computation has to complete before you can take a screenshot")
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
......@@ -154,8 +154,8 @@ public class MainActivity extends Activity{
else if(item.getItemId() == android.R.id.home) {
if(this._compute) {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
_errorDialog = dialogBuilder.setTitle("Can't show the models list")
.setMessage("The computing have to be finished before you can select an other model.")
_errorDialog = dialogBuilder.setTitle("Can't show the model list")
.setMessage("The computation has to complete before you can select another model")
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
......@@ -265,7 +265,7 @@ public class MainActivity extends Activity{
public void onLowMemory() {
if(!_compute) return;
_gmsh.onelabCB("stop");
Toast.makeText(this, "Low memory !!! computing is going to stop", Toast.LENGTH_LONG).show();
Toast.makeText(this, "Low memory! Computation is going to stop", Toast.LENGTH_LONG).show();
super.onLowMemory();
}
......@@ -274,11 +274,11 @@ public class MainActivity extends Activity{
if(!_compute) return;
if(level == Activity.TRIM_MEMORY_COMPLETE){
_gmsh.onelabCB("stop");
notifyEndComputing("The computing had to stop because your device ran out of memory");
notifyEndComputing("The computation had to stop because your device ran out of memory");
_notify = false;
}
else if(level == Activity.TRIM_MEMORY_MODERATE) {
notifyComputing("Computing in progress - low memory", true);
notifyComputing("Computation in progress - low memory", true);
}
super.onTrimMemory(level);
}
......@@ -299,11 +299,11 @@ public class MainActivity extends Activity{
}
private void notifyComputing() {
notifyComputing("Computing in progress", false);
notifyComputing("Computation in progress", false);
}
private void notifyEndComputing() {
notifyEndComputing("The computing is finished");
notifyEndComputing("Computation done!");
}
private void notifyEndComputing(String msg) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment