diff --git a/res/values/strings.xml b/res/values/strings.xml
index a4461defd8..f01232b841 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_name">TextSecure</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="delete">Delete</string>
     
     <!-- ApplicationExportManager -->
     <string name="ApplicationExportManager_import_database_and_settings_title">Import Database and Settings?</string>
@@ -17,6 +18,8 @@
     <string name="ApplicationExportManager_error_exporting_to_sd_exclamation">Error exporting to SD!</string>
     <string name="ApplicationExportManager_import_successful_exclamation">Import Successful!</string>
     <string name="ApplicationExportManager_export_successful_exclamation">Export Successful!</string>
+    <string name="ApplicationExportManager_import">Import</string>
+    <string name="ApplicationExportManager_export">Export</string>
     
     <!-- ApplicationMigrationManager -->
     <string name="ApplicationMigrationManager_migrating_database">Migrating Database</string>
@@ -73,7 +76,9 @@
     <!-- ConversationFragment -->
     <string name="ConversationFragment_message_details">Message details</string>
     <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s\nTransport: %2$s\nSent/Received:%3$s</string>
-
+	<string name="ConversationFragment_confirm_message_delete">Confirm Message Delete</string>
+	<string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Are you sure that you want to permanently delete this message?</string>
+    
     <!-- ConversationListAdapter -->
     <string name="ConversationListAdapter_encrypted_message_enter_passphrase">"Encrypted message, enter passphrase... "</string>
     <string name="ConversationListAdapter_key_exchange_message">Key exchange message...</string>
@@ -81,8 +86,6 @@
     <!-- ConversationListFragment -->
     <string name="ConversationListFragment_delete_threads_question">Delete threads?</string>
     <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Are you sure you wish to delete ALL selected conversation threads?</string>
-    <string name="ConversationListFragment_delete">Delete</string>
-    <string name="ConversationListFragment_cancel">Cancel</string>
     
     <!-- ConversationListItem -->
     <string name="ConversationListItem_key_exchange_message">Key exchange message...</string>
@@ -117,6 +120,9 @@
     
     <!-- ReviewIdentitiesActivity -->
     <string name="ReviewIdentitiesActivity_unable_to_view_corrupted_identity_key_exclamation">Unable to view corrupted identity key!</string>
+    <string name="ReviewIdentitiesActivity_delete_identity">Delete identity?</string>
+    <string name="ReviewIdentitiesActivity_delete_identity_are_you_sure_you_want_to_delete_this_identity_key">Are you sure that you wish to permanently delete this identity key?</string>
+    <string name="ReviewIdentitiesActivity_invalid_identity">Invalid Identity!</string>
     
     <!-- SaveIdentityActivity -->
     <string name="SaveIdentityActivity_you_must_specify_a_name_for_this_identity_exclamation">You must specify a name for this identity!</string>
@@ -221,6 +227,9 @@
     <!-- contact_selection_list_activity -->
     <string name="contact_selection_group_activity__no_contacts">No contacts.</string>
     
+    <!-- ContactSelectionListFragment-->
+    <string name="ContactSelectionlistFragment_select_for">Select for</string>
+    
     <!-- contact_selection_recent_activity -->
     <string name="contact_selection_recent_activity__no_recent_calls">No recent calls.</string>
     
@@ -287,9 +296,12 @@
     <!-- preferences.xml -->
     
     <string name="preferences__use_settings">Use Settings</string>
+    <string name="preferences__pref_all_sms_title">Use for all SMS</string>
+    <string name="preferences__pref_all_mms_title">Use for all MMS</string> 
     <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Use TextSecure for viewing and storing all incoming text messages</string>
     <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Use TextSecure for viewing and storing all incoming multimedia messages</string>
     <string name="preferences__input_settings">Input Settings</string>
+    <string name="preferences__pref_enter_sends_title">Enter sends</string>
     <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressing the enter key will send text messages</string>
     <string name="preferences__display_settings">Display Settings</string>
     <string name="preferences__choose_identity">Choose Identity</string>
@@ -305,6 +317,9 @@
     <string name="preferences__sign_key_exchange">Sign Key Exchange</string>
     <string name="preferences__forget_passphrase_from_memory_after_some_interval">Forget passphrase from memory after some interval</string>
     <string name="preferences__timeout_passphrase">Timeout passphrase</string>
+    <string name="preferences__pref_timeout_interval_dialogtitle">Select Passphrase Timeout</string>
+    <string name="preferences__pref_timeout_interval_title">Timeout interval</string>
+    <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">The amount of time to wait before forgetting passphrase from memory</string>
     <string name="preferences__identity_key_settings">Identity Key Settings</string>
     <string name="preferences__view_my_identity_key">View my identity key</string>
     <string name="preferences__export_my_identity_key">Export my identity key</string>
@@ -317,8 +332,11 @@
     <string name="preferences__display_message_notifications_in_status_bar">Display message notifications in status bar</string>
     <string name="preferences__led_color">LED Color</string>
     <string name="preferences__change_notification_led_color">Change notification LED color</string>
+    <string name="preferences__pref_led_blink_title">LED Blink Pattern</string>
+    <string name="preferences__change_notification_blink_pattern">Change notification LED blink pattern</string>
+    <string name="preferences__pref_led_blink_dialogtitle">Select LED Blink Pattern</string>
     <string name="preferences__select_led_color">Select LED Color</string>
-    <string name="preferences__select_ringtone">Select ringtone</string>
+    <string name="preferences__select_ringtone">Select Ringtone</string>
     <string name="preferences__vibrate">Vibrate</string>
     <string name="preferences__also_vibrate_when_notified">Also vibrate when notified</string>
     
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 8de3105ee2..fd58dd9607 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -22,12 +22,12 @@
     <CheckBoxPreference android:defaultValue="true"
                       android:key="pref_all_sms"
                       android:summary="@string/preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages"
-                      android:title="Use for all SMS" />
+                      android:title="@string/preferences__pref_all_sms_title" />
 
     <CheckBoxPreference android:defaultValue="true"
                       android:key="pref_all_mms"
                       android:summary="@string/preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages"
-                      android:title="Use for all MMS" />
+                      android:title="@string/preferences__pref_all_mms_title" />
 
    </PreferenceCategory>
 
@@ -35,7 +35,7 @@
     <CheckBoxPreference android:defaultValue="false"
                       android:key="pref_enter_sends"
                       android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
-                      android:title="Enter Sends" />
+                      android:title="@string/preferences__pref_enter_sends_title" />
    </PreferenceCategory>
 
   <PreferenceCategory android:title="@string/preferences__display_settings">
@@ -76,10 +76,10 @@
     <org.thoughtcrime.securesms.preferences.PassphraseTimeoutPreference
                         android:key="pref_timeout_interval"
                         android:defaultValue="300"
-                        android:title="Timeout interval"
-                        android:summary="The amount of time to wait before forgetting passphrase from memory"
+                        android:title="@string/preferences__pref_timeout_interval_title"
+                        android:summary="@string/preferences__the_amount_of_time_to_wait_before_forgetting_passphrase"
                         android:dependency="pref_timeout_passphrase"
-                        android:dialogTitle="Select Passphrase Timeout" />
+                        android:dialogTitle="@string/preferences__pref_timeout_interval_dialogtitle" />
 
    </PreferenceCategory>
 
@@ -119,12 +119,12 @@
     <org.thoughtcrime.securesms.preferences.LedBlinkPatternListPreference
                       android:key="pref_led_blink"
                       android:defaultValue="500,2000"
-                      android:title="LED Blink Pattern"
+                      android:title="@string/preferences__pref_led_blink_title"
                       android:dependency="pref_key_enable_notifications"
-                      android:summary="Change notification LED blink pattern"
+                      android:summary="@string/preferences__change_notification_blink_pattern"
                       android:entries="@array/pref_led_blink_pattern_entries"
                       android:entryValues="@array/pref_led_blink_pattern_values"
-                      android:dialogTitle="LED Blink Pattern" />
+                      android:dialogTitle="@string/preferences__pref_led_blink_dialogtitle" />
 
 
     <RingtonePreference android:layout="?android:attr/preferenceLayoutChild"
diff --git a/src/org/thoughtcrime/securesms/ApplicationExportManager.java b/src/org/thoughtcrime/securesms/ApplicationExportManager.java
index f204dd760a..6c6c71d02f 100644
--- a/src/org/thoughtcrime/securesms/ApplicationExportManager.java
+++ b/src/org/thoughtcrime/securesms/ApplicationExportManager.java
@@ -42,7 +42,7 @@ public class ApplicationExportManager extends Handler implements Runnable {
     alertBuilder.setTitle(R.string.ApplicationExportManager_import_database_and_settings_title);
     alertBuilder.setMessage(R.string.ApplicationExportManager_import_database_and_settings_message);
     alertBuilder.setCancelable(false);
-    alertBuilder.setPositiveButton("Import", new DialogInterface.OnClickListener() {
+    alertBuilder.setPositiveButton(R.string.ApplicationExportManager_import, new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         task           = TASK_IMPORT;
         progressDialog = new ProgressDialog(context);
@@ -61,7 +61,7 @@ public class ApplicationExportManager extends Handler implements Runnable {
       }
     });
 
-    alertBuilder.setNegativeButton("Cancel", null);
+    alertBuilder.setNegativeButton(android.R.string.cancel, null);
     alertBuilder.create().show();
   }
 
@@ -73,7 +73,7 @@ public class ApplicationExportManager extends Handler implements Runnable {
     alertBuilder.setMessage(R.string.ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt);
     alertBuilder.setCancelable(false);
 
-    alertBuilder.setPositiveButton("Export", new DialogInterface.OnClickListener() {
+    alertBuilder.setPositiveButton(R.string.ApplicationExportManager_export, new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         task           = TASK_EXPORT;
         progressDialog = new ProgressDialog(context);
@@ -89,7 +89,7 @@ public class ApplicationExportManager extends Handler implements Runnable {
       }
     });
 
-    alertBuilder.setNegativeButton("Cancel", null);
+    alertBuilder.setNegativeButton(android.R.string.cancel, null);
     alertBuilder.create().show();
   }
 
diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index 0b61655837..5a0bacae00 100644
--- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -154,9 +154,9 @@ public class ContactSelectionListFragment extends SherlockListFragment
     }
 
     AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    builder.setTitle("Select for " + contactData.name);
+    builder.setTitle(R.string.ContactSelectionlistFragment_select_for + " " + contactData.name);
     builder.setMultiChoiceItems(options, null, new DiscriminatorClickedListener(contactData));
-    builder.setPositiveButton("Ok", new DiscriminatorFinishedListener(contactData, textView));
+    builder.setPositiveButton(android.R.string.ok, new DiscriminatorFinishedListener(contactData, textView));
     builder.setOnCancelListener(new DiscriminatorFinishedListener(contactData, textView));
     builder.show();
   }
diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index e627745ff6..78b227c598 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -103,10 +103,10 @@ public class ConversationFragment extends SherlockListFragment
     final String transport = message.isMms() ? "mms" : "sms";
 
     AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    builder.setTitle("Delete Message Confirmation");
+    builder.setTitle(R.string.ConversationFragment_confirm_message_delete);
     builder.setIcon(android.R.drawable.ic_dialog_alert);
     builder.setCancelable(true);
-    builder.setMessage("Are you sure that you want to permanently delete this message?");
+    builder.setMessage(R.string.ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message);
 
     builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
       @Override
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 5429a58175..e425aeae47 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -153,7 +153,7 @@ private void initializeSearch(android.widget.SearchView searchView) {
     alert.setMessage(R.string.ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads);
     alert.setCancelable(true);
 
-    alert.setPositiveButton(R.string.ConversationListFragment_delete, new DialogInterface.OnClickListener() {
+    alert.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         Set<Long> selectedConversations = ((ConversationListAdapter)getListAdapter())
             .getBatchSelections();
@@ -166,7 +166,7 @@ private void initializeSearch(android.widget.SearchView searchView) {
       }
     });
 
-    alert.setNegativeButton(R.string.ConversationListFragment_cancel, null);
+    alert.setNegativeButton(android.R.string.cancel, null);
     alert.show();
   }
 
diff --git a/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java b/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java
index ac2ae2fb7a..43ed03ffd8 100644
--- a/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java
+++ b/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java
@@ -83,7 +83,7 @@ public class ReviewIdentitiesActivity extends SherlockListActivity {
 
   @Override
   public void onCreateContextMenu (ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
-    menu.add(0, MENU_OPTION_DELETE, Menu.NONE, "Delete");
+    menu.add(0, MENU_OPTION_DELETE, Menu.NONE, R.string.delete);
   }
 
   @Override
@@ -138,8 +138,8 @@ public class ReviewIdentitiesActivity extends SherlockListActivity {
 
   private void deleteIdentity(String name, String keyString) {
     AlertDialog.Builder alertDialog = new AlertDialog.Builder(this);
-    alertDialog.setTitle("Delete identity?");
-    alertDialog.setMessage("Are you sure that you wish to permanently delete this identity key?");
+    alertDialog.setTitle(R.string.ReviewIdentitiesActivity_delete_identity);
+    alertDialog.setMessage(R.string.ReviewIdentitiesActivity_delete_identity_are_you_sure_you_want_to_delete_this_identity_key);
     alertDialog.setCancelable(true);
     alertDialog.setNegativeButton(R.string.no, null);
     alertDialog.setPositiveButton(R.string.yes, new DeleteIdentityListener(name, keyString));
@@ -192,7 +192,7 @@ public class ReviewIdentitiesActivity extends SherlockListActivity {
       }
 
       if (!valid)
-        identityName = "Invalid Identity!";
+        identityName = getString(R.string.ReviewIdentitiesActivity_invalid_identity);
 
       ((IdentityKeyView)view).set(identityName, identityKeyString);
     }
diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index 8883bbce15..4d892ac9fd 100644
--- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -86,7 +86,7 @@ public class VerifyIdentityActivity extends KeyVerifyingActivity {
       }
     });
 
-    builder.setNegativeButton("Cancel", null);
+    builder.setNegativeButton(android.R.string.cancel, null);
     builder.show();
   }