From 2ca0fed2272335c700ec9b258eee72c2b2b53864 Mon Sep 17 00:00:00 2001
From: Jonathan Warren <me@jonwarren.org>
Date: Wed, 25 Dec 2013 00:46:14 -0500
Subject: [PATCH] fix error during fixing of merge conflict

---
 src/translations/bitmessage_en_pirate.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/translations/bitmessage_en_pirate.ts b/src/translations/bitmessage_en_pirate.ts
index 223c4b8b..2e719bf4 100644
--- a/src/translations/bitmessage_en_pirate.ts
+++ b/src/translations/bitmessage_en_pirate.ts
@@ -121,8 +121,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bitmessageqt/__init__.py" line="832"/>
-        <source>Waiting for their encryption key. Will request it again soon.</source>
+        <location filename="../bitmessageqt/__init__.py" line="823"/>
         <source>Waiting for their encryption key. Will request it again soon.</source>
         <translation type="unfinished"></translation>
     </message>