From 192ffb4d2fd10ec35b8f3e41261ddcb5dab0747f Mon Sep 17 00:00:00 2001
From: Tor Houghton <th-github@bogus.net>
Date: Fri, 12 Oct 2012 11:55:43 +0200
Subject: [PATCH 1/2] Ignore .DS_Store

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6f63200c44..f953f8a9a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ tests
 lint.xml
 local.properties
 ant.properties
+.DS_Store

From 73bde7accd1856b0327062ae4192c38966da06ea Mon Sep 17 00:00:00 2001
From: Tor Houghton <th-github@bogus.net>
Date: Fri, 12 Oct 2012 12:00:34 +0200
Subject: [PATCH 2/2] Localisation change

Localisation of the message prefix when forwarding a message (in
Norwegian, this would be "VS:" for instance).
---
 res/values/strings.xml                                   | 1 +
 src/org/thoughtcrime/securesms/ConversationActivity.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9f1ebdfffb..5f6a0be28e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -72,6 +72,7 @@
     <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sorry, the selected audio exceeds message size restrictions.</string>
     <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Recipient is not a valid SMS or email address!</string>
     <string name="ConversationActivity_message_is_empty_exclamation">Message is empty!</string>
+    <string name="ConversationActivity_forward_message_prefix">FWD</string>
     
     <!-- ConversationFragment -->
     <string name="ConversationFragment_message_details">Message details</string>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 2c9a053b6b..625365159b 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -411,7 +411,7 @@ public class ConversationActivity extends SherlockFragmentActivity
     registerForContextMenu(sendButton);
 
     if (getIntent().getStringExtra("forwarded_message") != null)
-      composeText.setText("FWD: " + getIntent().getStringExtra("forwarded_message"));
+      composeText.setText(R.string.ConversationActivity_forward_message_prefix+": " + getIntent().getStringExtra("forwarded_message"));
   }
 
   private void initializeRecipientsInput() {