From: peli0101 <peli0101@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Fri, 30 Jan 2009 10:18:34 +0000 (+0000)
Subject: OI Safe: Add information to import dialog which file is being imported (oisafe.csv... 
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=9e35368445bf82d5b9bde216f11e171b62141a40;p=android-vcpass-oisafe

OI Safe: Add information to import dialog which file is being imported (oisafe.csv or passwordsafe.csv).

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1879 72b678ce-9140-0410-bee8-679b907dd61a
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 332e26a..c33fb3f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -61,7 +61,7 @@
 	<string name="import_file_error">Unable to import file 'passwordsafe.csv' from SDCARD.  You might try disconnecting USB from computer.</string>
 	<string name="import_error_first_line">First line is missing fields.</string>
 	<string name="dialog_import_title">Import</string>
-	<string name="dialog_import_msg">Do you want to replace the database?</string>
+	<string name="dialog_import_msg">Do you want to replace the database (import from %s)?</string>
 	<string name="yes">Yes</string>
 	<string name="no">No</string>
 	<string name="import_progress">Please wait while importing...</string>
diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index f87971e..fc4a197 100644
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -846,7 +846,7 @@ public class CategoryList extends ListActivity {
 					importDatabaseThreadStart(filename);
 				}
 			}) 
-			.setMessage(R.string.dialog_import_msg)
+			.setMessage(getString(R.string.dialog_import_msg, filename))
 			.create();
 		about.show();
 	}