Bumped version to 0.8

1) When sending an SMS or MMS to multiple recipients, only show one
ConversationItem, but provide statistics on the number of recipients
delivered to.

2) Still break up the messages for secure and insecure messages.

.gitignore

@@ -4,3 +4,11 @@ project.properties
 .settings
 bin/
 gen/
+.idea/
+TextSecure.iml
+out
+tests
+lint.xml
+local.properties
+ant.properties
+.DS_Store

.tx/config

@@ -0,0 +1,11 @@
+[main]
+host = https://www.transifex.com
+lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE
+
+
+[textsecure-official.master]
+file_filter = res/values-<lang>/strings.xml
+source_file = res/values/strings.xml
+source_lang = en
+type = ANDROID
+

AndroidManifest.xml

@@ -1,11 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.thoughtcrime.securesms"
-      android:versionCode="22"
-      android:versionName="0.6">
+      android:versionCode="30"
+      android:versionName="0.8">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14"/>
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
 
+    <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
+                android:label="Access to TextSecure Secrets"
+                android:protectionLevel="signature" />    
+    
+	<uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"></uses-permission>
+    <uses-permission android:name="android.permission.READ_PROFILE"></uses-permission>
+    <uses-permission android:name="android.permission.WRITE_PROFILE"></uses-permission>	
+    <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"></uses-permission>
+    <uses-permission android:name="android.permission.READ_CONTACTS"></uses-permission>
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"></uses-permission>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"></uses-permission>
+    <uses-permission android:name="android.permission.RECEIVE_MMS"></uses-permission>
+    <uses-permission android:name="android.permission.READ_SMS"></uses-permission>
+    <uses-permission android:name="android.permission.SEND_SMS"></uses-permission>
+    <uses-permission android:name="android.permission.WRITE_SMS"></uses-permission>
+    <uses-permission android:name="android.permission.VIBRATE"></uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        
     <application android:icon="@drawable/icon"
                  android:label="@string/app_name"
                  android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
@@ -36,58 +60,58 @@
 
     <activity android:name=".PassphraseCreateActivity"
               android:theme="@style/Theme.Sherlock.Light.Dialog"
-              android:label="Create Passphrase"
+              android:label="@string/AndroidManifest__create_passphrase"
               android:launchMode="singleInstance"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphrasePromptActivity"
               android:theme="@style/Theme.Sherlock.Light.Dialog"
-              android:label="Enter Passphrase"
+              android:label="@string/AndroidManifest__enter_passphrase"
               android:launchMode="singleInstance"
               android:windowSoftInputMode="stateVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ContactSelectionActivity"
-              android:label="Select Contacts"
+              android:label="@string/AndroidManifest__select_contacts"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".AutoInitiateActivity"
               android:theme="@style/Theme.Sherlock.Light.Dialog"
-              android:label="TextSecure Messaging Detected"
+              android:label="@string/AndroidManifest__textsecure_detected"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ViewIdentityActivity"
               android:theme="@style/Theme.Sherlock.Light.Dialog"
-              android:label="Public Identity Key"
+              android:label="@string/AndroidManifest__public_identity_key"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphraseChangeActivity"
               android:theme="@style/Theme.Sherlock.Light.Dialog"
-              android:label="Change Passphrase"
+              android:label="@string/AndroidManifest__change_passphrase"
               android:launchMode="singleInstance"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".VerifyKeysActivity"
-              android:label="Verify Session"
+              android:label="@string/AndroidManifest__verify_session"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".VerifyIdentityActivity"
-              android:label="Verify Identity"
+              android:label="@string/AndroidManifest__verify_identity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".SaveIdentityActivity"
               android:theme="@style/Theme.Sherlock.Light.Dialog"
-              android:label="Save Identity"
+              android:label="@string/AndroidManifest__save_identity"
               android:windowSoftInputMode="stateVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ReviewIdentitiesActivity"
-              android:label="Manage Identity Keys"
+              android:label="@string/AndroidManifest__manage_identity_keys"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ReceiveKeyActivity" 
               android:theme="@style/Theme.Sherlock.Light.Dialog" 
-              android:label="Complete Key Exchange" 
+              android:label="@string/AndroidManifest__complete_key_exchange" 
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
     
     <activity android:name=".ApplicationPreferencesActivity" 
@@ -95,7 +119,7 @@
 
     <activity android:name=".VerifyImportedIdentityActivity" 
               android:theme="@style/Theme.Sherlock.Light.Dialog" 
-              android:label="Verify Imported Identity" 
+              android:label="@string/AndroidManifest__verify_imported_identity" 
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
@@ -131,34 +155,12 @@
              </intent-filter>
     </receiver>
 
-    <provider android:name=".providers.PartProvider" android:authorities="org.thoughtcrime.provider.securesms" />
+    <provider android:name=".providers.PartProvider" 
+              android:authorities="org.thoughtcrime.provider.securesms" />
 
        <uses-library android:name="android.test.runner" />
 </application>
 
-<permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
-            android:label="Access to TextSecure Secrets"
-            android:protectionLevel="signature" />
-
-<uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"></uses-permission>
-<uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"></uses-permission>
-<uses-permission android:name="android.permission.READ_CONTACTS"></uses-permission>
-<uses-permission android:name="android.permission.WRITE_CONTACTS"></uses-permission>
-<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-<uses-permission android:name="android.permission.RECEIVE_SMS"></uses-permission>
-<uses-permission android:name="android.permission.RECEIVE_MMS"></uses-permission>
-<uses-permission android:name="android.permission.READ_SMS"></uses-permission>
-<uses-permission android:name="android.permission.SEND_SMS"></uses-permission>
-<uses-permission android:name="android.permission.WRITE_SMS"></uses-permission>
-<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
-<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-<uses-permission android:name="android.permission.READ_PHONE_STATE" />
-<uses-permission android:name="android.permission.WAKE_LOCK" />
-<uses-permission android:name="android.permission.INTERNET" />
-<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-
 <instrumentation android:name="android.test.InstrumentationTestRunner"
        android:targetPackage="org.thoughtcrime.securesms.tests" android:label="Tests for My App" />
 

README.md

@@ -1,7 +1,7 @@
 TextSecure
 =================
 
-An secure text messaging application for Android.
+A secure text messaging application for Android.
 
 TextSecure is a replacement for the standard text messaging application, allowing you to send and receive text messages as normal.  Additionally, TextSecure provides:
 
@@ -32,6 +32,13 @@ whispersystems@lists.riseup.net
 
 https://lists.riseup.net/www/info/whispersystems
 
+Translation
+------------
+
+Interested in helping to translate TextSecure? Contribute here:
+
+https://www.transifex.com/projects/p/textsecure-official/
+
 Cryptography Notice
 ------------
 

build.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="TextSecure" default="help">
+
+    <property file="local.properties" />
+
+    <property file="ant.properties" />
+
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <loadproperties srcFile="project.properties" />
+
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

res/drawable/notify_panel_notification_icon_bg_tile.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tileMode="repeat"
+    android:src="@drawable/notify_panel_notification_icon_bg"
+    />

res/layout/auto_initiate_activity.xml

@@ -3,30 +3,40 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:layout_marginLeft="16dip"
-    android:layout_marginRight="16dip">
+    android:paddingLeft="16dip"
+    android:paddingRight="16dip">
 
     <TextView android:id="@+id/description_text"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:layout_marginBottom="5px"
-              android:text="You have received a message from someone who supports TextSecure encrypted sessions.  Would you like to initiate a key exchange so you can communicate securely?"/>
+              android:layout_marginTop="5dip"
+              android:layout_marginBottom="5dip"
+              android:textAppearance="?android:attr/textAppearanceMedium"                
+              android:text="@string/auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session"/>    
 
     <LinearLayout android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
-                  android:layout_marginTop="10px"
-                  android:orientation="horizontal">
+                  android:orientation="horizontal"
+                  android:layout_marginTop="16dip"
+                  android:layout_marginBottom="16dip"
+                  android:gravity="right">
 
-        <Button android:id="@+id/initiate_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Initiate Exchange"
-                android:gravity="center"/>
-
-        <Button android:id="@+id/cancel_button"
-                android:text="Cancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"/>
+        <TableLayout android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:stretchColumns="*">
+            <TableRow>
+		        <Button android:id="@+id/initiate_button"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:text="@string/auto_initiate_activity__initiate_exchange"
+		                android:gravity="center"/>
+		
+		        <Button android:id="@+id/cancel_button"
+		                android:text="@android:string/cancel"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:gravity="center"/>
+            </TableRow>
+        </TableLayout>
     </LinearLayout>
 </LinearLayout>

res/layout/change_passphrase_activity.xml

@@ -1,63 +1,90 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-<TableLayout
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:stretchColumns="1">
+    android:layout_height="fill_parent" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dip"
+        android:paddingRight="16dip"
+        android:orientation="vertical" >
 
-    <TableRow>
         <TextView
-            android:textSize="12sp"
-            android:text="Old passphrase:"
-            android:padding="3dip" />
+            android:padding="3dip"
+            android:text="@string/change_passphrase_activity__old_passphrase"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"/>
 
-        <EditText android:id="@+id/old_passphrase"
-                  android:layout_height="wrap_content"
-                  android:layout_width="fill_parent"
-                  android:password="true"/>
-    </TableRow>
+        <EditText
+            android:id="@+id/old_passphrase"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:layout_marginBottom="5dip" />
 
-    <TableRow>
         <TextView
-            android:text="New passphrase:"
-            android:textSize="12sp"
-            android:padding="3dip" />
+            android:padding="3dip"
+            android:text="@string/change_passphrase_activity__new_passphrase"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <EditText android:id="@+id/new_passphrase"
-                  android:layout_height="wrap_content"
-                  android:layout_width="fill_parent"
-                  android:password="true"
-          />
-    </TableRow>
+        <EditText
+            android:id="@+id/new_passphrase"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:layout_marginBottom="5dip" />
 
-    <TableRow>
         <TextView
-            android:text="Repeat new passphrase:"
-            android:textSize="12sp"
-            android:padding="3dip" />
+            android:padding="3dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/change_passphrase_activity__repeat_new_passphrase"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <EditText android:id="@+id/repeat_passphrase"
-                  android:layout_height="wrap_content"
-                  android:layout_width="fill_parent"
-                  android:password="true"
-          />
-    </TableRow>
+        <EditText
+            android:id="@+id/repeat_passphrase"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:layout_marginBottom="5dip" />
 
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dip"
+            android:gravity="right"
+            android:orientation="horizontal" >
 
-    <TableRow>
-           <Button android:id="@+id/cancel_button"
-                   android:padding="10dip"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:text="Cancel"/>
+            <TableLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:stretchColumns="*"
+                tools:ignore="UselessParent" >
 
-           <Button android:id="@+id/ok_button"
-                   android:padding="10dip"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:text="Ok"/>
-    </TableRow>
-  </TableLayout>
-</ScrollView>
+                <TableRow>
+
+                    <Button
+                        android:id="@+id/cancel_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="16dip"
+                        android:layout_marginRight="15dip"
+                        android:text="@android:string/cancel" />
+
+                    <Button
+                        android:id="@+id/ok_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="16dip"
+                        android:text="@android:string/ok" />
+                </TableRow>
+            </TableLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</ScrollView>

res/layout/contact_list_item.xml

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright 2009, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="14dip"
-    android:paddingRight="5dip"
->
-
-    <ImageView android:id="@+id/presence"
-        android:layout_width="32dip"
-        android:layout_height="32dip"
-        android:layout_alignParentRight="true"
-        android:layout_marginLeft="5dip"
-        android:layout_centerVertical="true"
-
-        android:gravity="center"
-        android:scaleType="centerInside"
-    />
-
-    <TextView android:id="@+id/label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="8dip"
-        android:layout_marginTop="-8dip"
-
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textStyle="bold"
-        android:visibility = "gone"
-    />
-
-    <TextView android:id="@+id/number"
-    	android:visibility = "gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_toRightOf="@id/label"
-        android:layout_alignBaseline="@id/label"
-        android:layout_toLeftOf="@id/presence"
-        android:layout_alignWithParentIfMissing="true"
-
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-    />
-
-    <TextView android:id="@+id/name"
-        android:layout_width="0dip"
-        android:layout_height="0dip"
-        android:layout_above="@id/label"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/presence"
-        android:layout_marginBottom="1dip"
-
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:gravity="center_vertical|left"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-    />
-
-</RelativeLayout>

res/layout/contact_selection_group_activity.xml

@@ -1,27 +1,7 @@
-<!-- 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="vertical">
-
-<!--	<EditText android:id="@+id/group_name"-->
-<!--			  android:layout_width="fill_parent"-->
-<!--			  android:layout_height="wrap_content"-->
-<!--			  android:hint="Enter group name"-->
-<!--			  android:layout_alignParentTop="true" />-->
 			  
     <ListView android:id="@android:id/list"
             android:layout_width="fill_parent" 
@@ -32,10 +12,11 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:fillViewport="true">
+        
         <TextView android:id="@+id/emptyText"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="No contacts."
+            android:text="@string/contact_selection_group_activity__no_contacts"
             android:textSize="20sp"
             android:textColor="?android:attr/textColorSecondary"
             android:paddingLeft="10dip"
@@ -43,21 +24,5 @@
             android:paddingTop="10dip"
             android:lineSpacingMultiplier="0.92"
         />
-    </ScrollView>
-    
-<!--    <Button android:id="@+id/create_button"-->
-<!--    		android:layout_width="wrap_content"-->
-<!--    		android:layout_height="wrap_content"-->
-<!--    		android:padding="15dip"-->
-<!--    		android:text="Create"-->
-<!--    		android:layout_alignParentBottom="true"-->
-<!--    		android:layout_alignParentLeft="true" />-->
-<!--    		-->
-<!--    <Button android:id="@+id/cancel_button"-->
-<!--    		android:layout_width="wrap_content"-->
-<!--    		android:layout_height="wrap_content"-->
-<!--    		android:padding="15dip"-->
-<!--    		android:text="Cancel"-->
-<!--    		android:layout_alignParentBottom="true"-->
-<!--    		android:layout_alignParentRight="true" />    -->
+    </ScrollView>    
 </LinearLayout>

res/layout/contact_selection_group_item.xml

@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright 2009, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"

res/layout/contact_selection_list_activity.xml

@@ -1,16 +1,3 @@
-<!-- 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
@@ -20,18 +7,16 @@
     <ListView android:id="@android:id/list"
             android:layout_width="fill_parent" 
             android:layout_height="fill_parent"
-            android:fastScrollEnabled="true"
-    />
+            android:fastScrollEnabled="true" />
 
     <ScrollView android:id="@android:id/empty"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:fillViewport="true"
-    >
+        android:fillViewport="true">
         <TextView android:id="@+id/emptyText"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="No contacts."
+            android:text="@string/contact_selection_group_activity__no_contacts"
             android:textSize="20sp"
             android:textColor="?android:attr/textColorSecondary"
             android:paddingLeft="10dip"

res/layout/contact_selection_list_item.xml

@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright 2009, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"

res/layout/contact_selection_recent_activity.xml

@@ -1,16 +1,4 @@
-<!-- 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
+<?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
@@ -20,18 +8,17 @@
     <ListView android:id="@android:id/list"
             android:layout_width="fill_parent" 
             android:layout_height="fill_parent"
-            android:fastScrollEnabled="true"
-    />
+            android:fastScrollEnabled="true" />
 
     <ScrollView android:id="@android:id/empty"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:fillViewport="true"
-    >
+        android:fillViewport="true" >
+        
         <TextView android:id="@+id/emptyText"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="No recent calls."
+            android:text="@string/contact_selection_recent_activity__no_recent_calls"
             android:textSize="20sp"
             android:textColor="?android:attr/textColorSecondary"
             android:paddingLeft="10dip"

res/layout/contacts_list_content.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-
-    <ListView android:id="@android:id/list"
-            android:layout_width="fill_parent" 
-            android:layout_height="fill_parent"
-            android:fastScrollEnabled="true"
-    />
-
-    <ScrollView android:id="@android:id/empty"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:fillViewport="true"
-    >
-        <TextView android:id="@+id/emptyText"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="No contacts."
-            android:textSize="20sp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:paddingLeft="10dip"
-            android:paddingRight="10dip"
-            android:paddingTop="10dip"
-            android:lineSpacingMultiplier="0.92"
-        />
-    </ScrollView>
-</LinearLayout>

res/layout/conversation_activity.xml

@@ -35,7 +35,7 @@
 
             <LinearLayout
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:paddingBottom="5dip"
                 android:background="#fff">
@@ -59,26 +59,12 @@
                     android:layout_height="fill_parent"
                     android:gravity="center_vertical">
 
-<!--			        <Button-->
-<!--			            android:id="@+id/view_image_button"-->
-<!--			            style="?android:attr/buttonStyleSmall"-->
-<!--			            android:layout_width="100dip"-->
-<!--			            android:layout_height="50dip"-->
-<!--			            android:text="View" />-->
-<!--			-->
-<!--			        <Button-->
-<!--			            android:id="@+id/replace_image_button"-->
-<!--			            style="?android:attr/buttonStyleSmall"-->
-<!--			            android:layout_width="100dip"-->
-<!--			            android:layout_height="50dip"-->
-<!--			            android:text="Replace" />-->
-
                     <Button
                         android:id="@+id/remove_image_button"
                         style="?android:attr/buttonStyleSmall"
                         android:layout_width="100dip"
                         android:layout_height="50dip"
-                        android:text="Remove" />
+                        android:text="@string/conversation_activity__remove" />
 
                 </LinearLayout>
 
@@ -108,7 +94,7 @@
                             android:autoText="true"
                             android:capitalize="sentences"
                             android:nextFocusRight="@+id/send_button"
-                            android:hint="Type message"
+                            android:hint="@string/conversation_activity__type_message"
                             android:maxLines="4"
                             android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine"
                             android:imeOptions="actionSend|flagNoEnterAction"
@@ -121,7 +107,7 @@
                         android:layout_height="fill_parent"
                         android:layout_gravity="center_vertical"
                         android:nextFocusLeft="@+id/embedded_text_editor"
-                        android:text="Send"
+                        android:text="@string/conversation_activity__send"
                         android:padding="8dip"
                     />
                 </LinearLayout>

res/layout/conversation_fragment_cab.xml

@@ -8,11 +8,10 @@
 
     <TextView
         android:id="@+id/title"
-        android:text="Batch Selection Mode"
+        android:text="@string/conversation_fragment_cab__batch_selection_mode"
         android:maxLines="1"
         android:singleLine="true"
         android:layout_gravity="center_vertical"
-        android:layout_centerVertical="true"
         android:textAppearance="?android:attr/textAppearanceMediumInverse"
         android:layout_weight="1"
         android:layout_width="wrap_content"

res/layout/conversation_item_received.xml

@@ -77,7 +77,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="Download"
+                    android:text="@string/conversation_item_received__download"
                     android:visibility="gone" />
 
                 <TextView android:id="@+id/mms_label_downloading"
@@ -86,21 +86,39 @@
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp"
                     android:gravity="center"
-                    android:text="Downloading"
+                    android:text="@string/conversation_item_received__downloading"
                     android:visibility="gone" />
 
             </LinearLayout>
 
-             <TextView android:id="@+id/conversation_item_date"
-                android:autoLink="all"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:linksClickable="false"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:gravity="left"
-                android:textColor="#ffcccccc"
-                android:paddingTop="1dip"/>
+            <LinearLayout android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:orientation="horizontal"
+                          android:gravity="left">
 
+		      <TextView android:id="@+id/group_message_status"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:linksClickable="false"
+		                android:textAppearance="?android:attr/textAppearanceSmall"
+		                android:layout_gravity="left"
+		                android:textColor="#ffcccccc"
+		                android:visibility="gone"
+		                android:layout_marginRight="8dip"
+		                android:paddingTop="1dip"/>
+                
+
+		      <TextView android:id="@+id/conversation_item_date"
+		                android:autoLink="all"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:linksClickable="false"
+		                android:textAppearance="?android:attr/textAppearanceSmall"
+		                android:layout_gravity="left"
+		                android:textColor="#ffcccccc"
+		                android:paddingTop="1dip"/>
+		      </LinearLayout>             
+             
         </LinearLayout>
 
        <LinearLayout android:id="@+id/indicators_parent"

res/layout/conversation_item_sent.xml

@@ -99,7 +99,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="Download"
+                    android:text="@string/conversation_item_sent__download"
                     android:visibility="gone" />
 
                 <TextView android:id="@+id/mms_label_downloading"
@@ -108,21 +108,40 @@
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp"
                     android:gravity="center"
-                    android:text="Downloading"
+                    android:text="@string/conversation_item_sent__downloading"
                     android:visibility="gone" />
 
             </LinearLayout>
 
-             <TextView android:id="@+id/conversation_item_date"
-                android:autoLink="all"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:linksClickable="false"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:gravity="right"
-                android:textColor="#ffcccccc"
-                android:paddingTop="1dip"/>
+            <LinearLayout android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:orientation="horizontal"
+                          android:gravity="right">
 
+		      <TextView android:id="@+id/group_message_status"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:linksClickable="false"
+		                android:textAppearance="?android:attr/textAppearanceSmall"
+		                android:layout_gravity="right"
+		                android:textColor="#ffcccccc"
+		                android:visibility="gone"
+		                android:layout_marginRight="8dip"
+		                android:paddingTop="1dip"/>
+                
+		      <TextView android:id="@+id/conversation_item_date"
+		                android:autoLink="all"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:linksClickable="false"
+		                android:textAppearance="?android:attr/textAppearanceSmall"
+		                android:layout_gravity="right"
+		                android:textColor="#ffcccccc"
+		                android:paddingTop="1dip"/>                
+                
+            </LinearLayout>
+             
+             
         </LinearLayout>
 
         <view  xmlns:android="http://schemas.android.com/apk/res/android"

res/layout/create_passphrase_activity.xml

@@ -12,14 +12,14 @@
                   android:paddingRight="16dip"
                   android:orientation="vertical">
 
-        <TextView android:text="Please choose a passphrase that will be used to locally encrypt your data.  This should be a strong passphrase."
+        <TextView android:text="@string/create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:layout_marginTop="10dip"
                   android:layout_marginBottom="10dip"/>
 
-        <TextView android:text="Passphrase:"
+        <TextView android:text="@string/create_passphrase_activity__passphrase"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
@@ -28,21 +28,21 @@
         <EditText android:id="@+id/passphrase_edit"
                   android:layout_height="wrap_content"
                   android:layout_width="fill_parent"
-                  android:password="true"/>
+                  android:inputType="textPassword"/>
 
         <TextView
-                  android:layout_width="wrap_content"
+                  android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:id="@+id/repeat_label"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   android:layout_marginBottom="5dip"
                   android:layout_marginTop="10dip"
-                  android:text="Repeat:"/>
+                  android:text="@string/create_passphrase_activity__repeat"/>
 
         <EditText
                   android:layout_height="wrap_content"
                   android:layout_width="fill_parent"
-                  android:password="true"
+                  android:inputType="textPassword"
                   android:id="@+id/passphrase_edit_repeat"/>
 
         <LinearLayout android:layout_width="fill_parent"
@@ -57,14 +57,14 @@
                 <TableRow>
                     <Button android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
-                            android:text="Cancel"
+                            android:text="@android:string/cancel"
                             android:id="@+id/cancel_button"
                             android:layout_marginRight="15dip"
                             android:layout_marginLeft="16dip"/>
 
                     <Button android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="OK"
+                            android:text="@android:string/ok"
                             android:id="@+id/ok_button"
                             android:layout_marginRight="16dip"/>
                 </TableRow>

res/layout/icon_list_item.xml

@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"

res/layout/key_caching_notification.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <LinearLayout android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_alignParentLeft="true"
+                  android:layout_centerVertical="true"
+                  android:orientation="vertical"
+                  android:layout_marginLeft="10dip">
+	<TextView android:id="@+id/title"
+        android:textAppearance="@style/NotificationTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal"
+        android:text="@string/KeyCachingService_passphrase_cached"
+        />
+
+   <TextView android:id="@+id/text2"
+        android:textAppearance="@style/NotificationText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-2dp"
+        android:layout_marginBottom="-2dp"
+        android:singleLine="true"
+        android:fadingEdge="horizontal"
+        android:ellipsize="marquee"
+        android:text="@string/KeyCachingService_textsecure_passphrase_cached"
+        />
+    </LinearLayout>
+    
+	<ImageView android:id="@+id/lock_cache_icon"
+        android:src="@drawable/icon_lock"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:background="@drawable/notify_panel_notification_icon_bg_tile"
+        android:scaleType="center" 
+        android:layout_alignParentRight="true"
+        />
+	    
+</RelativeLayout>

res/layout/main.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-
-        <ListView android:id="@android:id/list"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:drawSelectorOnTop="false"
-                  android:scrollbarStyle="insideOverlay"
-                  android:fadingEdgeLength="16dip"
-                  android:layout_alignParentTop="true"/>
-
-</RelativeLayout>

res/layout/mms_download_view.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/mms_download_controls"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <Button android:id="@+id/btn_download_msg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="Download"
-        android:visibility="gone" />
-
-    <TextView android:id="@+id/label_downloading"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:gravity="center"
-        android:text="Downloading" 
-        android:visibility="gone" />
-
-</LinearLayout>
-

res/layout/prompt_passphrase_activity.xml

@@ -23,14 +23,14 @@
             <TableRow>
                 <Button android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
-                        android:text="Cancel"
+                        android:text="@android:string/cancel"
                         android:id="@+id/cancel_button"
                         android:layout_marginRight="15dip"
                         android:layout_marginLeft="16dip"/>
 
                 <Button android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="OK"
+                        android:text="@android:string/ok"
                         android:id="@+id/ok_button"
                         android:layout_marginRight="16dip"/>
             </TableRow>

res/layout/receive_key_activity.xml

@@ -30,25 +30,25 @@
 		<Button android:id="@+id/verify_session_button"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="Session"
+				android:text="@string/receive_key_activity__session"
 				android:visibility="gone"
 				android:gravity="center" />		  
 
 		<Button android:id="@+id/verify_identity_button"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="Identities"
+				android:text="@string/receive_key_activity__identities"
 				android:visibility="gone"
 				android:gravity="center" />		  
 				  
 		<Button android:id="@+id/ok_button"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="Complete Exchange"
+				android:text="@string/receive_key_activity__complete_exchange"
 				android:gravity="center"/>
 				
 		<Button android:id="@+id/cancel_button"
-				android:text="Cancel"
+				android:text="@android:string/cancel"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:gravity="center"/>

res/layout/recent_call_item_selectable.xml

@@ -11,15 +11,13 @@
         android:layout_height="fill_parent"
         android:paddingLeft="14dip"
         android:paddingRight="11dip"        
-        android:gravity="center_vertical"
-    />
+        android:gravity="center_vertical" />
 
     <View android:id="@+id/divider"
         android:layout_width="1dip"
         android:layout_height="fill_parent"
         android:layout_toRightOf="@id/call_type_icon"
-        android:layout_marginRight="11dip"
-    />
+        android:layout_marginRight="11dip" />
     
     <TextView android:id="@+id/date"
         android:layout_width="wrap_content"
@@ -28,10 +26,8 @@
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="9dip"
         android:layout_marginTop="5dip"
-
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:singleLine="true"
-    />
+        android:singleLine="true" />
 
     <TextView android:id="@+id/label"
         android:layout_width="wrap_content"
@@ -40,12 +36,10 @@
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="8dip"
         android:layout_marginTop="-10dip"
-
         android:singleLine="true"
         android:ellipsize="marquee"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textStyle="bold"
-    />
+        android:textStyle="bold" />
 
     <TextView android:id="@+id/number"
         android:layout_width="wrap_content"
@@ -55,11 +49,9 @@
         android:layout_toLeftOf="@id/date"
         android:layout_alignBaseline="@id/label"
         android:layout_alignWithParentIfMissing="true"
-
         android:singleLine="true"
         android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-    />
+        android:textAppearance="?android:attr/textAppearanceSmall" />
 
 
     <CheckedTextView android:id="@+id/line1"
@@ -75,7 +67,6 @@
         android:gravity="center_vertical"
         
         android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-        android:ellipsize="marquee"     
-    />
+        android:ellipsize="marquee"/>
     
 </RelativeLayout>

res/layout/recipients_panel.xml

@@ -16,8 +16,9 @@
             android:capitalize="sentences"
             android:autoText="true"
             android:singleLine="true"
-            android:hint="To"
+            android:hint="@string/recipients_panel__to"
             android:paddingRight="45dip"
+            android:textColor="#000000"
             android:layout_width="fill_parent"/>
 
         <ImageButton android:id="@+id/contacts_button"

res/layout/review_identities.xml

@@ -17,7 +17,7 @@
         <TextView android:id="@id/android:empty"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:text="You don't currently have any identity keys in your trust database."
+                  android:text="@string/review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   android:padding="20dip" />
 

res/layout/save_identity_activity.xml

@@ -1,46 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                 android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
 
-    <TextView android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:layout_marginLeft="16dip"
-              android:layout_marginRight="16dip"
-              android:layout_marginTop="5dip"
-              android:layout_marginBottom="5dip"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:text="Identity Name:" />
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dip"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:layout_marginTop="5dip"
+        android:text="@string/save_identity_activity__identity_name"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <EditText android:layout_height="wrap_content"
-              android:layout_width="fill_parent"
-              android:id="@+id/identity_name"
-              android:layout_margin="16dip"/>
+    <EditText
+        android:id="@+id/identity_name"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dip"
+        tools:ignore="TextFields" />
 
-    <LinearLayout android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-                  android:layout_marginBottom="16dip"
-                  android:gravity="right">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dip"
+        android:gravity="right"
+        android:orientation="horizontal" >
+
+        <TableLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:stretchColumns="*"
+            tools:ignore="UselessParent" >
 
-        <TableLayout android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:stretchColumns="*">
             <TableRow>
-                <Button android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:text="Cancel"
-                        android:id="@+id/cancel_button"
-                        android:layout_marginRight="15dip"
-                        android:layout_marginLeft="16dip"/>
 
-                <Button android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="OK"
-                        android:id="@+id/ok_button"
-                        android:layout_marginRight="16dip"/>
+                <Button
+                    android:id="@+id/cancel_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="16dip"
+                    android:layout_marginRight="15dip"
+                    android:text="@android:string/cancel" />
+
+                <Button
+                    android:id="@+id/ok_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="16dip"
+                    android:text="@android:string/ok" />
             </TableRow>
         </TableLayout>
     </LinearLayout>
+
 </LinearLayout>

res/layout/send_key_activity.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-<org.thoughtcrime.securesms.components.RecipientsPanel
-	android:id="@+id/key_recipients"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:visibility="visible"
-	/>
-                                
-                <Button android:id="@+id/send_key_button"
-                        android:layout_marginLeft="5dip"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="?android:attr/buttonStyle"
-                        android:layout_below="@id/key_recipients"
-                        android:layout_alignRight="@id/key_recipients"
-                        android:text="Send"
-                    />
-                    
-                <Button android:id="@+id/cancel_key_button"
-                		android:layout_marginLeft="5dip"
-                		android:layout_width="wrap_content"
-                		android:layout_height="wrap_content"
-                		style="?android:attr/buttonStyle"
-                		android:layout_toLeftOf="@id/send_key_button"
-                        android:layout_below="@id/key_recipients"
-                        android:text="Cancel"
-                        />
-                		
-                		
-    </RelativeLayout>
-
-

res/layout/verify_identity_activity.xml

@@ -14,7 +14,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Their identity (they read):"
+                android:text="@string/verify_identity_activity__their_identity_they_read"
                 android:padding="7dip" />
 
         <TextView
@@ -29,7 +29,7 @@
         <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="Your identity (you read):"
+                android:text="@string/verify_identity_activity__your_identity_you_read"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:padding="7dip" />
 

res/layout/verify_imported_identity_activity.xml

@@ -4,13 +4,13 @@
 			android:layout_height="fill_parent">
 <TableLayout 
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_height="wrap_content"
     android:shrinkColumns="1">
 
     <TableRow>
         <TextView
         	android:textSize="12sp"
-            android:text="Identity name:\n"
+            android:text="@string/verify_import_identity_activity__identity_name_n"
             android:padding="3dip" />
         <EditText
         	android:id="@+id/identity_name"
@@ -22,7 +22,7 @@
     <TableRow>
         <TextView
         	android:textSize="12sp"
-            android:text="Imported identity:\n"
+            android:text="@string/verify_import_identity_activity__imported_identity_n"
             android:padding="3dip" />
         <TextView
            	android:textSize="20sp"
@@ -43,19 +43,19 @@
 	   				android:padding="15dip"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="Verified!"/>
+					android:text="@string/verify_import_identity_activity__verified"/>
 
 	   		<Button android:id="@+id/compare_button"
 	   				android:padding="15dip"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="Compare"/>
+					android:text="@string/verify_import_identity_activity__compare"/>
 						
 			<Button android:id="@+id/cancel_button"
 					android:padding="15dip"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="Cancel" />
+					android:text="@android:string/cancel" />
 		</LinearLayout>
     
     </TableRow>    

res/layout/verify_keys_activity.xml

@@ -14,7 +14,7 @@
                    android:layout_height="wrap_content"
                    android:layout_width="fill_parent"
                    android:textAppearance="?android:attr/textAppearanceLarge"
-                   android:text="They read this:"
+                   android:text="@string/verify_keys_activity__they_read_this"
                    android:padding="7dip" />
 
                <TextView
@@ -31,7 +31,7 @@
                    android:layout_height="wrap_content"
                    android:layout_width="fill_parent"
                    android:textAppearance="?android:attr/textAppearanceLarge"
-                   android:text="You read this:"
+                   android:text="@string/verify_keys_activity__you_read_this"
                    android:padding="7dip" />
 
                <TextView

res/layout/view_identity_activity.xml

@@ -6,13 +6,13 @@
             android:layout_marginRight="16dip">
 <TableLayout
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_height="wrap_content"
     android:shrinkColumns="1">
 
     <TableRow>
         <TextView
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="Identity:"
+            android:text="@string/view_identity_activity__identity"
             android:layout_marginRight="7dip" />
         <TextView
             android:textAppearance="?android:attr/textAppearanceLarge"
@@ -34,14 +34,14 @@
                     android:padding="5dip"
                     android:layout_width="100dip"
                     android:layout_height="wrap_content"
-                    android:text="QR Code" />
+                    android:text="@string/view_identity_activity__qr_code" />
 
             <Button android:id="@+id/ok_button"
                     android:layout_margin="10dip"
                     android:padding="5dip"
                     android:layout_width="100dip"
                     android:layout_height="wrap_content"
-                    android:text="Ok"/>
+                    android:text="@android:string/ok"/>
 
         </LinearLayout>
 

res/menu/contact_selection.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="Finished"
+    <item android:title="@string/contact_selection__menu_finished"
           android:id="@+id/menu_selection_finished"
           android:icon="@drawable/ic_menu_done_holo_dark"
           android:showAsAction="ifRoom"

res/menu/contact_selection_list.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="Select All"
+    <item android:title="@string/contact_selection_list__menu_select_all"
           android:id="@+id/menu_select_all" />
 
-    <item android:title="Unselect All"
+    <item android:title="@string/contact_selection_list__menu_unselect_all"
           android:id="@+id/menu_unselect_all" />
 </menu>

res/menu/conversation.xml

@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:title="Call"
-          android:id="@+id/menu_call"
-          android:icon="@drawable/ic_menu_call"
-          android:showAsAction="ifRoom" />
-
-    <item android:title="Add attachment"
+    <item android:title="@string/conversation__menu_add_attachment"
           android:id="@+id/menu_add_attachment"
           android:icon="@drawable/ic_menu_attach" />
 
-    <item android:title="Delete thread"
+    <item android:title="@string/conversation__menu_delete_thread"
           android:id="@+id/menu_delete_thread"
           android:icon="@android:drawable/ic_menu_delete" />
 

res/menu/conversation_button_context.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="Send unencrypted"
+    <item android:title="@string/conversation_button_context__menu_send_unencrypted"
           android:id="@+id/menu_context_send_unencrypted" />
 </menu>

res/menu/conversation_callable.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:title="@string/conversation_callable__menu_call"
+          android:id="@+id/menu_call"
+          android:icon="@drawable/ic_menu_call"
+          android:showAsAction="ifRoom" />
+
+</menu>
+

res/menu/conversation_context.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="Copy text"
+    <item android:title="@string/conversation_context__menu_copy_text"
           android:id="@+id/menu_context_copy" />
 
-    <item android:title="Delete message"
+    <item android:title="@string/conversation_context__menu_delete_message"
           android:id="@+id/menu_context_delete_message" />
 
-    <item android:title="Message details"
+    <item android:title="@string/conversation_context__menu_message_details"
           android:id="@+id/menu_context_details" />
 
-    <item android:title="Forward message"
+    <item android:title="@string/conversation_context__menu_forward_message"
           android:id="@+id/menu_context_forward" />
 </menu>

res/menu/conversation_group_options.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:title="@string/convesation_group_options__recipients_list"
+          android:id="@+id/menu_group_recipients"
+          android:icon="@drawable/ic_groups_holo_dark"
+          android:showAsAction="ifRoom" />
+
+</menu>

res/menu/conversation_insecure.xml

@@ -5,7 +5,7 @@
           android:icon="@drawable/ic_menu_lock_holo_dark"
           android:showAsAction="ifRoom">
           <menu>
-              <item android:title="Start Secure Session"
+              <item android:title="@string/conversation_insecure__menu_start_secure_session"
                     android:id="@+id/menu_start_secure_session" />
 
           </menu>

res/menu/conversation_list.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:title="Search"
+    <item android:title="@string/conversation_list__menu_search"
           android:id="@+id/menu_search"
           android:icon="@drawable/ic_menu_search_holo_dark"
           android:actionViewClass="android.widget.SearchView"

res/menu/conversation_list_batch.xml

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:title="Delete Selected"
+    <item android:title="@string/conversation_list_batch__menu_delete_selected"
           android:id="@+id/menu_delete_selected"
           android:icon="@drawable/ic_menu_trash_holo_dark"
           android:showAsAction="ifRoom" />
 
-    <item android:title="Select All"
+    <item android:title="@string/conversation_list_batch__menu_select_all"
           android:id="@+id/menu_select_all"
           android:icon="@drawable/ic_menu_selectall_holo_dark" />
 
-<!--     <item android:title="Unselect All" -->
-<!--           android:id="@+id/menu_unselect_all" -->
-<!--           android:icon="@android:drawable/ic_menu_revert" /> -->
-
 </menu>

res/menu/conversation_secure_unverified.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="Security"
+    <item android:title="@string/conversation_secure_verified__menu_security"
           android:id="@+id/menu_security"
           android:icon="@drawable/ic_menu_lock_unverified_holo_dark"
           android:showAsAction="ifRoom">
           <menu>
-              <item android:title="Verify Session"
+              <item android:title="@string/conversation_secure_verified__menu_verify_session"
                     android:id="@+id/menu_verify_session" />
 
-              <item android:title="Verify Recipient"
+              <item android:title="@string/conversation_secure_verified__menu_verify_recipient"
                     android:id="@+id/menu_verify_recipient"/>
 
-              <item android:title="Abort Secure Session"
+              <item android:title="@string/conversation_secure_verified__menu_abort_secure_session"
                     android:id="@+id/menu_abort_session"/>
 
           </menu>

res/menu/conversation_secure_verified.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="Security"
+    <item android:title="@string/conversation_secure_verified__menu_security"
           android:id="@+id/menu_security"
           android:icon="@drawable/ic_menu_lock_verified_holo_dark"
           android:showAsAction="ifRoom">
           <menu>
-              <item android:title="Verify Session"
+              <item android:title="@string/conversation_secure_verified__menu_verify_session"
                     android:id="@+id/menu_verify_session" />
 
-              <item android:title="Verify Recipient"
+              <item android:title="@string/conversation_secure_verified__menu_verify_recipient"
                     android:id="@+id/menu_verify_recipient"/>
 
-              <item android:title="Abort Secure Session"
+              <item android:title="@string/conversation_secure_verified__menu_abort_secure_session"
                     android:id="@+id/menu_abort_session"/>
 
           </menu>

res/menu/key_scanning.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:title="Compare"
+    <item android:title="@string/key_scanning__menu_compare"
           android:id="@+id/menu_barcode"
           android:icon="@drawable/ic_menu_barcode"
           android:showAsAction="ifRoom">
 
         <menu>
-            <item android:title="Scan to compare"
+            <item android:title="@string/key_scanning__menu_scan_to_compare"
                   android:id="@+id/menu_scan"/>
 
-            <item android:title="Get scanned to compare"
+            <item android:title="@string/key_scanning__menu_get_scanned_to_compare"
                   android:id="@+id/menu_get_scanned"/>
 
         </menu>

res/menu/text_secure_locked.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="Unlock"
+    <item android:title="@string/text_secure_locked__menu_unlock"
           android:id="@+id/menu_unlock"
           android:showAsAction="ifRoom" />