OI Safe: Add information to import dialog which file is being imported (oisafe.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 332e26ad0957bc57f41a3114b2cb0e8f0ee2b3bc..c33fb3fbcd5d406eff801a6f11b152c7389becea 100644 (file)
--- 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>\r
        <string name="import_error_first_line">First line is missing fields.</string>\r
        <string name="dialog_import_title">Import</string>\r
-       <string name="dialog_import_msg">Do you want to replace the database?</string>\r
+       <string name="dialog_import_msg">Do you want to replace the database (import from %s)?</string>\r
        <string name="yes">Yes</string>\r
        <string name="no">No</string>\r
        <string name="import_progress">Please wait while importing...</string>\r

diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index f87971e054338839afecfe968cea93673023603c..fc4a197cad2b71b51e3c0f3ebb0c40ba3285a0b5 100644 (file)
--- 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();
        }