Correct progress dialog titles

res/values/strings.xml

@@ -40,14 +40,12 @@
 	<string name="menu_open">Open</string>
 	<string name="menu_rename">Rename</string>
 	<string name="pass_filename">KeePass database filename:</string>
-	
 	<string name="menu_homepage">Go to Homepage</string>
 	<string name="homepage">http://www.keepassdroid.com</string>
 	<string name="menu_lock">Lock Database</string>
 	<string name="error_nopass">A password or a keyfile is requried.</string>
 	<string name="entry_and_or">Enter a password and/or a key file to unlock your database:</string>
 	<string name="entry_keyfile">Key file (optional)</string>
-	
 	<string name="group">Group</string>
 	<string name="current_group">Current Group: </string>
 	<string name="root">Root</string>
@@ -94,4 +92,7 @@
 	<string name="rounds_explaination">Higher encryption rounds provide additional protection against brute force attacks, but can really slow down loading and saving.</string>
 	<string name="error_database_settings">Failed to determine database settings.</string>
 	<string name="error_rounds_not_number">Rounds must be a number.</string>
+	<string name="saving_database">Saving database...</string>
+	<string name="loading_database">Loading database...</string>
+	<string name="progress_title">Working...</string>
 </resources>

src/com/keepassdroid/EntryEditActivity.java

@@ -176,7 +176,7 @@ public class EntryEditActivity extends LockingActivity {
 				} else {
 					task = new UpdateEntry(KeePass.db, mEntry, newEntry, onFinish);
 				}
-				ProgressTask pt = new ProgressTask(act, task);
+				ProgressTask pt = new ProgressTask(act, task, R.string.saving_database);
 				pt.run();
 			}
 			

src/com/keepassdroid/GroupActivity.java

@@ -161,7 +161,7 @@ public class GroupActivity extends GroupBaseActivity {
 						GroupActivity act = GroupActivity.this;
 						Handler handler = new Handler();
 						AddGroup task = new AddGroup(KeePass.db, res, mGroup, act.new RefreshTask(handler), false);
-						ProgressTask pt = new ProgressTask(act, task);
+						ProgressTask pt = new ProgressTask(act, task, R.string.saving_database);
 						pt.run();
 					}
 				}

src/com/keepassdroid/PasswordActivity.java

@@ -192,7 +192,7 @@ public class PasswordActivity extends Activity {
 			
 			Handler handler = new Handler();
 			LoadDB task = new LoadDB(KeePass.db, PasswordActivity.this, fileName, pass, key, new AfterLoad(handler));
-			ProgressTask pt = new ProgressTask(PasswordActivity.this, task);
+			ProgressTask pt = new ProgressTask(PasswordActivity.this, task, R.string.loading_database);
 			pt.run();
 		}			
 	}

src/com/keepassdroid/ProgressTask.java

@@ -23,6 +23,7 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Handler;
 
+import com.android.keepass.R;
 import com.keepassdroid.database.OnFinish;
 import com.keepassdroid.database.RunnableOnFinish;
 
@@ -39,15 +40,15 @@ public class ProgressTask implements Runnable {
 	private RunnableOnFinish mTask;
 	private ProgressDialog mPd;
 	
-	public ProgressTask(Context ctx, RunnableOnFinish task) {
+	public ProgressTask(Context ctx, RunnableOnFinish task, int messageId) {
 		mCtx = ctx;
 		mTask = task;
 		mHandler = new Handler();
 		
 		// Show process dialog
 		mPd = new ProgressDialog(mCtx);
-		mPd.setTitle("Working...");
+		mPd.setTitle(ctx.getText(R.string.progress_title));
-		mPd.setMessage("Saving Database...");
+		mPd.setMessage(ctx.getText(messageId));
 
 		// Set code to run when this is finished
 		mTask.mFinish = new AfterTask(task.mFinish, mHandler);

src/com/keepassdroid/PwEntryView.java

@@ -76,7 +76,7 @@ public class PwEntryView extends ClickView {
 	private void deleteEntry() {
 		Handler handler = new Handler();
 		DeleteEntry task = new DeleteEntry(KeePass.db, mPw, mAct, mAct.new RefreshTask(handler));
-		ProgressTask pt = new ProgressTask(mAct, task);
+		ProgressTask pt = new ProgressTask(mAct, task, R.string.saving_database);
 		pt.run();
 		
 	}

src/com/keepassdroid/PwGroupView.java

@@ -85,7 +85,7 @@ public class PwGroupView extends ClickView {
 		case MENU_DELETE:
 			Handler handler = new Handler();
 			DeleteGroup task = new DeleteGroup(KeePass.db, mPw, mAct, mAct.new AfterDeleteGroup(handler));
-			ProgressTask pt = new ProgressTask(mAct, task);
+			ProgressTask pt = new ProgressTask(mAct, task, R.string.saving_database);
 			pt.run();
 			return true;