From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Fri, 16 Jan 2009 00:55:05 +0000 (+0000)
Subject: Renamed various "Password Safe" to "OI Safe" and cleaned up some
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=2ccef1354e91eb348f59fd3f22e3a491d8920a84;p=android-vcpass-oisafe

Renamed various "Password Safe" to "OI Safe" and cleaned up some
layouts to use @string.


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

diff --git a/assets/help.html b/assets/help.html
index 1c4314a..135c035 100644
--- a/assets/help.html
+++ b/assets/help.html
@@ -49,12 +49,12 @@ body {
 
 <h2>Master Password</h2>
 
-<p>When you run Password Safe for the very first time, you are
+<p>When you run OI Safe for the very first time, you are
    prompted for a 'Master Password'.  This password is
    used to encrypt a generated Master Key.   The Master Key is in turn
    used to encrypt and decrypt all the password entries.</p>
    
-<p>Each time that you launch Password Safe, the Master Password that
+<p>Each time that you launch OI Safe, the Master Password that
    you type is used to decrypt, or unlock, the Master Key.  The Master
    Key is used to decrypt/encrypt the password entries.</p>
    
@@ -73,7 +73,7 @@ body {
 
 <h2>Import and Export</h2>
 
-<p>You can import data into Password Safe using CSV files.  It is easiest to
+<p>You can import data into OI Safe using CSV files.  It is easiest to
    create and manage a CSV within a spreadsheet program like Excel or
    OpenOffice.  Create a file with the following columns in the first row.</p>
    
@@ -88,10 +88,10 @@ body {
  </tr>
 </table>
 
-<p>Password Safe import is very sensitive about the first row,
+<p>OI Safe import is very sensitive about the first row,
    so please specify the first
    row exactly like the above list.  You may also find it helpful to
-   put some data into the Password Safe and perform an export first, so
+   put some data into the OI Safe and perform an export first, so
    that you can see what the CSV should look like.</p>
    
 <p>Use the name 'passwordsafe.csv' for your filename.   Connect the
@@ -112,30 +112,30 @@ body {
       
 <h2>Security Concerns</h2>
  
-<p>Password Safe was written to safely store your passwords so that nobody can see
+<p>OI Safe was written to safely store your passwords so that nobody can see
   them other than you.
-  The password you use to unlock Password Safe is used to encrypt the data.
+  The password you use to unlock OI Safe is used to encrypt the data.
   Data is stored within a SQLite database within your phone.   That database stays
   local.  It does not get transferred to the Internet.   In fact, the application
   doesn't have the security privileges to even access the Internet.</p>
   
-<p>Because Password Safe cannot access the Internet, the data is not 
+<p>Because OI Safe cannot access the Internet, the data is not 
   automatically backed up.
   In order to backup, you will need to use Menu -> Backup.</p>
 
 <h3>Locking</h3>
 
-<p>Any of the following actions will cause Password Safe to lock:</p>
+<p>Any of the following actions will cause OI Safe to lock:</p>
 
 <ul>
   <li>The screen turns off.  This is a default behavior of the phone and is controlled
    in the phone's Settings -&gt; Sound &amp; display -> Screen timeout.   
    The default timeout is 1 minute.
-   After 1 minute the phone will go to sleep.   When this happens, Password Safe will 
+   After 1 minute the phone will go to sleep.   When this happens, OI Safe will 
    lock itself.</li>
   <li>You select <i>Lock</i> from the Menu on the Categories screen.</li>
   <li>Android only allows six active applications.  Once you launch the seventh,
-   the oldest used application will be killed.  If Password Safe is killed, than
+   the oldest used application will be killed.  If OI Safe is killed, than
    the next time you launch it, it will be locked.</li>
 </ul>
 
@@ -148,6 +148,8 @@ body {
 <ul>
 <li>Steven Osborn - <a href="http://steven.bitsetters.com">Blog</a></li>
 <li>Randy McEoin</li>
+<li>Isaac Potoczny-Jones</li>
+<li>Peli</li>
 </ul>
 <p>Key Icon is Copyright <a href="http://www.icon-king.com/">David Vignoni</a>,  and licensed 
 under the <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU LGPL V2.1</a> </p>
@@ -155,9 +157,9 @@ under the <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU L
 <h2>More Information</h2>
 
 <p>For further information about this application, please visit the
-  <a href="http://code.google.com/p/android-passwordsafe">Android Password Safe</a>
+  <a href="http://code.google.com/p/openintents">OpenIntents</a>
   project web page at
-  <a href="http://code.google.com/p/android-passwordsafe">http://code.google.com/p/android-passwordsafe</a>.</p>
+  <a href="http://www.openintents.org">http://www.openintents.org/</a>.</p>
  
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/res/layout/front_door.xml b/res/layout/front_door.xml
index cb8dd93..2602385 100644
--- a/res/layout/front_door.xml
+++ b/res/layout/front_door.xml
@@ -74,7 +74,7 @@
 		android:layout_height="wrap_content" />
 
 	<Button android:id="@+id/continue_button" 
-	  	android:text="Continue"
+	  	android:text="@string/continue_text"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content" />	
 </LinearLayout>	
\ No newline at end of file
diff --git a/res/layout/log_off.xml b/res/layout/log_off.xml
index 2028f68..30432be 100644
--- a/res/layout/log_off.xml
+++ b/res/layout/log_off.xml
@@ -53,13 +53,13 @@
 		android:layout_height="wrap_content"
 		android:orientation="horizontal">
 		<Button android:id="@+id/logoff_button" 
-		  	android:text="Lock"
+		  	android:text="@string/lock"
 			android:layout_width="0dip"
 			android:layout_weight="1"
 			android:layout_height="wrap_content" />
 			
 	    <Button android:id="@+id/goto_pws" 
-		  	android:text="Open Password Safe"
+		  	android:text="@string/open_safe"
 			android:layout_width="0dip"
 			android:layout_weight="1"
 			android:layout_height="wrap_content" />	
@@ -73,7 +73,7 @@
 		android:layout_height="wrap_content" />
 		
     <Button android:id="@+id/goto_pws" 
-	  	android:text="Continue"
+	  	android:text="@string/continue"
 		android:layout_width="wrap_content"
         android:layout_toRightOf="@id/logoff_button"
         android:layout_alignTop="@id/logoff_button"
diff --git a/res/layout/pass_gen.xml b/res/layout/pass_gen.xml
index 97d56bd..592fad9 100644
--- a/res/layout/pass_gen.xml
+++ b/res/layout/pass_gen.xml
@@ -33,7 +33,7 @@
 			<TableRow>
 				<TextView android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="Password Length" />
+					android:text="@string/pass_gen_length" />
 				<EditText android:id="@+id/pass_length"
 				 	android:singleLine="true"
 					android:layout_width="3pt"
@@ -44,7 +44,7 @@
 			<TableRow>
 				<TextView android:layout_width="wrap_content"
 					android:layout_height="wrap_content" 
-					android:text="Uppercase [A-Z]" />
+					android:text="@string/pass_gen_uppercase" />
 				<CheckBox
 					android:id="@+id/pass_upper"
 					android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
 			<TableRow>
 				<TextView android:layout_width="wrap_content"
 					android:layout_height="wrap_content" 
-					android:text="Lowercase [a-z]" />
+					android:text="@string/pass_gen_lowercase" />
 				<CheckBox android:id="@+id/pass_lower" 
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content" android:checked="true"/>
@@ -62,7 +62,7 @@
 			<TableRow>
 				<TextView android:layout_width="wrap_content"
 					android:layout_height="wrap_content" 
-					android:text="Numbers [0-9]" />
+					android:text="@string/pass_gen_numbers" />
 				<CheckBox android:id="@+id/pass_num" 
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content" android:checked="true"/>
@@ -71,7 +71,7 @@
 			<TableRow>
 				<TextView android:layout_width="wrap_content"
 					android:layout_height="wrap_content" 
-					android:text="Symbols [!@#$%^\*]" />
+					android:text="@string/pass_gen_symbols" />
 				<CheckBox android:id="@+id/pass_symbol" 
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content" />
@@ -85,17 +85,17 @@
 		android:editable="false"/>
 		
 	<Button android:id="@+id/copy_entry" 
-	  	android:text="Copy to Current Entry"
+	  	android:text="@string/pass_gen_copy_to_current_entry"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
 		
 	<Button android:id="@+id/copy_clip" 
-	  	android:text="Copy to Clipboard"
+	  	android:text="@string/pass_gen_copy_to_clipboard"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
 		
 	<Button android:id="@+id/cancel" 
-	  	android:text="Cancel"
+	  	android:text="@string/cancel"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ce7f845..d0aad5f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -82,7 +82,7 @@
 	<string name="dialog_delete_password_title">Delete Password</string>
 	<string name="dialog_delete_password_msg">Are you sure you want to delete this password?</string>
 	<string name="change_password">Change Master Password</string>
-	<string name="chg_pass_explaination">Use this to change the password you use to unlock Password Safe.   Your data will be re-encrypted with the new password.  The more complex your password is, the safer your data will be.</string>
+	<string name="chg_pass_explaination">Use this to change the password you use to unlock OI Safe.   Your data will be re-encrypted with the new password.  The more complex your password is, the safer your data will be.</string>
 	<string name="old_password">Old password</string>
 	<string name="new_password">New password</string>
 	<string name="verify_password">Verify password</string>
@@ -129,4 +129,15 @@
 	<string name="intent_encrypt">Encrypt (OI Safe)</string>
 	<string name="intent_get_password">Get password (OI Safe)</string>
 	<string name="intent_set_password">Set password (OI Safe)</string>
+	<string name="open_safe">Open OI Safe</string>
+	<string name="lock">Lock</string>
+	<string name="continue_text">Continue</string>
+	<string name="pass_gen_length">Password Length</string>
+	<string name="pass_gen_uppercase">Uppercase [A-Z]</string>
+	<string name="pass_gen_lowercase">Lowercase [a-z]</string>
+	<string name="pass_gen_numbers">Numbers [0-9]</string>
+	<string name="pass_gen_symbols">Symbols [!@#$%^\*]</string>
+	<string name="pass_gen_copy_to_current_entry">Copy to Current Entry</string>
+	<string name="pass_gen_copy_to_clipboard">Copy to Clipboard</string>
+	<string name="cancel">Cancel</string>
 </resources>