[tor-commits] [translation/whisperback] Update translations for whisperback

[translation at torproject.org]

commit bdf6c327c3a336d6d4c3060343d4f85c48e2cb9e
Author: Translation commit bot <translation at torproject.org>
Date:   Wed Mar 27 08:46:11 2013 +0000

    Update translations for whisperback
---
 ar/ar.po                  |  177 +++++++++++++++++----------------------------
 bg/bg.po                  |  165 +++++++++++++++---------------------------
 cs/cs.po                  |  177 +++++++++++++++++----------------------------
 de/de.po                  |  175 ++++++++++++++++----------------------------
 el/el.po                  |  177 +++++++++++++++++----------------------------
 es/es.po                  |  175 ++++++++++++++++----------------------------
 eu/eu.po                  |  175 ++++++++++++++++----------------------------
 fa/fa.po                  |  177 +++++++++++++++++----------------------------
 fr/fr.po                  |  175 ++++++++++++++++----------------------------
 he/he.po                  |  175 ++++++++++++++++----------------------------
 hu/hu.po                  |  175 ++++++++++++++++----------------------------
 it/it.po                  |  175 ++++++++++++++++----------------------------
 ja/ja.po                  |  173 ++++++++++++++++----------------------------
 ko/ko.po                  |  175 ++++++++++++++++----------------------------
 lv/lv.po                  |  175 ++++++++++++++++----------------------------
 nl/nl.po                  |  175 ++++++++++++++++----------------------------
 pl/pl.po                  |  175 ++++++++++++++++----------------------------
 pl_PL/pl_PL.po            |  177 +++++++++++++++++----------------------------
 pt_BR/pt_BR.po            |  177 +++++++++++++++++----------------------------
 ru/ru.po                  |  175 ++++++++++++++++----------------------------
 sr/sr.po                  |  171 ++++++++++++++++----------------------------
 templates/whisperback.pot |  177 +++++++++++++++++----------------------------
 zh_CN/zh_CN.po            |  177 +++++++++++++++++----------------------------
 23 files changed, 1472 insertions(+), 2553 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 313323c..0c25842 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-08-17 01:00+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: Mohammed ALDOUB <voulnet at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. XXX use a better exception
 #: ../whisperBack/whisperback.py:63
@@ -34,85 +34,47 @@ msgstr "مفتاح تشفير OpenPGPلجهة الاتصال خطأ: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "مفتاح تشفير OpenPGP العام لجهة الاتصال خطأ"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "لا توجد مفاتيح"
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "المتغير %s غير موجود في أي من ملفات الاعدادات /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "اسم البرنامج "
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "الخطوات اللازمة لإعادة خلق المشكلة"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "النتيجة النهائية / المشكلة"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "النتيجة المرغوب بها"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "غير قادر على تحميل اعدادات صالحة"
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>ساعدنا في حل المشكلة!</h1>\n<p> اقرأ <a href=\"%s\">تعليمات الابلاغ عن مشكلة </a>.</p>\n<p><strong>لا تقم بتوفير معلومات شخصية اكثر من اللازم!</strong></p>\n<h2>بما يتعلق بتزويدنا ببريدك الالكتروني</h2>\n<p>اذا لم تمانع من كشف بعض بياناتك الخصوصية لفريق مبرمجي تايلز، يمكنك تزويدنا ببريدك الالكتروني حتى نسآلك عن تفاصيل المشكلة. ادخال مفتاح تشفير بي جي بي يساعدنا على تشفير الاتصال</p>\n<p>أي شخص يقرأ هذا الرد سيعلم انك تستخدم تايلز. يا ترى هل تثق بمزود الانترنت لديك أو مزود خدمة البريد الالكتروني؟</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "ارسال بريد إلكتروني"
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "ارسال بريد إلكتروني"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "ربما نحتاج وقتاً آطول"
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "البريد الالكتروني لجهة الاتصال لا يبدو صحيحاً"
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "غير قادر على ارسال بريد الكتروني. مشكلة في ال SMTP"
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "غير قادر على الاتصال بالخادم"
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "غير قادر على انشاء او ارسال بريد الكتروني"
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -121,25 +83,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nلم يتم ارسال التقرير لخطأ بالاتصال. تأكد من اتصالك و كرر المحاولة.\n\nاذا لم تتمكن من الاتصال يمكنك حفظ التقرير لارساله لاحقاً."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "تم ارسال الرسالة"
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "غير قادر على ايجاد مفاتيح تشفير"
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "حصل خطأ أثناء التشفير"
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "غير قادر على حفظ%s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -149,70 +107,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "لم نتمكن من ارسال التقرير لمشاكل في الاتصال. تأكد من اتصالك بالشبكة و كرر المحاولة.\n\nكحل مؤقت يمكنك حفظ التقرير على ذاكرة فلاش و ارسالها لنا على %s من بريدك الالكتروني باستخدام جهاز آخر.\n\nلن يتم تسليم التقرير بكامل الخصوصية الا اذا استخدمت تور على الجهاز الآخر حين ارسالك الرسالة.\n\nهل تريد حفظ التقرير؟"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "أرسل آرائك عن الخدمة ببريد مشفر"
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "حقوق النسخ ٢٠٠٩ - ٢٠١٢ مطوري تايلز tails at boum.org"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "مبرمجي تايلز <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "لا يوجد عنوان موقع أو مفتاح أوبن بي جي بي صحيح."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "أضف مفتاح بي جي بي اذا أردتنا أن نشفر الرد على تقريرك"
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "شرح الخطأ"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "حقوق النسخ ٢٠٠٩ - ٢٠١٢  tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "مساعدة"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr " أردتنا أن نشفر الرد على رسالتك، أضف هوية مفتاحك> رابط لمفتاحك أو الجزء العام من المفتاح."
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "عنوان بريد الكتروني بديل للاتصال بك"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "ارسال"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "ملخص"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "تفاصيل تقنية "
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -231,18 +158,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "ويسبرباك - أرسل تعليقاتك و آرائك بإيميلات مشفرة. ⏎ حقوق النسخ ٢٠٠٩ - ٢٠١٢ مطوري تايلز tails at boum.org ⏎ هذا البرنامج مجاني، يمكنك إعادة توزيعه أو تغييره تحت بنود رخصة غنو العامة كما نشرتها منظمة البرمجيات الحرة، النسخة الثالثة أو أي نسخة أحدث. ⏎ هذا البرنامج يتم توزيعه على أمل الاستفادة منه، لكن من دون أي نوع من الضمانات. راجع رخصة غنو العامة لمزيد من التفاصيل. ⏎ يجب ان تكون استلمت نسخة من رخصة غنو العامة مع هذا البرنامج، اذا لم تستلمها، راجع <http://www.gnu.org/licenses/>\n.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr " أردتنا أن نشفر الرد على رسالتك، أضف هوية مفتاحك> رابط لمفتاحك أو الجزء العام من المفتاح."
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "ملخص"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "شرح الخطأ"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "عنوان بريد الكتروني بديل للاتصال بك"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "مفتاح بي جي بي اضافي"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "تفاصيل تقنية "
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "رأس للرسالة"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "معلومات ال debugging"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "رأس للرسالة"
+msgid "Help"
+msgstr "مساعدة"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "مفتاح بي جي بي اضافي"
+msgid "Send"
+msgstr "ارسال"
diff --git a/bg/bg.po b/bg/bg.po
index d7cc995..6eebb8e 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-11-23 18:05+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: kirilvel <kirilvelinov at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,85 +33,47 @@ msgstr "Невалиден контакт OpenPGP ключ: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Невалиден контакт OpenPGP блок ключ"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Няма ключове."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "The variable %s не е открита в конфигурацията files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Име на засегнатия софтуер"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Точните стъпки за възпроизвеждане на проблем"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Действителния резултат / проблем"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Желан резултат"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Валидна конфигурация не може да се зареди."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr ""
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr ""
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr ""
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr ""
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr ""
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr ""
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr ""
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr ""
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -120,25 +82,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr ""
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr ""
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr ""
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr ""
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr ""
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -148,70 +106,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr ""
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr ""
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr ""
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr ""
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr ""
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr ""
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
 msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr ""
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
+msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr ""
 
 #: ../data/whisperback.ui.h:3
-msgid "Copyright © 2009-2012 tails at boum.org"
+msgid "https://tails.boum.org/"
 msgstr ""
 
 #: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr ""
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr ""
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr ""
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr ""
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr ""
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr ""
-
-#: ../data/whisperback.ui.h:12
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -230,18 +157,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr ""
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr ""
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr ""
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr ""
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr ""
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr ""
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr ""
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr ""
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
+msgid "Help"
 msgstr ""
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr ""
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
+msgid "Send"
 msgstr ""
diff --git a/cs/cs.po b/cs/cs.po
index 6e9f951..63ccc94 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-08-21 15:16+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: digitaldreamer <digitaldreamer at email.cz>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. XXX use a better exception
 #: ../whisperBack/whisperback.py:63
@@ -33,85 +33,47 @@ msgstr "Neplatný kontaktní OpenPGP klíč: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Neplatný blok veřejného OpenPGP klíče"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Žádné klíče nebyly nalezeny."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "Proměnná %s nebyla nalezena v žádném z konfiguračních souborů/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Název postiženého softwaru"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Přesný popis kroků po kterých dochází k problému"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Aktuální výsledek / problém"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Očekávaný výsledek"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Nelze nahrát platnou konfiguraci"
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Pomozte nám spravit váš problém!</h1>\n <p>Přečtěte si <a href=\"%s\">naše instrukce pro nahlášení problému</a>.</p>\n <p><strong>Nepřikládejte více osobních informací než je \n třeba!</strong></p>\n <h2>Pokud nám chcete dát svou emailovou adresu</h2>\n <p>Nevadí-li vám částečné odhalení vaší identity\n vývojářům softwaru Tails, můžete poskytnout svou emailovou adresu\\n abychom se vás mohli zeptat na podrobnosti kolem vámi pozorovaného problému.. Přidáním\n veřejného PGP klíče nám umožní naší budoucí korespondenci s vámi zabezpečit \n šifrováním.</p>\n <p>Kdokoli kdo uvidí tuto odpověď, bude vědět že jste\n uživatelem softwaru Tails. Není na čase zvážit, nakolik věříte vašemu\n poskytovateli internetu a emailu?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Odesílám mail..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Odesílám mail"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Může to chvíli trvat..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Zdá se, že kontaktní emailová adresa je neplatná."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Mail nelze odeslat. Chyba SMTP."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Nelze se připojit k serveru."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Mail nelze vytvořit nebo odeslat."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -120,25 +82,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nHlášení o problému nebylo možné odeslat, pravděpodobně kvůli problémům sítě. Zkuste se, prosím, znovu připojit k síti a znovu kliknout na Odeslat.\n\nPokud to nebude fungovat, bude vám nabídnuta možnost hlášení o problému uložit."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Vaše zpráva byla úspěšně odeslána."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Šifrovací klíč nebyl nalezen."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Během šifrování došlo k chybě."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Nelze uložit %s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -148,70 +106,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Hlášení o problému nebylo možné odeslat, pravděpodobně kvůli problémům sítě. \n\nLze to obejít tak, že své hlášení o problému uložíte na USB flashdisk a pokusíte s ho poslat na %s z jiného počítače. Mějte na paměti, že vaše hlášení v tomto případě nebude anonymní, pokud se o to nepostaráte smi (jako například že se připojít přez Tor jednoráznově založenému emailovému účtu).\n\nChcete tedy uložit hlášení o problému jako soubor?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Poslat odezvu jako šifrovaný mail."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Vývojáři softwaru Tails <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Toto nevypadá jako platné URL nebo klíč OpenPGP."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Přiložte klíč PGP, pokud chcete, abychom vám odpovědi posílali šifrovaně."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Popis problému"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Nápověda"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Pokud chcete, abychom šifrovali zprávy až vám budeme odpovídat, přidejte ID svého klíče, odkaz na váš klíč, nebo klíč jako blok veřejného klíče."
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Nepovinná adresa, na které vás můžeme kontaktovat."
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Odeslat"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Shrnutí"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Technické detaily k přiložení"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -230,18 +157,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Odešlete vaší odezvu jako zašifrovaný email\nCopyright (C) 2009-2012 Tails developers <tails at boum.org>\n\nTento program je svobodný software; můžete ho šířit dál a / nebo modifikovat pokud dodržíte podmínky GNU General Public License tak, jak jí publikovala Free Software Foundation; buď ve verzi 3 této license, nebo (pokud chcete) kteroukoli její novější verzi.\n\nTento program je distribuován v naději, že bude užitečný, ale ZCELA BEZ ZÁRUKY;   i bez implicitní záurky PRODEJNOSTI nebo VHODNOSTI KE KONKRÉTNÍMU ÚČELU.   Podrobnosti najdete v textu GNU\nGeneral Public License.\n\nKopii GNU General Public License jste měli dostat spolu s tímto programem. Pokud tomu tak není, najde ji na <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Pokud chcete, abychom šifrovali zprávy až vám budeme odpovídat, přidejte ID svého klíče, odkaz na váš klíč, nebo klíč jako blok veřejného klíče."
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Shrnutí"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Popis problému"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Nepovinná adresa, na které vás můžeme kontaktovat."
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "nepovinný PGP klíč"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Technické detaily k přiložení"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "hlavičky"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "informace pro debuggování"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "hlavičky"
+msgid "Help"
+msgstr "Nápověda"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "nepovinný PGP klíč"
+msgid "Send"
+msgstr "Odeslat"
diff --git a/de/de.po b/de/de.po
index 5de2a5a..7075372 100644
--- a/de/de.po
+++ b/de/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-09-11 17:43+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: Sacro <Scion at T-Online.de>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,85 +34,47 @@ msgstr "Ungültiger Kontakt OpenPGP Schlüssel: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Invalid contact OpenPGP public key block"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Keine Schlüssel gefunden"
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "Die Variable %s wurde in keiner Konfiguration gefunden files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Name der betroffenen Software"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Genaue Schritte um das Problem zu reproduzieren"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Tatsächliches Ergebnis / das Problem"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Gewünschtes Ergebnis"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Es konnte keine gültige Konfiguration geladen werden."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Hilf uns den Fehler zu beheben!</h1>\n<p>Lies <a href=\"%s\">unsere Anleitung zur Fehlerberichterstattung</a>.</p>\n<p><strong>Geben Sie nicht mehr persönliche Informationen an als benötigt!</strong></p>\n<h2>Über die Angabe einer Emailadresse</h2>\n<p>Wenn es Sie nicht stört, Teile Ihrer Identität gegenüber den Tails Entwicklern offenzulegen,\nkönnen Sie eine Emailadresse für Rückfragen angeben.\nEin zusätzlich angegebener PGP Schlüssel ermöglicht uns in Zukunft eine verschlüsselete Kommunikation.</p>\n<p>Jeder, der diese Antwort sehen kann, kann wahrscheinlich daraus folgern,\ndass Sie ein Tails Nutzer sind. Zeit sich zu fragen, wie sehr\nSie Ihrem Internet und Emailprovider vertrauen?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Mail wird gesendet..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Mail wird gesendet"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Dies könnte eine Weile dauern..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Die Kontakt-Adresse ist nicht gültig."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Mail kann nicht gesendet werden: SMTP Fehler."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Verbindung zum Server fehlgeschlagen."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "EMail kann nicht erstellt oder versendet werden."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -121,25 +83,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nDie Fehlermeldung konnte aufgrund von Netzwerkproblemen nicht gesendet werden. Bitte verbinden sich sich mit dem Netzwerk und klicken erneut auf senden.\n\nSollte dies nicht funktionieren, bieten wie ihnen an, die Fehlermeldung zu speichern."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Ihre Nachricht wurde versendet."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Verschlüsselungs Key konnte nicht gefunden werden."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Ein Fehler trat beim Verschlüsseln auf."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "%s kann nicht gespeichert werden."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -149,70 +107,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Die Fehlermeldung konnte aufgrund von Netzwerkproblemen nicht gesendet werden. Als Umgehungslösung können Sie die Fehlermeldung auf einem USB-Stick speichern und versuchen, Sie uns per Email an %s zu senden. Bedenken Sie, dass dieser Fehlerbericht so nicht anonymus sein wird, es sei denn, Sie unternehmen dazu weitere Schritte (z.b. die Verwendung einer Wegwerf-Emailadresse in Verbindung mit Tor).\n\nMöchten Sie diesen Fehlerbericht in eine Datei speichern?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Senden Sie ihr Feedback in einer verschlüsselten Mail."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails developers <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "Ãœbersetzer Danksagung"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Die URL oder der OpenPGP Key ist ungültig."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Fügen Sie einen PGP key an, wenn Sie wollen, dass wir Ihnen verschlüsselt antworten."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Fehler Beschreibung"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Hilfe"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Wenn sie wollen, dass wir Ihnen mit einer verschlüsselten Nachricht antworten, hängen Sie Ihre Schlüssel ID, einen Link zu Ihrem Schlüssel oder den Schlüssel alsPublic Key Block:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Optionale Kontakt Adresse"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Senden"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Zusammenfassung"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Technische Details"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -231,18 +158,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Send feedback in an encrypted mail\nCopyright (C) 2009-2012 Tails developers <tails at boum.org>\n\nThis program is  free software; you can redistribute  it and/or modify\nit under the  terms of the GNU General Public  License as published by\nthe Free Software Foundation; either  version 3 of the License, or (at\nyour option) any later version.\n\nThis program  is distributed in the  hope that it will  be useful, but\nWITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of\nMERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Wenn sie wollen, dass wir Ihnen mit einer verschlüsselten Nachricht antworten, hängen Sie Ihre Schlüssel ID, einen Link zu Ihrem Schlüssel oder den Schlüssel alsPublic Key Block:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Fehler Beschreibung"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Optionale Kontakt Adresse"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "Optionaler PGP Schlüssel"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Technische Details"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "Kopfzeilen"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "Informationen zur Fehlersuche"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "Kopfzeilen"
+msgid "Help"
+msgstr "Hilfe"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "Optionaler PGP Schlüssel"
+msgid "Send"
+msgstr "Senden"
diff --git a/el/el.po b/el/el.po
index 2532cc1..61723a4 100644
--- a/el/el.po
+++ b/el/el.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-08-16 21:43+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: anvo <fragos.george at hotmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. XXX use a better exception
 #: ../whisperBack/whisperback.py:63
@@ -35,85 +35,47 @@ msgstr "Μη έγκυρο κλειδί OpenPGP %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Μη έγκυρο δημόσιο OpenPGP key block"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Δεν βρέθηκαν κλειδιά "
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "Η μεταβλητή %s δεν βρέθηκε σε κανένα από τα αρχεία ρυθμίσεων /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Όνομα από το προσβεβλημένο λογισμικό"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Ακριβή βήματα για την αναπαραγωγή του προβλήματος "
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Πραγματικό αποτέλεσμα / το πρόβλημα"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Επιθυμητό αποτέλεσμα"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Αδύνατον να το φορτωθούν έγκυρες ρυθμίσεις. "
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Βοήθησε μας να φτιάξουμε το Bug σου!</h1>\n<p>Διάβασε<a href=\"%s\">τις οδηγίες για την αναφορά Bug</a>.</p>\n<p><strong>Μην συμπεριλάβεις περισσότερες πληροφορίες από όσες χρειάζονται!</strong></p>\n<h2>Δώσε μας μια διεύθυνση e-mail</h2>\n<p>Αν δεν σε πειράζει δώσε μερικές πληροφορίες της ταυτότητας σου\nστους Tails developers, μπορείς να μας δώσεις μια διεύθυνση e-mail για να μπορέσουμε να σε ρωτήσουμε περισσότερα για το Bug. Ακόμα με το να δώσεις\nένα public PGP κλειδί θα μας επιτρέπει να κρυπτογραφούμε τυχόν μελλοντικές συνομιλίες\nγια την επικοινωνία μας.</p>\n<p>Οποισδήποτε που μπο
 ρεί να δει την απάντηση λογικά θα συμπεραίνει ότι είσαι\nένας χρήστης Tails . Έναι ώρα να αναρωτηθείς πόσο εμπιστέυεσε τον πάροχο Internet και email?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Αποστέλετε το mail..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Αποστέλετε το mail"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Αυτό μπορεί να διαρκέσει λίγο..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Η διεύθυνση επικοινωνίας δεν φαίνεται να είναι έγκυρη"
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Δεν είναι δυνατόν να σταλεί το mail: σφάλμα SMTP "
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Αδύνατη η σύνδεση με τον διακομιστή"
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Αδύνατη η δημιουργία ή η αποστολή mail"
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -122,25 +84,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nΗ αναφορά bug δεν μπορούσε να σταλεί, λόγω προβλημάτων σύνδεσης. Παρακαλούμε προσπαθήστε να συνδεθείτε ξανά και πατήστε \"Αποστολή πάλι\". \n\nΑν δεν δουλέψει, θα σου ζητηθεί να αποθηκεύσεις την αναφορά bug "
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Το μήνυμα σας έχει σταλεί"
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Δεν είναι δυνατόν να βρεθεί το κλειδί κωδικοποίησης "
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Εμφανίστηκε ένα σφάλμα "
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Αδύνατη η αποθήκευση  %s"
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -150,70 +108,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Η αναφορά bug δεν μπορούσε να σταλεί, λόγω προβλημάτων σύνδεσης.\n\nΜπορείς να σώσεις την αναφορά bug σαν αρχείο σε ένα  USB Drive και να προσπαθήσεις να μας το στείλεις %s από τον email λογαριασμό σου από ένα άλλο σύστημα. Σημειώσε εδώ ότι δεν θα σταλεί ανώνημα με αυτή την επιλογή εκτός και αν κάνεις κάποιες παραπάνω ρυθμίσεις εσύ ( π.χ. να χρησιμοποιήσεις το Tor με έναν throw-away λογαριασμό Email).\n\nΘές να αποθηκεύσεις την αναφορά bug ως αρχείο;"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Στείλε τα σχόλια σας σε ένα κρυπτογραφημένο mail."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails developers <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Αυτό δεν φαίνετε να είναι έγκυρο URL ή κλειδί OpenPGP "
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Πρόσθεσε ένα κλειδί PGP αν θέλεις να κρυπτογραφούμε τα μηνύμα τα μας όταν σου απαντάμε"
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Περιγραφή Bug "
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Βοήθεια "
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Αν θέλεις να κρυπτογραφούμε τα μημνυμα τα μας όταν σου απαντάμε, πρόσθεσε τον ID σου, ένα σύνδεσμο στο ID  σου, ή το ID σου σαν ένα δημόσιο ID block"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Εναλλακτικη διευθυνση email για να επικοινωνήσουμε μαζί σου"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Αποστολή"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Περίληψη"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Τεχνικές λεπτομέριες για να συμπεριλάβεις "
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -232,18 +159,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Επικοινωνήστε μαζί μας με κρυπτογραφημένο μήνυμα\nCopyright (C) 2009-2012 Tails developers <tails at boum.org\n\nΤο πρόγραμμα αυτό είναι ελεύθερο λογισμικό· μπορείτε να το αναδιανέμετε και/ή να το τροποποιήσετε\nυπό τους όρους της GNU General Public License όπως αυτή δημοσιεύεται από το\nΊδρυμα Ελεύθερου λογισμικού· είτε η έκδοση 3 της Αδειας, είτε (με\nδική σας επιλογή) κάθε παλαιότερη έκδοσή της.\n\nΤο πρόγραμμα διανέμετε με την ελπίδα ότι θα φανεί χρήσιμο, αλλά\nΧΩΡΙΣ ΟΥΔΕΜΙΑ ΕΓΓΥΗΣΗ· χωρίς καν την υπονοούμενη εγγύηση ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΚΑΠΟΙΟΝ 
 ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Για περισσότερες πληροφορίες, δείτε την Άδεια GNU General Public License.\n\nΜαζί με το πρόγραμμα αυτό θα πρέπει να έχετε λάβει και ένα\n αντίγραφο της GNU General Public License. Αν όχι, δείτε την ιστοσελίδα <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Αν θέλεις να κρυπτογραφούμε τα μημνυμα τα μας όταν σου απαντάμε, πρόσθεσε τον ID σου, ένα σύνδεσμο στο ID  σου, ή το ID σου σαν ένα δημόσιο ID block"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Περίληψη"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Περιγραφή Bug "
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Εναλλακτικη διευθυνση email για να επικοινωνήσουμε μαζί σου"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "Εναλλακτικό κλειδί PGP"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Τεχνικές λεπτομέριες για να συμπεριλάβεις "
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "Κεφαλίδες "
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "Πληροφορίες debugging "
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "Κεφαλίδες "
+msgid "Help"
+msgstr "Βοήθεια "
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "Εναλλακτικό κλειδί PGP"
+msgid "Send"
+msgstr "Αποστολή"
diff --git a/es/es.po b/es/es.po
index 3e0b8c9..4ad06b0 100644
--- a/es/es.po
+++ b/es/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2013-01-14 22:23+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: strel <strelnic at gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -35,85 +35,47 @@ msgstr "Clave OpenPGP de contacto no válida: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Bloque de clave pública OpenPGP de contacto no válida"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "No se encontraron claves"
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "La variable %s no se encontró en ninguno de los archivos de configuración files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Nombre del software afectado"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Pasos exactos para reproducir el problema"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Resultado actual / el problema"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Resultado deseado"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "No se pudo cargar una configuración válida"
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>¡Ayúdenos a arreglar su error!</h1>\n<p>Lea<a href=\"%s\">nuestas instrucciones para informar de errores</a>.</p>\n<p><strong>¡No incluya más información personal\nde la necesaria!</strong></p>\n<h2>Acerca de proporcionarnos una dirección de correo</h2>\n<p>Si no le importa revelar un par de detalles de su identidad a los\ndesarrolladores de Tails, puede proporcionarnos una dirección de correo\npara permitirnos preguntarle más detalles sobre el error. Adicionalmente,\nproporcionándonos una clave pública PGP nos permitirá cifrar tales\nfuturas comunicaciones.</p>\n<p>Cualquiera que vea esta respuesta probablemente inferirá que usted\nes un usuario de Tails. Es hora de preguntarse ¿cuánto confía en sus\nproveedores de Internet y de correo electrónico?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Enviando correo..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Enviando correo"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Esto podría llevar un tiempo..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "La dirección de correo de contacto no parece válida"
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "No se pudo enviar el correo: error SMTP"
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "No se pudo crear o enviar el correo"
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -122,25 +84,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nEl informe de errores no pudo ser enviado, probablemente por problemas de conexión. Intente reconectar a la red y haga clic en Enviar de nuevo.\n\nSi esto no funciona, se le ofrecerá guardar el informe de errores."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Su mensaje ha sido enviado."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "No se pudo encontrar la clave de cifrado"
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Ha ocurrido un error durante el cifrado"
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "No se pudo guardar %s"
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -150,70 +108,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "El informe de errores no se pudo enviar, probablemente debido a errores de conexión.⏎\n⏎\nComo solución, puede guardar el informe de errores a un archivo en una memoria USB, e intentar enviárnoslo a %s desde una cuenta de correo ordinario usando otro sistema. Observe que cuando lo haga su informe de errores no será anónimo a menos que tome las medidas necesarias por su cuenta (ej: usar Tor con una cuenta de correo desechable). ⏎ \n⏎\n¿Quiere guardar el informe de errores en un archivo?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Enviar sus observaciones en un correo cifrado"
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Desarrolladores de Tails (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Desarrolladores de Tails <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "Créditos a los traductores"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Esto no parece ser una URL o una clave OpenPGP válida."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Añada una clave PGP si quiere que cifremos los mensajes cuando le respondamos."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Descripción del error"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Ayuda"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Si quiere que cifremos los mensajes cuando le respondamos, añada el identificador (ID) de su clave, un enlace a su clave, o la clave como un bloque de claves públicas:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Direcciones de correo opcionales para contactarle"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Enviar"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Sumario"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Detalles técnicos a incluír"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/index.es.html"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -232,18 +159,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Envía la respuesta del usuario en un correo cifrado\nCopyright (C) 2009-2012 Desarrolladores de Tails <tails at boum.org>\n\nEste programa es software libre; puede redistribuírlo y/o modificarlo \nbajo los términos de la Licencia Pública General (GPL) de GNU tal\ncomo está publicada por la Free Software Foundation; tanto en su\nversión 3 o (a su criterio) cualquier versión posterior.\n\nEste programa se distribuye con la esperanza de que resultará útil, \npero SIN GARANTÍA ALGUNA; sin siquiera la garantía implícita de \nUTILIDAD o ADECUACIÓN PARA UN PROPÓSITO ESPECÍFICO. \nVea la Licencia Pública General de GNU para más detalles.\n\nDebería haber recibido una copia de la Licencia Pública General de GNU \njunto a este programa. Si no, vea <http://www.gnu.org/licenses/licenses.es.html>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Si quiere que cifremos los mensajes cuando le respondamos, añada el identificador (ID) de su clave, un enlace a su clave, o la clave como un bloque de claves públicas:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Sumario"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Descripción del error"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Direcciones de correo opcionales para contactarle"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "Clave PGP opcional"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Detalles técnicos a incluír"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "Cabeceras"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "Información de depuración (debugging)"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "Cabeceras"
+msgid "Help"
+msgstr "Ayuda"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/index.es.html"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "Clave PGP opcional"
+msgid "Send"
+msgstr "Enviar"
diff --git a/eu/eu.po b/eu/eu.po
index 260a170..6221772 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-11-21 13:45+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: Antxon Baldarra <baldarra at euskalerria.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,85 +33,47 @@ msgstr "Harremanetarako OpenPGP giltza baliogabea: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Harremanarako OpenPGP giltz publiko blokea baliogabea"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Ez da gakorik aurkitu."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "%s aldagaia ez da ez /etc/whisperback/config.py, ez ~/.whisperback/config.py, ezta ./config.py konfigurazio fitxategietan aurkitu."
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Eragina izan duen softwarearen izena"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Arazoa gertarazteko pausu zehatzak"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Benetazko emaitza / arazoa"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Nahi zen emaitza"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Ezin izan da konfigurazio baliogarririk kargatu"
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Lagun gaitzazu zure akatsa konpontzen!</h1>\n<p>Irakurri <a href=\"%s\">gure akatsak bidaltzeko argibideak</a>.</p>\n<p><strong>Ez gehitu beharrezkoa baino informazio pertsonal \ngehiagorik!</strong></p>\n<h2>Guri email helbide bat emateari buruz</h2>\n<p>Zure nortasunaren bits batzuk Tails garatzaileekin hedatzea \ninporta ez bazaizu, email helbide bat eman diezagukezu akatsaren \nxehetasun gehiago galdetu ahal zaitzagun. Gainera, PGP giltz \npubliko bat sartzeak etorkizunean egindako komunikazioak \nenkriptatzea baimenduko digu.</p>\n<p>Erantzun hau ikus dezakeen edonork Tails erabiltzaile bat \nzarela ondoriozta dezake. Zure Internet eta postakutxa \nhornitzailetaz zenbat fidatzen zaren galdetzeko denbora?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Posta bidaltzen..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Posta bidaltzen"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Honek luze jo dezake..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Harremanetarako email helbidea ez du baliogarria ematen."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Ezin izan da emaila bidali: SMTP akatsa."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Ezin izan da zerbitzarira konektatu."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Ezin izan da emaila sortu edo bidali."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -120,25 +82,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nAkats txostena ezin izan da bidali, ziurrenik sare arazoengatik. Mesedez saiatu sarera berriz konektatzen eta sakatu bidali berriz.\n\nEz badu funtzionatzen, akats txostena gordetzea eskainiko zaizu."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Zure mezua bidali da."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Ezin izan da enkriptazio giltza aurkitu."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Akats bat gertatu da enkriptazioaren bitartean."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Ezin izan da %s gorde."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -148,70 +106,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Akats txostena ezin izan da bidali, ziurrenik sare arazoengatik.\n\nLan-inguru bezala akats txostena fitxategi bat bezala USB batean gorde dezakezu eta guri %s ra bidaltzen saiatu zure email kontutik beste sistema bat erabiliz. Jakin ezazu zure akats txostena ez dela anonimoa izango zure kontu beste pausu batzuk ematen ez badituzu (adib. Tor erabili aldi baterako email kontu batekin).\n\nAkats txostena fitxategi batean gorde nahi duzu?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Atzeraelikadura enkriptatutako email batean bidali."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails garatzaileak (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails garatzaileak <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "itzultzaile-kredituak"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Honek ez du URL edo OpenPGP giltza baliogarri baten antzik."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Gehitu PGP giltz bat zuri erantzuterakoan mezuak enkripta ditzagun nahi baduzu."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Akatsaren deskribapena"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Laguntza"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Zuri erantzuterakoan mezuak enkripta ditzagun nahi baduzu, gehitu zure IDa, zure giltzarako lotura, edo giltza giltz bloke publiko bezala:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Hautazko email helbidea zurekin harremanetan jartzeko"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Bidali"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Laburpena"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Sartzeko xehetasun teknikoak"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -230,18 +157,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Bidali berrelikadura enkriptatutako mail batean\nCopyright (C) 2009-2012 Tails garatzaileak <tails at boum.org>\n\nPrograma hau software askea da; birbana eta/edo alda dezakezu Software \nFoundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 3. \nbertsioan, edo (nahiago baduzu) beste berriago batean.\n\nPrograma hau erabilgarria izango delakoan banatzen da, baina, INOLAKO \nBERMERIK GABE; era berean, ez da bermatzen beraren EGOKITASUNA \nMERKATURATZEKO edo HELBURU PARTIKULARRETARAKO \nERABILTZEKO. Argibide gehiago nahi izanez gero, ikus GNU Lizentzia \nPubliko Orokorra.\n\nPorgrama honekin batera GNU Lizentzia Publiko Orokorraren kopia bat \njasoko zenuen; hala ez bada, begiratu <http://www.gnu.org/licenses/>\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Zuri erantzuterakoan mezuak enkripta ditzagun nahi baduzu, gehitu zure IDa, zure giltzarako lotura, edo giltza giltz bloke publiko bezala:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Laburpena"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Akatsaren deskribapena"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Hautazko email helbidea zurekin harremanetan jartzeko"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "hautazko PGP giltza"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Sartzeko xehetasun teknikoak"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "goiburuak"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "arazteko informazioa"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "goiburuak"
+msgid "Help"
+msgstr "Laguntza"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "hautazko PGP giltza"
+msgid "Send"
+msgstr "Bidali"
diff --git a/fa/fa.po b/fa/fa.po
index 9c19d21..15f00d7 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-08-16 09:20+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: Ardeshir <ardeshir at redteam.io>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. XXX use a better exception
 #: ../whisperBack/whisperback.py:63
@@ -35,85 +35,47 @@ msgstr "کلید OpenPGP نامعتبر: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "قطعه کلید عمومی OpenPGP نامعتبر"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "کلیدی یافت نشد."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "متغیر %s در هیچ‌یک از پیکربندی‌های\n files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py\nیافت نشد"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "نام نرم‌افزار تحت تاثیر واقع شده"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "گام‌های دقیق در تولید مجدد مشکل"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "نتیجه واقعی / مشکل"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "نتیجه مورد انتظار"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "امکان بارگذاری یک پیکربندی معتبر وجود ندارد."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>به ما Ú©Ù…Ú© کنید تا باگ شما را رفع کنیم!</h1>\n<p><a href=\"%s\">دستورالعمل اعلام باگ</a> را مطالعه کنید.</p>\n<p><strong>از ارسال اطلاعات شخصی بیش از اندازه خودداری کنید!</strong></p>\n<h2>اعلام آدرس ایمیل</h2>\n<p>اگر شما با ارایه بخش Ú©ÙˆÚ†Ú©ÛŒ از هویت خودتان به تیم Tails مشکلی ندارید، می‌توانید آدرس ایمیل خودتان را اعلام کنید تا این امکان را به ما بدهید Ú©Ù‡ در صورت لزوم اطلاعات بیشتری در مورد باگ از شما بپرسیم. علاوه بر آن با وارد کردن کلید عمومی PGP خودتان می‌توانید به رمزنگاری ارتباطات آینده Ú©Ù…Ú© کنید.</p>\n<p>هر کسی Ú©Ù‡ این پاسخ را ببیند می‌تواند حدس بزند Ú©Ù‡ شما یک کاربر Tails هستیØ
 ¯. زمان آن رسیده است Ú©Ù‡ بررسی کنید Ú©Ù‡ شما چقدر به ارائه کنندگان سرویس اینترنت Ùˆ ایمیل خود اطمینان دارید؟</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "درحال ارسال نامه..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "ارسال نامه"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "این کار ممکن است کمی بطول بیانجامد"
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "آدرس ایمیل وارد شده به نظر صحیح نمی‌رسد"
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "امکان ارسال نامه وجود ندارد: خطای SMTP."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "امکان برقراری ارتباط با سرور وجود ندارد."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "امکان ایجاد و یا ارسال نامکه وجود ندارد."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -122,25 +84,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nگزارش باگ فرستاده نشد. به نظر میرسد که این اشکال از شبکه باشد. لطفن تلاش کنید که دوباره به شبکه متصل شوید و دوباره روی ارسال کلیک کنید.⏎\n⏎\nاگر کار نکرد، به شما پیشنهاد داده خواهد شد تا گزارش باگ را ذخیره کنید."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "پیغام شما ارسال شد."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "کلید رمزنگاری پیدا نشد."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "در هنگام رمزنگاری خطایی رخ داده است."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "امکان ذخیره %s وجود ندارد."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -150,70 +108,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "گزارش باگ فرستاده نشد. به نظر میرسد که این اشکال از شبکه باشد.⏎\n⏎\nبرای راه افتادن کار، میتوانید فایل گزارش باگ را روی یک درایو USB ذخیره و و از طریق ایمیل و با استفاده از یک سیستم دیگه برای ما به آدرس %s بفرستید. توجه داشته باشید که گزارش باگ شما، ناشناس نخواهد بود مگر اینکه براش کاری انجام بدین (بطور مثال از یک ایمیل ناشناس و بر روی شبکه تور اقدام به ارسال گزارش کنید)⏎\n⏎\nآیا مایلید که فایل گزارش باگ را ذخیره کنید؟"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "ارسال بازخورد در یک نامه رمزنگاری شده."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr ""
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails developers <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr ""
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "به نظر نمی‌رسد که این یک کلید OpenPGP و یا URL معتبر باشد."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "اگر میخواهید ما در هنگام پاسخ، پیام را رمزگذاری کنیم، یک کلید PGP اضافه کنید"
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "توضیح باگ"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr ""
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "راهنما"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "اگر میخواهید ما در هنگام پاسخ، پیام را رمزگذاری کنیم، آی دی کلید خود، یک لینک به کلید و یا کلید را بعنوان یک بلاک کلید عمومی اضافه کنید:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "آدرس ایمیل اختیاری برای تماس با شما"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "ارسال"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "خلاصه"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr ""
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -232,18 +159,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "اگر میخواهید ما در هنگام پاسخ، پیام را رمزگذاری کنیم، آی دی کلید خود، یک لینک به کلید و یا کلید را بعنوان یک بلاک کلید عمومی اضافه کنید:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "خلاصه"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "توضیح باگ"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "آدرس ایمیل اختیاری برای تماس با شما"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "کلید اختیاری PGP"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr ""
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "headers"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "اطلاعات اشکال زدایی"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "headers"
+msgid "Help"
+msgstr "راهنما"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "کلید اختیاری PGP"
+msgid "Send"
+msgstr "ارسال"
diff --git a/fr/fr.po b/fr/fr.po
index 738d534..0c2babc 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-09-10 17:06+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: arpalord <arpalord at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -35,85 +35,47 @@ msgstr "Clé OpenPGP de contact invalide : %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Bloc de clé OpenPGP de contact invalide"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Aucune clé trouvée"
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "La variable %s n'a été trouvée dans aucun des fichiers de configuration /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Nom du logiciel concerné"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Étapes exactes pour reproduire le problème"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Résultat observé / problème"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Résultat souhaité"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Impossible de charger une configuration valide"
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Aidez-nous à résoudre votre problème !</h1>\n<p>Lire <a href=\"%s\">nos instructions sur le signalement de\nproblèmes</a>.</p>\n<p><strong>N'incluez pas plus d'informations personnelles que\nnécessaire !</strong></p>\n<h2>À propos de votre adresse email</h2>\n<p>Si cela ne vous dérange pas de divulguer des bribes\nd'information à votre sujet aux développeurs de Tails, vous\npouvez fournir une adresse email afin que nous puissions vous\ndemander davantage de détails sur le bug. Si vous fournissez\naussi une clé PGP publique, nous vous demanderons ces détails\npar email chiffré.</p>\n<p>Ceux qui pourront voir ces communication pourront sans\ndoute en déduire que vous êtes un utilisateur de Tails. C'est\npeut-être le moment de vous interroger sur la confiance que vous\naccordez à votre fournisseur d'accès à Internet et à votre\nhébergeur email...</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Envoi du mail..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Envoi du mail"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Ceci peut prendre un moment..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "L'adresse email de contact ne semble pas valide."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Impossible d'envoyer le mail : erreur SMTP."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Impossible de se connecter au serveur."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Impossible de créer ou d'envoyer le mail."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -122,25 +84,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nLe signalement de problème ne peut pas être envoyé, probablement en raison d'un problème de connexion au réseau. Merci d'essayer de reconnecter l'ordinateur au réseau, puis de cliquer sur le bouton envoyer. \n\nSi cela ne fonctionne pas, il sera possible de sauvegarder le signalement de problème."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Votre message a été envoyé."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Impossible de trouver la clé de chiffrement."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Une erreur est survenue durant le chiffrement."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Impossible d'enregistrer %s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -150,70 +108,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Le signalement de problème ne peut pas être envoyé, probablement en raison d'un problème de connexion au réseau.\n\nPour contourner le problème, vous pouvez sauvegarder le signalement de problème sur une clé USB et essayer de nous l'envoyer à l'adresse %s depuis votre adresse électronique en utilisant un autre système. Attention : en procédant de la sorte, votre signalement de problème ne sera pas anonyme, à moins que vous ne preniez vous-même des précautions supplémentaires (par exemple en utilisant Tor avec une adresse mail à usage unique).\n\nVoulez-vous sauvegarder le signalement de problème dans un fichier ?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Envoyer vos remarques dans un mail chiffré."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Les développeurs de Tails (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Développeurs de Tails <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "traducteurs"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Ceci ne semble pas être une URL ou une clé OpenPGP valide."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Ajoutez une clé PGP si vous voulez que l'on encrypte les messages quand on vous répond."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Description du problème"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Aide"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Si vous voulez que l'on encrypte les messages quand on vous répond, ajoutez votre clé ID, un lien vers votre clé, ou la clé comme clé publique "
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Adresse email optionnelle pour vous contacter"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Envoyer"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Résumé"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Détails techniques à inclure"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -232,18 +159,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Envoyer un commentaire dans un mail chiffré\nCopyright (C) 2009-2012 Les développeurs de Tails <tails at boum.org>\n\nCe programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier sous les termes de la licence GNU General Public License publiée par la Free Software Foundation; soit la version 3 de la Licence, ou (au choix) toute version ultérieure.\n\nCe programme est distribué dans l'espoir d'être utile, mais SANS AUCUNE GARANTIE; sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN USAGE PARTICULIER. Voir la licence GNU General Public License pour plus d'informations.\n\nVous devriez avoir reçu une copie de la licence GNU General Public License avec ce programme. Dans le cas contraire, voir <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Si vous voulez que l'on encrypte les messages quand on vous répond, ajoutez votre clé ID, un lien vers votre clé, ou la clé comme clé publique "
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Résumé"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Description du problème"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Adresse email optionnelle pour vous contacter"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "clé PGP optionnelle"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Détails techniques à inclure"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "en-têtes"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "informations de déboguage"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "en-têtes"
+msgid "Help"
+msgstr "Aide"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "clé PGP optionnelle"
+msgid "Send"
+msgstr "Envoyer"
diff --git a/he/he.po b/he/he.po
index adbe87a..74822e3 100644
--- a/he/he.po
+++ b/he/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-11-29 22:03+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: blackbird <yaelgogol at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,85 +33,47 @@ msgstr "מפתח OpenPGP לא תקין של איש קשר: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "מפתח ציבורי  OpenPGP לא תקין של איש קשר"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "לא × ×ž×¦××• מפתחות."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "×”×ž×©×ª× ×” %s לא × ×ž×¦× באף אחד מקבמי ההגדרות /etc/whisperback/config.py,\n.whisperback/config.py, ./config.py."
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "שם של ×”×ª×•×›× ×” המושפעת"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "צעדים מדויקים לייצר מחדש את הבעיה"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "תוצאה ממשית \\ הבעיה"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "תוצאה  רצויה"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "לא מתאפשר לטעון הגדרה לא ×ª×§×™× ×”."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1> עזור ×œ× ×• לתקן את התקלה שלך! </h1>\n<p> קרא <a href=\"%s\"> את הוראות דיווח התקלות ×©×œ× ×• </p> </a>\n<strong><p> אל תכלול מידע אישי יותר ממה שצריך! </p></strong>\n<h2> בקשר ×œ× ×ª×™× ×ª כתובת אימייל </h2>\n<p> אם לא אכפת לך לגלות מידע מהזהות שלך למפתחי Tails, אתה יכול לספק כתובת אימייל כדי לאפשר ×œ× ×• לשאול יותר פרטים על התקלה. ×›× ×™×¡×” × ×•×¡×¤×ª עם מפתח ציבורי  PGP מאפשרת ×œ× ×• להצפין תקשורת עתידית כזאת. </p>\nכל אחד שיכול לראות את התגובה הזאת ×›× ×¨××” ×©×™× ×™×— שאתה משתמש  Tails. \nזמן לתהות כמה אתה סומך על ×”××™× ×˜×¨× ×˜ שלך וספקי המייל? </p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "שולח מייל..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "שולח מייל"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "זה יכול לקחת קצת זמן.."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "כתובת המייל של איש הקשר לא × ×¨××™×ª ×ª×§×™× ×”"
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "אי אפשר לשלוח את המייל: שגיאת SMTP."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "אי אפשר להתחבר לשרת."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "אי אפשר ליצור או לשלוח מייל."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -120,25 +82,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\nדיווח התקלה לא יכל להשלח, ×›× ×¨××” בשל בעיות רשת. בבקשה × ×¡×” להתחבר מחדש לרשת ולחץ שלח שוב. אם ×–×” לא עובד, יציעו לך לשמור את דיווח התקלה"
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "ההודעה שלך × ×©×œ×—×”."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "אי אפשר למצוא את מפתח ×”×”×¦×¤× ×”."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "שגיאה קרתה במהלך ×”×”×¦×¤× ×”."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "אי אפשר לשמור %s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -148,70 +106,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "דיווח התקלה לא יכל להשלח, ×›× ×¨××” בשל בעיות רשת. \n אתה יכול לשמור את דיווח התקלה כקובץ בUSB drive ×•×œ× ×¡×•×ª לשלוח ×œ× ×• אותו ב %s מחשבון האימייל שלך על ידי שימוש במערכת אחרת. שים לב שדיוחח התקלה שלך לא ×™×”×™×” ×× ×•× ×™×ž×™ בעשייתך זאת אלא אם כן תבצע מספר צעדים בעצמך (למשל שימוש ב Tor עם חשבון אימייל  throw-away). האם אתה רוצה לשמור את דיווח התקלה לקובץ?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "שלח משוב במייל מוצפן."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "כל הזכויות שמורות © 2009-2012 למפתחי Tails \n (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "מפתחיtails at boum.org> Tails >"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "קרדיטים למתרגם"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "×–×” לא × ×¨××” מפתח OpenPGP או URL תקין."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "הוסף מפתח PGP אם אתה רוצה ×©×× ×—× ×• × ×¦×¤×™×Ÿ הודעות כאשר ×× ×—× ×• ×¢×•× ×™× לך."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "תיאור תקלה."
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "כל הזכויות שמורות © 2009-2012 \ntails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "עזרה"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "אם אתה רוצה ×©×× ×—× ×• × ×¦×¤×™×Ÿ הודעות כאשר ×× ×—× ×• ×¢×•× ×™× לך, הוסף את מפתח ×” ID, קישור למפתח שלך, או המפתח כמפתח ציבורי: "
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "כתובת מייל אפשרית לתקשר איתך"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "שלח"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "סיכום"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "פרטים ×˜×›× ×™×™× שיכללו"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -230,18 +157,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "                                                                                                                                                                                      \n                                                                             WhisperBack          \n                                                                                                                                                   שלח משוב במייל מוצפן. כל הזכויות שמורות Copyright (C) 2009-2012 למפתחי \ntails at boum.org>  Tails   >. ×ª×•×›× ×” זאת היא ×ª×•×›× ×” חופשית;  אתה יכול להפיץ מחדש אותה ו\\או ×œ×©× ×•×ª×” תחת ×”×ª× ××™× של GNU General \nPublic License  כפי שפורסם על ידי Free Software Foundation ; או גרסה 3 של ×”  License,  או (לבחירתך) כל גרסה מאוחרת יותר. ×ª×•×›× ×” זאת מופצת בתקווה שהיא תהיה שימושית, אבל ב
 לי שום התחייבות ; אפילו בלי ההתחייבות המרומזת של מסחריות או התאמה ×œ×›×•×•× ×” מסויימת. ראה  GNU General Public License ביחדעם  ×”×ª×•×›× ×” הזאת. אם לא, ראה <http://www.gnu.org/licenses/>\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "אם אתה רוצה ×©×× ×—× ×• × ×¦×¤×™×Ÿ הודעות כאשר ×× ×—× ×• ×¢×•× ×™× לך, הוסף את מפתח ×” ID, קישור למפתח שלך, או המפתח כמפתח ציבורי: "
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "סיכום"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "תיאור תקלה."
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "כתובת מייל אפשרית לתקשר איתך"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "מפתח PGP אפשרי"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "פרטים ×˜×›× ×™×™× שיכללו"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "כותרות"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "מידע על תיקון תקלות"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "כותרות"
+msgid "Help"
+msgstr "עזרה"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "מפתח PGP אפשרי"
+msgid "Send"
+msgstr "שלח"
diff --git a/hu/hu.po b/hu/hu.po
index 223ebfb..8dae4f1 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-10-07 16:21+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: vargaviktor <viktor.varga at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,85 +33,47 @@ msgstr "Érvénytelen OpenPGP key: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Érvénytelen OpenPGP publikus kulcs blokk"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Nem találhatók kulcsok."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "A %s változó nem található meg egy semelyik konfigurációs állományban a következő közül: /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Az érintett szoftver neve"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Pontos lépései a probléma reprodukálásának"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Az aktuális eredmény / a probléma"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Elvárt eredmény"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Nem lehetséges érvényes konfiguráció betöltése."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Segítsen a hibák kijavításában</h1>\n<p>Olvasas el a <a href=\"%s\">hibabejelentési tanácsainakt</a>.</p>\n<p><strong>Ne ajdon meg annál több személyes adatot, mint szükséges!</strong></p>\n<h2>Az email cím megadásáról</h2>\n<p>Ha nem gond a személyazonossága felfedése a Tails fejlesztői felé, megadhat email címet, hogy lehetővé tegye számukra, hogy további kérdéseket tegyenek fel a hibával kapcsolatosan. Ha megad egy publikus PGP kulcsot, az lehetővé teszi, hogy a levelezést titkosítva folytassuk.</p>\n<p>Bárki aki ezt a láthatja, azt gondolhatja egy Tails felhasználó. Elgondolkozott már azon, mennyire bízik meg az internet vagy az elektronikus levelezés szolgáltatójában?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Email küldése..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Email küldése"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Ez egy kis időt vehet igénybe..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Az email cím nem tűnik érvényesnek."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Sikertelen email küldés: SMTP hiba."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Nem lehetséges a kapcsolódás a szerverhez."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Az email létrehozása vagy küldése sikertelen."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -120,25 +82,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nA hibajelentés elküldése sikertelen, valószínűleg hálózati problémák miatt. Kérjük csatlakozzon újra a hálózathoz, majd kattintson a küldésre újra.\n\nHa ez nem működik, lehetősége lesz lementeni a hibajelentést."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Az üzenete elküldésre került."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "A titkosító kulcs nem található."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Hiba történt a titkosítás során."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "A %s mentése sikertelen."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -148,70 +106,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "A hibabejelentés nem volt elküldhető hálózati probléma miatt.\n\nKerülő lehetőségként lementheti a hibát egy  USB meghajtóra, elküldheti a %s címre, az email címéről, egy másik gépről. Fontos, hogy tudja, hogy eze esetben nem lesz névtelen a beküldése, csak akkor ha további lépéseket tesz. (Például: Tor-t egy eldobható email címmel együtt használva.)\n\nSzeretné lementeni a hibajelentést egy fájlba?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Visszajelzés küldése titkosított emailben."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails fejlesztők (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails fejlesztők <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "fordítás készítői"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Ez nem tűnik érvényes URL-nek, vagy OpenPGP kulcsnak."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Adja meg a PGP kulcsát, ha szeretné, hogy titkosítsuk a levelet amikor válaszolunk Önnek."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Hiba leírás"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Súgó"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Ha szeretné, hogy titkosítsuk a válasz amikor válaszolunk, adja meg a kulcs azonosítóját, egy linket a kulcshoz, vagy a kulcsot, mint egy publikus kulcs blokkot:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Opcionális email cím amin elérhető a kapcsolatfelvételhez"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Küldés"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Összefoglalás"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "A csatolandó technikai adatok"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -230,18 +157,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Visszajelzés küldése titkosított emailben\nCopyright (C) 2009-2012 Tails fejlesztők <tails at boum.org>\n\nEz a program szabad szoftver; terjesztheti és/vagy módosíthatja azt a  GNU General Public License szabályait betartva, mely licencet a Free Software Foundation készítette; a 3-as verziójú Licence vagy (választása szerint) későbbi változata alapján.\n\nEz a program annak reményében került terjesztésre, hogy hasznos lehet valakinek, de NINCS RÁ GARANCIA beleértve a beleértett garanciáit egy adott célra használatnak vagy közlésnek. További részletekért forduljon a  GNU General Public License-hez.\n\nA programhoz mellékelve kel találjon egy másolatát a  GNU General Public License-nek. Ha mégsem találja, tekintse meg a  <http://www.gnu.org/licenses/> oldalon.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Ha szeretné, hogy titkosítsuk a válasz amikor válaszolunk, adja meg a kulcs azonosítóját, egy linket a kulcshoz, vagy a kulcsot, mint egy publikus kulcs blokkot:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Összefoglalás"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Hiba leírás"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Opcionális email cím amin elérhető a kapcsolatfelvételhez"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "opcionális PGP kulcs"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "A csatolandó technikai adatok"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "fejlécek"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "hibakeresési info"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "fejlécek"
+msgid "Help"
+msgstr "Súgó"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "opcionális PGP kulcs"
+msgid "Send"
+msgstr "Küldés"
diff --git a/it/it.po b/it/it.po
index c080f4c..5b53b09 100644
--- a/it/it.po
+++ b/it/it.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-09-21 07:24+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: jan <jan.reister at unimi.it>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -36,85 +36,47 @@ msgstr "Chiave OpenPGP del contatto non valida: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Contatto invalido OpenPGP blocco chiave pubblico"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Nessuna chiave trovata."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "La variabile %s non è stata trovata in nessuna delle configurazioni files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Nome del software colpito"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Passi esatti per riprodurre il problema"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Risultato vero / il problema"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Risultato desiderato"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Impossibile caricare una configurazione valida."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Aiutaci a risolvere il tuo baco!</h1>\n<p>Leggi <a href=\"%s\">le istruzioni per segnalare bachi</a>.</p>\n<p><strong>Non inserire più informazioni personali di quelle strettamente necessarie!</strong></p>\n<h2>Fornirci un indirizzo email</h2>\n<p>Se vuoi rivelare qualcosa della tua identità agli sviluppatori di Tails, puoi darci un indirizzo email che ci permette di chiederti maggiori informazioni sul baco. Se aggiungi una chiave pubblica PGP potremo cifrare le comunicazioni future con te.</p>\n<p>Chiunque veda le nostre risposte potrebbe dedurre che usi Tails. Forse è il momento di chiedersi quanto ti fidi del tuo fonitore di accesso a Internet e di posta elettronica.</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Spedizione della mail ..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Spedizione della mail"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Ci vorrà un attimo..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "L'indirizzo di email del contatto non sembra valido."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Impossibile inviare mail: SMTP error."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Impossibile connettersi al server."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Impossibile creare o spedire la mail."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -123,25 +85,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nIl bug riportato non può essere inviato, probabilmente a causa di problemi di rete. Per favore prova a riconnettere la rete e clicca di nuovo per la spedizione.\n\nSe non funziona, ti verrà proposto di salvare il rapporto del bug."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Il tuo messaggio è stato spedito."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Impossibile trovare la chiave di codifica."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Un errore è avvenuto durante la codifica."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Impossibile salvare %s"
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -151,70 +109,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Il bug report non è stato inviato, forse a causa di problemi di rete.\n\nIn alternativa puoi salvare il  bug report come file su una chiavetta USB e cercare di inviarcelo a %s dal tuo account email usando un altro sistema. Attenzione però che così il tuo non sarà anonimo a meno chetu non prenda altre misure, come ad esempio usare Tor con un indirizzo email temporaneo.\n\nVuoi salvare il bug report su un file?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Manda il feedback in una mail codificata."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails developers (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Sviluppatori Tails <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "Accredito-traduttore"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Questo non sembra essere un URL valido o una chiave OpenPGP"
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Aggiungi una chiave PGP se vuoi codificare i messaggi quando ti rispondiamo."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Descrizione del bug"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Aiuto"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Se vuoi che ti rispondiamo con dei messaggi crittografati, aggiungi la tua chiave ID, un link alla tua chiave, oppure la chiave come blocco chiave pubblica."
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Indirizzo, opzionale, di email per contattarti"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Invia"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Sommario"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "I dettagli tecnici includono"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -233,18 +160,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Send feedback in an encrypted mail\nCopyright (C) 2009-2012 Tails developers <tails at boum.org>\n\nThis program is  free software; you can redistribute  it and/or modify\nit under the  terms of the GNU General Public  License as published by\nthe Free Software Foundation; either  version 3 of the License, or (at\nyour option) any later version.\n\nThis program  is distributed in the  hope that it will  be useful, but\nWITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of\nMERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Se vuoi che ti rispondiamo con dei messaggi crittografati, aggiungi la tua chiave ID, un link alla tua chiave, oppure la chiave come blocco chiave pubblica."
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Sommario"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Descrizione del bug"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Indirizzo, opzionale, di email per contattarti"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "chiave PGP opzionale"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "I dettagli tecnici includono"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "intestazioni"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "informazioni di debug"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "intestazioni"
+msgid "Help"
+msgstr "Aiuto"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "chiave PGP opzionale"
+msgid "Send"
+msgstr "Invia"
diff --git a/ja/ja.po b/ja/ja.po
index e891153..5e39cd3 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2013-01-22 18:29+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: brt <87 at itokei.info>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,85 +33,47 @@ msgstr ""
 msgid "Invalid contact OpenPGP public key block"
 msgstr ""
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr ""
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr ""
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr ""
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr ""
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr ""
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr ""
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr ""
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "メールを送信中..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr ""
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "これは時間がかかります..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "連絡先メールアドレスが有効なものではないようです。"
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "メールを送信出来ません: SMTP エラー。"
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "サーバーに接続できません。"
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "メールの作成、または送信ができません。"
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -120,25 +82,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr ""
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "あなたのメッセージは送信されました。"
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "暗号化キーを見つけることができません。"
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "暗号化中にエラーが発生しました。"
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr ""
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -148,70 +106,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr ""
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr ""
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "暗号化されたメールでフィードバックを送信する。"
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails デベロッパー <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr ""
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "これは有効な、URLまたはOpenPGP キーではないようです。"
-
-#: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr ""
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
 msgstr ""
 
-#: ../data/whisperback.ui.h:3
+#: ../data/whisperback.ui.h:1
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "ヘルプ"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr ""
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr ""
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "送信"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr ""
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr ""
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -230,18 +157,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr ""
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr ""
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr ""
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr ""
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr ""
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr ""
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "ヘッダー"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "ãƒ‡ãƒãƒƒã‚°æƒ…å ±"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "ヘッダー"
+msgid "Help"
+msgstr "ヘルプ"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr ""
+msgid "Send"
+msgstr "送信"
diff --git a/ko/ko.po b/ko/ko.po
index e04e9e3..fce1c78 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2013-03-22 23:53+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: sleepinium <lffs3659 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -35,85 +35,47 @@ msgstr "잘못된 연락처 OpenPGP 키: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "잘못된 연락처 OpenPGP 공증 키 차단"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "키를 찾을 수 없습니다."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "변수 %s을(를) configuation files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py에서 찾을 수 없습니다"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "영향을 받는 소프트웨어의 이름"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "ë¬¸ì œ 재현의 ì •í™•í•œ 단계"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "ì‹¤ì œ ê²°ê³¼ / ë¬¸ì œ"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "원하는 결과"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "올바른 ì„¤ì •ì„ 불러올 수 없습니다."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>버그를 찾을 수 있도록 도와주세요!</h1>\n<p>Read <a href=\"%s\">버그 ë³´ê³  ê³¼ì •</a>.</p>\n<p><strong>필요한 것 이상의 개인 ì •ë³´ë¥¼ 포함하지 마십시오!</strong></p>\n<h2>이메일 주소를 우리에게 주는 것에 대하여</h2>\n<p>만약 귀하의 ì‹ ì› 중 약간을 Tails 개발자에게 주는 것이 êº¼ë ¤ì§€ì§€ 않는다면, 귀하는 버그에 대한 더 많은 세부사항을 묻기 위해 이메일 주소를 ì œê³µí•  수 있습니다. 또한, 공개 PGP í†µì‹ ì€ 나중에 암호화 í†µì‹ ì„ í•  수 있게 í•´ 줍니다.</p>\n<p>이 답변을 ë³¼ 수 있는 사람들은 Tails 사용자로 ì¶”ì •ë©ë‹ˆë‹¤. 귀하가 인터넷과 메일박스 ì œê³µìžë¥¼ 얼마나 믿는지 ê¶ê¸ˆí•  시간입니까?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "메일 ì „ì†¡ 중..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "메일 ì „ì†¡ 중"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "다소 시간이 걸릴 수 있습니다..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "연락처 이메일 주소가 올바르지 않습니다."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "메일을 보낼 수 없습니다: SMPT 오류."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "서버에 ì—°ê²°í•  수 없습니다."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "메일을 작성하거나 보낼 수 없습니다."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -122,25 +84,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\n네트워크 ë¬¸ì œë¡œ 인해 버그 ë³´ê³ ì„œë¥¼ 보낼 수 없을 가능성이 있습니다. 네트워크를 다시 ì—°ê²°í•˜ê³  다시 보내기를 시도하여 보십시오.\n\n작동하지 않는 경우, 버그 ë³´ê³ ì„œë¥¼ ì €ìž¥í•˜ì‹­ì‹œì˜¤.  "
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "메시지를 보냈습니다."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "암호화 키를 찾을 수 없습니다."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "암호화하는 동안 오류가 발생했습니다."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "%s을(를) ì €ìž¥í•  수 없습니다."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -150,70 +108,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "네트워크 ë¬¸ì œë¡œ 인해 버그 ë³´ê³ ì„œë¥¼ 보낼 수 없을 가능성이 있습니다.\n\n버그 ë³´ê³ ì„œë¥¼ 파일로 USB 드라이브에 ì €ìž¥í•˜ì—¬ 다른 시스템을 사용하여 %s를 우리에게 보낼 수 있습니다. ì°¸ê³ : 추가 단계를 취하지 않으면 귀하의 버그 ë³´ê³ ì„œëŠ” 익명으로 처리되지 않습니다.\n(예, 이메일 ê³„ì •ìœ¼ë¡œ í† ë¥´ë¥¼ 사용하지 않는 경우)\n\n버그 ë³´ê³ ì„œë¥¼ 파일로 ì €ìž¥í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "암호화된 메일로 피드백을 보냅니다."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails developers <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "번역-ì €ìž‘ìž"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "URL 또는 OpenPGP 키가 ìœ íš¨í•˜ì§€ 않은 것 같습니다."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "우리가 ë‹¹ì‹ ì—ê²Œ ì‘ë‹µí•  ë•Œ 우리는 메시지를 ì•”í˜¸í™”í•  수 있는 PGP 키를 추가합니다."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "버그 설명"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "도움말"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "우리가 ë‹¹ì‹ ì—ê²Œ ì‘ë‹µí•  ë•Œ 우리는 메시지를 ì•”í˜¸í™”í•  수 있는 귀하의 키 ID, 공개 키 블록과 같은 키에 대한 링크나 키를 추가합니다."
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "연락 가능한 이메일 주소 (옵션)"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "보내기"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "요약"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "ê¸°ìˆ ì ì¸ 세부 사항 포함"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -232,18 +159,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - 피드백을 암호화된 메일로 보낼수 있습니다.\nCopyright (C) 2009-2012 Tails developers <tails at boum.org>\n\n이 프로그램은 ìžìœ  소프트웨어입니다. 귀하는 이 프로그램을 ìžìœ  소프트웨어 재단에서 발행한 GNU General Public License ë²„ì „ 3이나 ê·¸ 이후의 ë²„ì „ìœ¼ë¡œ 기여, 재생산, 배포 í•  수 있습니다.\n\nThis program  is distributed in the  hope that it will  be useful, but\nWITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of\nMERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "우리가 ë‹¹ì‹ ì—ê²Œ ì‘ë‹µí•  ë•Œ 우리는 메시지를 ì•”í˜¸í™”í•  수 있는 귀하의 키 ID, 공개 키 블록과 같은 키에 대한 링크나 키를 추가합니다."
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "요약"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "버그 설명"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "연락 가능한 이메일 주소 (옵션)"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "ë¶€ê°€ì ì¸ PGP 키"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "ê¸°ìˆ ì ì¸ 세부 사항 포함"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "헤더"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "디버깅 ì •ë³´"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "헤더"
+msgid "Help"
+msgstr "도움말"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "ë¶€ê°€ì ì¸ PGP 키"
+msgid "Send"
+msgstr "보내기"
diff --git a/lv/lv.po b/lv/lv.po
index a90397f..5eee72f 100644
--- a/lv/lv.po
+++ b/lv/lv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-12-04 16:16+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: Ojars Balcers <ojars.balcers at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,85 +33,47 @@ msgstr "Nederīga saziņas OpenPGP atslēga: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Nederīgs saziņas OpenPGP publiskās atslēgas bloks"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Atslēgas netika atrastas."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "Mainīgais %s netika atrasts nevienā no konfigurācijas datnēm/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Ietekmētās programatūras nosaukums"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Precīzi soļi problēmas atkārtotai izraisīšanai"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Faktiskais rezultāts / problēma"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Vēlamais rezultāts"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Nespēj ielādēt derīgu konfigurāciju."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Palīdziet mums atrisināt Jūsu problēmu!</h1>\n<p>Lasiet <a href=\"%s\">mūsu kļūdu pieteikšanas instrukcijas</a>.</p>\n<p><strong>Nenorādiet vairāk personiskas informācijas kā nepieciešamas!</strong></p>\n<h2>Par e-pasta adreses norādīšanu</h2>\n<p>Ja neiebilstat atklāt daļu no savas identitātes Tails izstrādātājiem, variet norādīt savu e-pasta adresi,lai mē varētu uzdot vairāk jautājumus par kļūdu. Turklāt publiskas PGP atslēgas norādīšana sniegtu mums iespēju šifrēt mūsu turpmāko saziņu.</p>\n<p>Ikviens, kas var redzēt šo atbildi, tā varētu domāt, uzskatīs Jūs par Tails lietotāju. Varbūt ir pienācis laiks izvērtēt cik daudz Jūs uzticaties saviem interneta un e-pasta pakalpojumu sniedzējiem?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "SÅ«ta e-pastu..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "SÅ«ta e-pastu"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Tas varētu aizņemt kādu brītiņu..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Šķiet, ka saziņas e-pasta adrese nav derīga."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Nespēj nosūtīt e-pastu: SMTP kļūda."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Nespēj izveidot savienojumu ar serveri."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Nespēj izveidot vai nosūtīt e-pastu."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -120,25 +82,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nKļūdu ziņojumu nebija iespējams nosūtīt, ticami, ar tīklu saistītu kļūmju dēļ. Lūdzu, mēģiniet atkārtoti pievienoties tīklam un nospiediet SŪTĪT vēlreiz.\n\nJa tas nelīdzēs, tiks piedāvāts saglabāt kļūdu ziņojumu."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Jūsu vēstījums ir nosūtīts."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Nespēj atrast šifrēšanas atslēgu."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Šifrēšanas laikā notika kļūda."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Nespēj saglabāt %s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -148,70 +106,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Kļūdu ziņojumu nebija iespējams nosūtīt, ticami, ar tīklu saistītu kļūmju dēļ.\n\nAizstājējrisinājums ir saglabāt kļūdu ziņojumu datnē vai zibatmiņā jeb USB diskā, tad mēģināt nosūtīt ziņojumu mums uz %s no sava e-pasta, bet izmantojot citu sistēmu. Ievērojiet, ka tā darot kļūdu ziņojums nebūs anonīms, ja vien pats neveiksit atbilstīgus pasākumus (piem., lietot Tor ar citādi nelietojamu e-pastu).\n\nVai vēlaties saglabāt kļūdu ziņojumu datnē?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Sūtīt atsauksmes šifrētā e-pastā."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Autortiesības © 2009-2012 Tails developpers (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails izstrādātāji <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "tulkotāji"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Šķiet, ka šie nav derīgi URL vai OpenPGP atslēga."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Pievienot PGP atslēgu, ja vēlaties, lai atbildot šifrējam ziņojumus."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Kļūdas apraksts"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Autortiesības © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Palīdzība"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Ja vēlaties, lai atbildot šifrējam ziņojumus, pievienojiet savu atslēgas ID, saiti uz savu atslēgu, vai atslēgu kā publisku atslēgu bloku:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Neobligāta e-pasta adrese saziņai ar Jums"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Nosūtīt"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Kopsavilkums"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Iekļaujamā tehniskā informācija"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -230,18 +157,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - sūtīt atsauksmes šifrētā e-pastā\nAutortiesības (C) 2009-2012 Tails izstrādātāji <tails at boum.org>\n\nŠī programma ir bezmaksas programmatūra; variet to izplatīt un/vai modificēt\nievērojot GNU Vispārējas publiskas licences noteikumus, kurus publicējis Brīvas programmatūras fonds; vai nu Licences 3. versiju, vai arī (pēc savas izvēles) jebkuru vēlāku versiju.\n\nŠo programmatūru izplata cerot, ka tā būs derīga, tomēr \nBEZ NEKĀDĀM GARANTIJĀM;   pat bez tieši nenolīgtām TIRDZNIECĪBAS garantījām  vai t.s. PIEMĒROTĪBAS NOTEIKTAM NOLŪKAM.   Papildu informācijai lūdzu skatiet GNU Vispārējo publisko licenci.\n\nKopā ar šo programmu Jums vajadzēja saņemt GNU Vispārējās publiskās licences kopiju.  Ja tas tā nav, skatiet <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Ja vēlaties, lai atbildot šifrējam ziņojumus, pievienojiet savu atslēgas ID, saiti uz savu atslēgu, vai atslēgu kā publisku atslēgu bloku:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Kopsavilkums"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Kļūdas apraksts"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Neobligāta e-pasta adrese saziņai ar Jums"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "neobligāta PGP atslēga"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Iekļaujamā tehniskā informācija"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "galvenes"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "atkļūdošanas informācija"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "galvenes"
+msgid "Help"
+msgstr "Palīdzība"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "neobligāta PGP atslēga"
+msgid "Send"
+msgstr "Nosūtīt"
diff --git a/nl/nl.po b/nl/nl.po
index d88f1f2..2ccfe79 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-09-25 23:18+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: unknown365 <unknown365 at hotmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -36,85 +36,47 @@ msgstr "Ongeldige contact OpenPGP sleutel: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Ongeldige contact OpenPGP publieke sleutelblok"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Geen sleutels gevonden."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "De variabele %s was niet gevonden in enig configuratie bestand. /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Naam van betreffende software"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Exacte stappen om het probleem te reproduceren"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Daadwerkelijke resultaat / het probleem"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Gewenste resultaat"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Kan geen geldige configuratie inladen."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Help ons jouw bugs te fixen!</h1>\n<p>Lees <a href=\"%s\">onze handleiding voor het melden van fouten</a>.</p>\n<p><strong>Voeg niet meer persoonlijke informatie toe dan nodig!</strong></p>\n<h2>Over het opgeven van een e-mailadres</h2>\n<p>Als je het niet erg vindt om iets een beetje van je identiteit af te staan, dan kun je een e-mailadres opgeven zodat wij meer details over de fout kunnen vragen. Bovendien, door het toevoegen van een publieke PGP sleutel stel je ons in staat om zulke toekomstige communicatie te versleutelen.</p>\n<p>Iedereen die ons antwoordbericht kan zien zal waarschijnlijk kunnen afleiden dat je een Tails gebruiker bent. Tijd om je af te vragen hoeveel je je Internet- en mailprovider vertrouwd?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Bezig met mail versturen..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Bezig met mail versturen"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Dit kan enige tijd duren..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Het contact e-mailadres lijkt niet geldig."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Kan mail niet versturen: SMTP fout."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Kan niet verbinden met de server."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Kan mail niet aanmaken of versturen."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -123,25 +85,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nDe foutrapportage kon niet worden verstuurd, waarschijnlijk door netwerkproblemen. Probeer opnieuw verbinding te maken met het netwerk en probeer het opnieuw.\n\nAls dit niet werkt wordt je aangeboden om de foutrapportage op te slaan."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Je bericht is verstuurd."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Kan encryptiesleutel niet vinden."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Er is een fout opgetreden tijdens het versleutelen"
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Kan %s niet opslaan."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -151,70 +109,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "De foutrapportage kon niet worden verstuurd, waarschijnlijk door netwerkproblemen.\n\nAls een tijdelijke oplossing kun je de foutrapportage opslaan op een USB-drive en het proberen te versturen naar ons op %s via jouw e-mailaccount op een ander systeem. Let wel op dat je foutrapportage niet anoniem zal zijn wanneer je dit doet, tenzij je zelf verdere stappen onderneemt (bijv. gebruik maken van Tor een een wegwerp-e-mailaccount.)\n\nWil je de foutrapportage opslaan als een bestand?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Stuur feedback in een versleutelde mail."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails-ontwikkelaars (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails ontwikkelaars <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "vertaler credits"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Dit lijkt geen geldige URL of OpenPGP sleutel te zijn."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Voeg een PGP sleutel toe als je wilt dat wij onze berichten versleutelen wanneer we jou een antwoord sturen."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Foutomschrijving"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Help"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Als je wilt dat wij onze berichten versleutelen wanneer we jou antwoorden, voeg je sleutel ID, een link naar je sleutel of de sleutel als een publieke sleutelblok"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Optioneel e-mailadres om met jou contact op te nemen"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Verstuur"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Technische details om bij te voegen"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -233,18 +160,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Stuur terugkoppeling in een versleutelde email.\nCopyright (C) 2009-2012 Tails ontwikkelaars <tail at boum.org>\n\nDit programma is vrije programmatuur; u kan het verspreiden en/of aanpassen\nonder de voorwaarden van de GNU General Public License zoals gepubliceerd door\nThe Free Software Foundation; ofwel versie 3 van de Licentie, of (naar\nuw keuze) elke latere versie.\n\nDit programma wordt gedistribueerd in de hoop dat het nuttig zal zijn, maar\nZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie van\nVERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU\nGeneral Public License voor meer details.\n\nU heeft een kopie moeten ontvangen van de GNU General Public License samen met dit programma. Zo niet, zie <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Als je wilt dat wij onze berichten versleutelen wanneer we jou antwoorden, voeg je sleutel ID, een link naar je sleutel of de sleutel als een publieke sleutelblok"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Samenvatting"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Foutomschrijving"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Optioneel e-mailadres om met jou contact op te nemen"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "optionele PGP sleutel"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Technische details om bij te voegen"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "headers"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "debug info"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "headers"
+msgid "Help"
+msgstr "Help"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "optionele PGP sleutel"
+msgid "Send"
+msgstr "Verstuur"
diff --git a/pl/pl.po b/pl/pl.po
index 13102b1..3f7e28b 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2013-01-30 20:18+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: Quaithe <ewa.infeld at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,85 +34,47 @@ msgstr "BÅ‚edny klucz OpenPGP: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "BÅ‚edny klucz publiczny OpenPGP."
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Nie znaleziono klucza."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "Zmienna %s nie została znaleziona w konfiguracji files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Nazwa programu z którym jest problem"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Dokładna instrucja jak zrekonstruować problem"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Rezultat/problem"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Pożądany rezultat"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Nie udało się zaladować dzialającej konfiguracji."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Pomóż nam naprawić swój problem!</h1>⏎ <p>Przeczytaj <a href=\"%s\">instrukcje jak zgłosić problem</a>.</p>⏎ <p><strong>Nie ujawniaj wiecej informacji o sobie niż to \nkonieczne!</strong></p>⏎ <h2>Jeżeli chcesz podac adres email</h2>\n<p>Jeżeli zgadzasz sie na częściowe ujawnienie swojej tożsamości\ndeweloperom Tails, możesz podac adres email\nżebysmy mogli zadawać Ci pytania dotyczące problemu. Ponadto, jeżeli podasz\nklucz publiczny PGP umożliwisz nam szyfrowanie tego typu \nkomunikacji.</p>\n<p>Kazdy kto zobaczy ta odpowiedx domyśli się, że jesteś\nurzytkownijiem Tails. Zastanow sie czy ufasz swoim operattorom\nintenetu i poczty.</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Wysyłanie..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Wysyłanie"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "To może chwilę potrwać..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Adres email wygląda na błędny."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Nie można wysłać poczty: błąd SMTP."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Nie można połączyc się z serwerem."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Nie można utworzyc lub wysłać poczty."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -121,25 +83,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nNie można wysłać zawiadomienia o błędzie, prawdopodobnie przez problemy z siecią. Postaraj sie połączyć z siecią ponownie i kliknąć wyślij. \n\nJeżeli to nie zadziała, będziesz miał(a) mozliwość zachowania raportu o błędzie."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Wiadomość została wysłana."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Nie można znaleźć klucza szyfrowania."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Wystąpił błąd podczas szyfrowania."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Nie można zapisać %s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -149,70 +107,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Nie można wysłać komunikatu o błędzie, prawdopodobnie ze wzgęldu na problemy z siecią.\n\nAby to obejść, możesz zapisać raport o błędzie jako plik na dysku USB i spróbować wyslać go z twojego konta email na %s używając innego systemu. Pamiętaj, że w ten sposób Twój raport nie będzie anonimowy, chyba że postarasz sie aby był (na przyklad uzywając Tor z jednorazowym kontem email).\n\nCzy chcesz zapisać raport błędu jako plik?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Wyślij nam Swoje uwagi w zaszyfrowanym emailu."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 deweloperzy Tails (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Deweloperzy Tails <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "tłumaczenie"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "URL lub klucz OpenPGP wydaje się błędny."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Dodaj klucz PGP jeżeli chcesz aby nasza odpowiedź była zaszyfrowana."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Opis błędu"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Pomoc"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Jeżeli chcesz, żeby nasza odpowiedź była zaszyfrowana, podaj identyfikator Twojego klucza, link do klucza lub klucz publiczny:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "(Opcjonalne) Adres email pod którym można sie z Toba skontaktować:"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Wyslij"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Podsumowanie"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Szczegóły techniczne do zawarcia"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -231,18 +158,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Wyślij opinię w zaszywrowanym emailu\nCopyright (C) 2009-2012 deweloperzy Tails <tails at boum.org>\n\nTen program jest darmowy, może byc kopiowany i modyfikowany\nwedług wytycznych GNU general Public License opublikowanych przez\nFree Software Foundation; wersja trzecia licencji lub dowolna późniejsza.\n\nRozpowszechniając ten program, mamy nadzieje że będzie on przydatny lecz\nBEZ ŻADNEJ GWARANCJI; bez nawet domniemanej gwarancji\nPRZYDATNOŚCI HANDLOWEJ lub SPELNIANIA KONKRETYCH FUNKCJI. Szczegóły dostępne w GNU\nGeneral Public License.\n\nPowinienes byl otrzymac egzemplarz GNU General Public License razem z kopia programu. Jezeli tak sie nie stało, odwolaj sie do <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Jeżeli chcesz, żeby nasza odpowiedź była zaszyfrowana, podaj identyfikator Twojego klucza, link do klucza lub klucz publiczny:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Podsumowanie"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Opis błędu"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "(Opcjonalne) Adres email pod którym można sie z Toba skontaktować:"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "(opcjonalne) klucz PGP"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Szczegóły techniczne do zawarcia"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "Nagłówki"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "Informacje o debugowaniu"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "Nagłówki"
+msgid "Help"
+msgstr "Pomoc"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "(opcjonalne) klucz PGP"
+msgid "Send"
+msgstr "Wyslij"
diff --git a/pl_PL/pl_PL.po b/pl_PL/pl_PL.po
index 352b1a6..290f131 100644
--- a/pl_PL/pl_PL.po
+++ b/pl_PL/pl_PL.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-08-25 10:47+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. XXX use a better exception
 #: ../whisperBack/whisperback.py:63
@@ -33,85 +33,47 @@ msgstr "Nieprawidłowy kontaktowy klucz OpenPGP: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Nieprawidłowy blok kontaktowego publicznego klucza OpenPGP"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Nie znaleziono kluczy."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "Zmienna %s nie została znelziona w żadnym pliku konfiguracyjnym /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Nazwa oprogramowania"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Dokłądne kroki do powtórzenia problemu"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Bieżący wynik / problem"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Pożądany wynik"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Nie mogę załadować żadnej prawidłowej konfiguracji"
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Pomóż nam naprawić Twój problem!</h1>\n<p>Przeczytaj <a href=\"%s\">nasze instrukcje zgłaszania błędów</a>.</p>\n<p><strong>Nie zawieraj więcej informacji osobistych, niż to jest\nkonieczne!</strong></p>\n<h2>O dawaniu nam adresu email</h2>\n<p>Jeśli nie masz nic przeciw podaniu części swojej tożsamości\ndeweloperom Tails, możesz podać adres email, by pozwolić nam\ndopytać się o szczegóły błędy. Dodatkowo, podawnie publicznego\nklucza PGP pozwala nam szyfrować taką przyszłą\nkomunikację.</p>\n<p>Każdy, kto widzi tę odpowiedź, prawdopodobnie wywnioskuje, że jesteś\nużytkownikiem Tails. Czas zastanowić się, jak bardzo ufasz swoim dostawcom\nInternetu i poczty?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Wysyłam pocztę..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Wysyłam pocztę"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "To może chwilę potrwać..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Adres kontaktowy zdaje się być niepoprawny."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Nie mogę wysłąć pocztY: błąd SMTP."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Nie mogę połączyć się z serwerem."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Nie mogę stworzyć lub wysłąć listu."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -120,25 +82,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nRaport o błądzie nie mógł zostać wysłany, prawdopodobnie przez problemy z siecią. Proszę spróbować ponownie połączyć się z siecią i ponownie kliknąć wyślij.\n\nJeśli to nie pomoże, będzie można zapisać raport o błędzie."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Twoja wiadomość została wysłana."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Nie mogę znaleźć klucza szyfrowania."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Podczas szyfrowania wystąpił błąd."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Nie mogę zapisać %s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -148,70 +106,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Raport o błądzie nie mógł zostać wysłany, prawdopodobnie przez problemy z siecią.\n\nW zamian możesz zapisać raport o błędzie jako plik na dysku USB i spróbować wysłać go nam na adres %s ze swojego konta pocztowego z innego systemu. Twój raport o bęłdzie nie będzie anonimowy, gdy tak zrobisz, chyba że podejmiesz dalsze kroki (np. używając Tora z jednorazową skrzynką email).\n\nCzy chcesz zapisać raport o błędzie do pliku?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Wyślij informacje w szyfrowanej poczcie."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 deweloperzy Tails (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Deweloperzy Tails <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "To nie wyglÄ…da na poprawny adres URL lub plik OpenPGP."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Dodaj klucz PGP, jeśli chcesz, abyśmy szyfrowali wiadomości, gdy Ci odpowiemy."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Opis błędu"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Pomoc"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Jeśli chcesz, abyśmy szyfrowali wiadomości, gdy Ci odpowiem, dodaj ID swojego klucza, link do swojego klucza, lub sam klucz jako blok klucza publicznego:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Opcjonalny adres email do skontaktowania siÄ™ z TobÄ…"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Wyślij"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Podsumowanie"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Szcegóły techniczne do załączenia"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -230,18 +157,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - wysyłaj informacje zwrotne zaszyfrowaną pocztą\nCopyright © 2009-2012 deweloperzy Tails (tails at boum.org)\nNiniejszy program jest wolnym oprogramowaniem; możesz go\nrozprowadzać dalej i/lub modyfikować na warunkach Powszechnej\nLicencji Publicznej GNU, wydanej przez Fundację Wolnego\nOprogramowania - według wersji 3-ciej tej Licencji lub którejś\nz późniejszych wersji.\n\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on\nużyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej\ngwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH\nZASTOSOWAŃ. W celu uzyskania bliższych informacji - Powszechna\nLicencja Publiczna GNU.\n\nZ pewnością wraz z niniejszym programem otrzymałeś też egzemplarz\nPowszechnej Licencji Publicznej GNU (GNU General Public License);\njeśli nie - zajrzyj na <http://www.gnu.org/licenses/>.\n\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Jeśli chcesz, abyśmy szyfrowali wiadomości, gdy Ci odpowiem, dodaj ID swojego klucza, link do swojego klucza, lub sam klucz jako blok klucza publicznego:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Podsumowanie"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Opis błędu"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Opcjonalny adres email do skontaktowania siÄ™ z TobÄ…"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "opcjonalny klucz PGP"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Szcegóły techniczne do załączenia"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "nagłówki"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "informacje debugowania"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "nagłówki"
+msgid "Help"
+msgstr "Pomoc"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "opcjonalny klucz PGP"
+msgid "Send"
+msgstr "Wyślij"
diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index cb98f84..45b82ad 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-12-10 01:26+0000\n"
-"Last-Translator: bruuh <geronimo.bruno at gmail.com>\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
+"Last-Translator: bruuh <bruuh at outlook.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,85 +34,47 @@ msgstr "Chave OpenPGP de contato inválida: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Bloco de chave pública OpenPGP de contato inválida"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Nenhuma chave encontrada."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "A variável %s não foi encontrada em nenhuma configuração files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Nome do software afetado"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Passos exatos para reproduzir o problema"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Resultado atual / o problema"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Resultado desejado"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Habilitar carregar uma configuração válida"
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Ajude-nos a consertar seu bug!</h1>\n<p>Leia <a href=\"%s\">nossas instruções para reportar bug</a>.</p>\n<p><strong>Não inclua mais informações pessoais do que o necessário!</strong></p>\n<h2>Sobre dar-nos um endereço de e-mail</h2>\n<p>Se você não se importa em abrir um pouco da sua identidade\naos desenvolvedores Tails, você pode prover um email para contar-nos\nmais detalhes sobre o bug. Adicionalmente, entrando uma chave PGP\npública, nos permite encriptar futuras comunicações via e-mail.</p>\n<p>Qualquer um que puder ver esta resposta provavelmente deduzirá\nque você é um usuário Tails. Tempo para pensar o quanto você confia\nna sua internet e no seu provedor de e-mail?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Enviando e-mail..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Enviando e-mail"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Isto pode levar um tempo..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "O e-mail de contato não parece ser válido"
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Habilitar enviar o e-mail: erro SMTP."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Habilitar conectar ao servidor."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Habilitar criar ou enviar o e-mail."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -121,25 +83,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nO report do bug não pode ser enviado, provavelmente por problemas de rede. Por favor, tente reconectar à rede e clique em enviar novamente.\n\nSe isto não funcionar, será oferecido a você salvar o report do bug."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Sua mensagem está sendo enviada."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Habilitar encontrar a chave de encriptação."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Um erro ocorreu durante a encriptação."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Habilitar salvar %s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -149,70 +107,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "O report do bug não pode ser enviado, provavelmente devido à problemas na rede.\n\nVocê pode salvar o report como um arquivo em um drive USB e tentar enviar-nos em %s de sua conta de e-mail usando outro sistema. Note que seu report de bug não será anônimo ao fazer isto, a não ser que você faça-o por conta própria (ex. usando Tor com uma conta de e-mail descartável).\n\nVocê quer salvar o report para um arquivo? "
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Enviar feedback em um e-mail encriptado"
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails developers (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails developers <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "créditos de tradução"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Isto não parece ser uma URL válida ou uma chave OpenPGP."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Adicione uma chave PGP se você quiser que nós encriptemos as mensagens de resposta à você."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Descrição do Bug"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Ajuda"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Se você quiser que nós encriptemos as mensagens quando respondermos à você, adicione sua chave ID, um link para sua chave, ou a chave como um bloco de chave pública:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "E-mail opcional para contatarmos você"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Envio"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Resumo"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Detalhes técnicos para incluir"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -231,18 +158,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Envie feedback em um email encriptado\nCopyright (C) 2009-2011 Tails developers <tails at boum.org>\n\nEste programa é  software livre; você pode redistribuir  e/ou modificá-lo\nsobre os  termos da Licença Pública  Geral GNU como publicado pela\nFree Software Foundation;  versão 3 da Licença, ou (sob\nsua opção) qualquer versão mais recente.\n\nEste programa  é distribuído na  na esperança de que será  útil, mas\nSEM   QUALQUER  GARANTIA;   sem  nem   a  garantia   implícita  de\nCOMERCIALIZAÇÃO  ou ADEQUAÇÃO  PARA UM  PROPÓSITO PARTICULAR.   Veja  a Licença Pública Geral GNU para maiores detalhes.\n\nVocê deve ter recebido uma cópia da Licença Pública Geral GNU\njunto com este programa.  Caso contrário, veja <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Se você quiser que nós encriptemos as mensagens quando respondermos à você, adicione sua chave ID, um link para sua chave, ou a chave como um bloco de chave pública:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Resumo"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Descrição do Bug"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "E-mail opcional para contatarmos você"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "chave PGP opcional"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Detalhes técnicos para incluir"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "cabeçalhos"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "informação de debug"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "cabeçalhos"
+msgid "Help"
+msgstr "Ajuda"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "chave PGP opcional"
+msgid "Send"
+msgstr "Envio"
diff --git a/ru/ru.po b/ru/ru.po
index c21ffc1..7149900 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2013-03-03 10:16+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: tavarysh <tavarysh at riseup.net>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -34,85 +34,47 @@ msgstr "Неверный контактный ключ OpenPGP: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Неверный контактный блок публичного ключа OpenPGP"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Ключи не найдены."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "Переменная %s не была найдена ни в одном файле конфигурации files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Наименование затронутого ПО"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Точные шаги для воспроизведения проблемы"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Действительный результат / проблема"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Желаемый результат"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Не могу загрузить верную конфигурацию."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Помогите нам исправить эту ошибку!</h1>\n<p>Прочтите <a href=\"%s\">наши инструкции отправки отчета об ошибке</a>.</p>\n<p><strong>Не включайте больше персональной информации чем\nтребуется!</strong></p>\n<h2>На счет сообщения нам вашего e-mail адреса</h2>\n<p>Если вы не возражаете раскрыть немного вашей личности\nразработчикам Tails, вы можете предоставить e-mail адрес, что бы\nпозволить нам запросить больше информации об ошибке. Дополнительный ввод\nпубличного ключа PGP позволит нам шифровать эту будущую\nпереписку.</p>\n<p>Кто-либо, кто может видеть этот ответ возможно 
 сделает вывод, что вы\nпользователь Tails. Время поинтересоваться на сколько вы доверяете вашим\nИнтернет и E-mail провайдерам?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Отправка почты..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Отправка почты"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Это может занять некоторое время..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Контактный e-mail не похож на правильный."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Не могу отправить письмо: ошибка SMTP."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Не могу соединиться с сервером."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Не могу создать или отправить письмо."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -121,25 +83,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nОтчет об ошибке не может быть отправлен, похоже из-за проблем с сетью. Пожалуйста, попробуйте переподключиться к сети и нажать отправить снова.\n\nЕсли это не работает, вам будет предложено сохранить отчет об ошибке."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Ваше сообщение отправлено."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Не могу найти ключ шифрования."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Произошла ошибка во время шифрования."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Не могу сохранить %s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -149,70 +107,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Отчет об ошибке не может быть отправлен, возможно в связи с проблемами с сетью.\n\nКак временное решение вы можете сохранить отчет об ошибке в файл на флешку и попытаться отправить его нам в %s с вашего почтового ящика, используя другой компьютер. Заметьте, что ваш отчет об ошибке не будет анонимным если так сделать, если вы не примите следующие меры самостоятельно (например используя Tor вместе с одноразовым почтовым ящиком).\n\nХотите сохранить отчет об ошибке в файл?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Отправить сообщение в зашифрованном письме."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails developers (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Разработчики Tails <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "переводчики"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Не похоже что это правильный URL или OpenPGP ключ."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Добавьте ключ PGP, если вы хотите что бы мы шифровали сообщения отвечая вам."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Описание ошибки"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Помощь"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "Если вы хотите, что бы мы шифровали сообщения, отвечая вам, добавьте ID вашего ключа, ссылку на ваш ключ или ключ в виде блока открытого ключа:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Дополнительный e-mail адрес для связи с вами"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Отправить"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Итог"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Технические подробности для предоставления"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -231,18 +158,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Прислать отзыв в зашифрованном письме⏎ Copyright (C) 2009-2012 Tails developers <tails at boum.org>⏎ ⏎ Это свободное программное обеспечение; вы можете распространять или модифицировать его⏎ при соблюдении условий GNU General Public License, опубликованной⏎ Free Software Foundation - версии 3 и выше.⏎ ⏎ Эта программа разработана с надеждой на то, что она будет полезна,⏎ однако, БЕЗ ВСЯКОЙ ГАРАНТИИ то, что⏎ она может иметь коммерческое применение или быть пригодной для определенных целей. Больше информации вы найдете в лицензии GNU⏎ General Public License.⏎ ⏎ Вместе с этой програмÐ
 ¼Ð¾Ð¹ вы получите копию лицензии GNU General Public License.⏎ Если этого не произошло, смотрите <http://www.gnu.org/licenses/>.⏎\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "Если вы хотите, что бы мы шифровали сообщения, отвечая вам, добавьте ID вашего ключа, ссылку на ваш ключ или ключ в виде блока открытого ключа:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Итог"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Описание ошибки"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Дополнительный e-mail адрес для связи с вами"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "опциональный ключ PGP"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Технические подробности для предоставления"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "заголовки"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "информация об отладке"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "заголовки"
+msgid "Help"
+msgstr "Помощь"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "опциональный ключ PGP"
+msgid "Send"
+msgstr "Отправить"
diff --git a/sr/sr.po b/sr/sr.po
index 4cb1481..0b7fa44 100644
--- a/sr/sr.po
+++ b/sr/sr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2013-01-22 00:36+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: mahavidyas <mahavidyas at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,85 +33,47 @@ msgstr "неисправан контакт OpenPGP кључ: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "неисправан контакт блок OpenPGP јавног кључа"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "Нема пронађених кључева."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "Променљива %s није пронађена међу конфигурационим датотекама/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 msgstr ""
 
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr ""
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Стварни исход / проблем"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Жељени исход"
-
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Није могуће учитати исправно подешавање."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr ""
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Шаљем мејл..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Шаљем мејл"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "Ово може да потраје..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "Контакт емаил адреса делује неисправно."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Није могуће послати мејл: SMTP грешка"
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Није могуће повезати се са сервером."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Није могуће креирати или послати мејл."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -120,25 +82,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr ""
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Ваша порука је послата."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Није могуће пронаћи кључ за енкрипцију."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "Дошло је до грешке током енкрипције."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Није могуће снимити %s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -148,70 +106,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr ""
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr ""
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr ""
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr ""
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "Ово не делује као исправан URL или OpenPGP кључ."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Додајте PGP кључ ако желите да енкриптујемо поруке када вам будемо одговарали."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
+msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr ""
 
 #: ../data/whisperback.ui.h:3
-msgid "Copyright © 2009-2012 tails at boum.org"
-msgstr ""
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
 #: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Помоћ"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr ""
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr ""
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Пошаљи"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr ""
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr ""
-
-#: ../data/whisperback.ui.h:12
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -230,18 +157,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
-#: ../data/whisperback.ui.h:28
-msgid "debugging info"
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
 msgstr ""
 
-#: ../data/whisperback.ui.h:29
-msgid "headers"
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
 msgstr ""
 
-#: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr ""
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr ""
 
-#: ../data/whisperback.ui.h:31
+#: ../data/whisperback.ui.h:25
 msgid "optional PGP key"
 msgstr ""
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr ""
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr ""
+
+#: ../data/whisperback.ui.h:28
+msgid "debugging info"
+msgstr ""
+
+#: ../data/whisperback.ui.h:29
+msgid "Help"
+msgstr "Помоћ"
+
+#: ../data/whisperback.ui.h:30
+msgid "Send"
+msgstr "Пошаљи"
diff --git a/templates/whisperback.pot b/templates/whisperback.pot
index 612c220..4b2f93d 100644
--- a/templates/whisperback.pot
+++ b/templates/whisperback.pot
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-08-16 09:20+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. XXX use a better exception
 #: ../whisperBack/whisperback.py:63
@@ -32,85 +32,47 @@ msgstr "Invalid contact OpenPGP key: %s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "Invalid contact OpenPGP public key block"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "No keys found."
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "The variable %s was not found in any of the configuation files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "Name of the affected software"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "Exact steps to reproduce the problem"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "Actual result / the problem"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "Desired result"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr "The %s variable was not found in any of the configuration files /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "Unable to load a valid configuration."
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Help us fix your bug!</h1>\n<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n<p><strong>Do not include more personal information than\nneeded!</strong></p>\n<h2>About giving us an email address</h2>\n<p>If you don't mind disclosing some bits of your identity\nto Tails developers, you can provide an email address to\nlet us ask more details about the bug. Additionally entering\na public PGP key enables us to encrypt such future\ncommunication.</p>\n<p>Anyone who can see this reply will probably infer you are\na Tails user. Time to wonder how much you trust your\nInternet and mailbox providers?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "Sending mail..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "Sending mail"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "This could take a while..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "The contact email adress doesn't seem valid."
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "Unable to send the mail: SMTP error."
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "Unable to connect to the server."
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "Unable to create or to send the mail."
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -119,25 +81,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nThe bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n\nIf it does not work, you will be offered to save the bug report."
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "Your message has been sent."
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "Unable to find encryption key."
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "An error occured during encryption."
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "Unable to save %s."
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -147,70 +105,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "The bug report could not be sent, likely due to network problems.\n\nAs a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n\nDo you want to save the bug report to a file?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "Send feedback in an encrypted mail."
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr "Tails developers <tails at boum.org>"
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "This doesn's seem to be a valid URL or OpenPGP key."
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr "This doesn't seem to be a valid URL or OpenPGP key."
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "Add a PGP key if you want us to encrypt messages when we respond to you."
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "Bug description"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr "Copyright © 2009-2012 tails at boum.org"
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "Help"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "If you want us to encrypt messages when we respond to you, add your key ID, a link to your key, or the key as a public key block:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "Optional email address to contact you"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "Send"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "Summary"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "Technical details to include"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -229,18 +156,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr "WhisperBack - Send feedback in an encrypted mail\nCopyright (C) 2009-2012 Tails developers <tails at boum.org>\n\nThis program is  free software; you can redistribute  it and/or modify\nit under the  terms of the GNU General Public  License as published by\nthe Free Software Foundation; either  version 3 of the License, or (at\nyour option) any later version.\n\nThis program  is distributed in the  hope that it will  be useful, but\nWITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of\nMERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "If you want us to encrypt messages when we respond to you, add your key ID, a link to your key, or the key as a public key block:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "Summary"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "Bug description"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "Optional email address to contact you"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "optional PGP key"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "Technical details to include"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr "headers"
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "debugging info"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr "headers"
+msgid "Help"
+msgstr "Help"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "optional PGP key"
+msgid "Send"
+msgstr "Send"
diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 6ec94c1..0c02333 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-08-16 09:20+0000\n"
+"POT-Creation-Date: 2013-03-26 15:50+0100\n"
+"PO-Revision-Date: 2013-03-27 08:21+0000\n"
 "Last-Translator: xtoaster <zhazhenzhong at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. XXX use a better exception
 #: ../whisperBack/whisperback.py:63
@@ -34,85 +34,47 @@ msgstr "æ— æ•ˆè”ç³»äººOpenPGP密钥：%s"
 msgid "Invalid contact OpenPGP public key block"
 msgstr "æ— æ•ˆè”ç³»äººOpenPGP公钥块"
 
-#: ../whisperBack/encryption.py:126
-msgid "No keys found."
-msgstr "没有发现密钥。"
-
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
-"The variable %s was not found in any of the configuation "
-"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "变量 %s 在配置文件 /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py 中均不存在。"
-
-#: ../whisperBack/gui.py:114
-msgid "Name of the affected software"
-msgstr "受影响软件的名称"
-
-#: ../whisperBack/gui.py:115
-msgid "Exact steps to reproduce the problem"
-msgstr "重现问题的步骤"
-
-#: ../whisperBack/gui.py:116
-msgid "Actual result / the problem"
-msgstr "实际效果/问题"
-
-#: ../whisperBack/gui.py:117
-msgid "Desired result"
-msgstr "预期效果"
+"The %s variable was not found in any of the configuration files "
+"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:155
+#: ../whisperBack/gui.py:151
 msgid "Unable to load a valid configuration."
 msgstr "æ— æ³•è½½å…¥ä¸€ä¸ªæœ‰æ•ˆçš„é…ç½®ã€‚"
 
-#: ../whisperBack/gui.py:177
-#, python-format
-msgid ""
-"<h1>Help us fix your bug!</h1>\n"
-"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
-"<p><strong>Do not include more personal information than\n"
-"needed!</strong></p>\n"
-"<h2>About giving us an email address</h2>\n"
-"<p>If you don't mind disclosing some bits of your identity\n"
-"to Tails developers, you can provide an email address to\n"
-"let us ask more details about the bug. Additionally entering\n"
-"a public PGP key enables us to encrypt such future\n"
-"communication.</p>\n"
-"<p>Anyone who can see this reply will probably infer you are\n"
-"a Tails user. Time to wonder how much you trust your\n"
-"Internet and mailbox providers?</p>\n"
-msgstr "<h1>Help us fix your bug!</h1>\n<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n<p><strong>Do not include more personal information than\nneeded!</strong></p>\n<h2>About giving us an email address</h2>\n<p>If you don't mind disclosing some bits of your identity\nto Tails developers, you can provide an email address to\nlet us ask more details about the bug. Additionally entering\na public PGP key enables us to encrypt such future\ncommunication.</p>\n<p>Anyone who can see this reply will probably infer you are\na Tails user. Time to wonder how much you trust your\nInternet and mailbox providers?</p>\n"
-
-#: ../whisperBack/gui.py:229
+#: ../whisperBack/gui.py:217
 msgid "Sending mail..."
 msgstr "正在发送邮件..."
 
-#: ../whisperBack/gui.py:230
+#: ../whisperBack/gui.py:218
 msgid "Sending mail"
 msgstr "正在发送邮件"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:220
 msgid "This could take a while..."
 msgstr "此操作可能需要一些时间..."
 
-#: ../whisperBack/gui.py:246
+#: ../whisperBack/gui.py:234
 msgid "The contact email adress doesn't seem valid."
 msgstr "è”ç³»äººé‚®ä»¶åœ°å€æ— æ•ˆã€‚"
 
-#: ../whisperBack/gui.py:263
+#: ../whisperBack/gui.py:251
 msgid "Unable to send the mail: SMTP error."
 msgstr "æ— æ³•å‘é€é‚®ä»¶ï¼šSMTP错误。"
 
-#: ../whisperBack/gui.py:265
+#: ../whisperBack/gui.py:253
 msgid "Unable to connect to the server."
 msgstr "æ— æ³•è¿žæŽ¥æœåŠ¡å™¨ã€‚"
 
-#: ../whisperBack/gui.py:267
+#: ../whisperBack/gui.py:255
 msgid "Unable to create or to send the mail."
 msgstr "æ— æ³•åˆ›å»ºæˆ–å‘é€é‚®ä»¶ã€‚"
 
-#: ../whisperBack/gui.py:270
+#: ../whisperBack/gui.py:258
 msgid ""
 "\n"
 "\n"
@@ -121,25 +83,21 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\né”™è¯¯æŠ¥å‘Šæ— æ³•å‘é€ï¼Œå¯èƒ½æ˜¯ç½‘ç»œé—®é¢˜ï¼Œå°è¯•é‡æ–°è¿žæŽ¥ç½‘ç»œï¼Œå†ç‚¹å‡»å‘é€ã€‚\n\n如果仍不管用，您可以选择保存错误报告。"
 
-#: ../whisperBack/gui.py:283
+#: ../whisperBack/gui.py:271
 msgid "Your message has been sent."
 msgstr "您的信息已发送。"
 
-#: ../whisperBack/gui.py:289
-msgid "Unable to find encryption key."
-msgstr "æ‰¾ä¸åˆ°åŠ å¯†å¯†é’¥ã€‚"
-
-#: ../whisperBack/gui.py:293
+#: ../whisperBack/gui.py:278
 msgid "An error occured during encryption."
 msgstr "åŠ å¯†ä¸­å‡ºçŽ°é”™è¯¯ã€‚"
 
-#: ../whisperBack/gui.py:313
+#: ../whisperBack/gui.py:298
 #, python-format
 msgid "Unable to save %s."
 msgstr "æ— æ³•ä¿å­˜ %s。"
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:337
+#: ../whisperBack/gui.py:322
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -149,70 +107,39 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "å¯èƒ½ç”±äºŽç½‘ç»œåŽŸå› ï¼Œé”™è¯¯æŠ¥å‘Šæ— æ³•å‘é€ã€‚\n\n为了绕过这一问题，您可以保存错误报告到U盘中，在其他系统中从您的邮箱将其发送给我们 %s ã€‚æ³¨æ„è¿™æ ·æ‚¨çš„é”™è¯¯æŠ¥å‘Šå°†å¤±åŽ»åŒ¿åæ€§ã€‚é™¤éžæ‚¨è‡ªè¡Œé‡‡å–å…¶ä»–æŽªæ–½ã€‚ (例如，使用 Tor å’Œ 一次性邮箱 )。\n\n您是否要将错误报告保存至文件 ?"
 
-#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11
+#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
 msgid "WhisperBack"
 msgstr "WhisperBack"
 
-#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8
+#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
 msgstr "é€šè¿‡åŠ å¯†é‚®ä»¶å‘é€ç”¨æˆ·åé¦ˆã€‚"
 
-#: ../whisperBack/gui.py:405
+#: ../whisperBack/gui.py:390
 msgid "Copyright © 2009-2012 Tails developpers (tails at boum.org)"
 msgstr ""
 
-#: ../whisperBack/gui.py:406
+#: ../whisperBack/gui.py:391
 msgid "Tails developers <tails at boum.org>"
 msgstr ""
 
-#: ../whisperBack/gui.py:407
+#: ../whisperBack/gui.py:392
 msgid "translator-credits"
 msgstr ""
 
-#: ../whisperBack/gui.py:434
-msgid "This doesn's seem to be a valid URL or OpenPGP key."
-msgstr "æ— æ•ˆçš„é“¾æŽ¥æˆ–OpenPGP密钥。"
+#: ../whisperBack/gui.py:419
+msgid "This doesn't seem to be a valid URL or OpenPGP key."
+msgstr ""
 
 #: ../data/whisperback.ui.h:1
-msgid ""
-"Add a PGP key if you want us to encrypt messages when we respond to you."
-msgstr "å¦‚æžœæ‚¨å¸Œæœ›æˆ‘ä»¬å›žå¤æ‚¨æ—¶ä½¿ç”¨åŠ å¯†æ¶ˆæ¯ï¼Œè¯·æ·»åŠ  PGP 密钥。"
-
-#: ../data/whisperback.ui.h:2
-msgid "Bug description"
-msgstr "错误描述"
-
-#: ../data/whisperback.ui.h:3
 msgid "Copyright © 2009-2012 tails at boum.org"
 msgstr ""
 
-#: ../data/whisperback.ui.h:4
-msgid "Help"
-msgstr "帮助"
-
-#: ../data/whisperback.ui.h:5
-msgid ""
-"If you want us to encrypt messages when we respond to you, add your key ID, "
-"a link to your key, or the key as a public key block:"
-msgstr "å¦‚æžœæ‚¨å¸Œæœ›æˆ‘ä»¬å›žå¤æ‚¨æ—¶ä½¿ç”¨åŠ å¯†æ¶ˆæ¯ï¼Œæ·»åŠ æ‚¨çš„ 密钥编号，下载密钥用的链接或公钥字符串:"
-
-#: ../data/whisperback.ui.h:6
-msgid "Optional email address to contact you"
-msgstr "用于联系您的Email地址（可选）"
-
-#: ../data/whisperback.ui.h:7
-msgid "Send"
-msgstr "发送"
-
-#: ../data/whisperback.ui.h:9
-msgid "Summary"
-msgstr "概要"
-
-#: ../data/whisperback.ui.h:10
-msgid "Technical details to include"
-msgstr "技术细节"
+#: ../data/whisperback.ui.h:3
+msgid "https://tails.boum.org/"
+msgstr "https://tails.boum.org/"
 
-#: ../data/whisperback.ui.h:12
+#: ../data/whisperback.ui.h:4
 msgid ""
 "WhisperBack - Send feedback in an encrypted mail\n"
 "Copyright (C) 2009-2012 Tails developers <tails at boum.org>\n"
@@ -231,18 +158,44 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
+#: ../data/whisperback.ui.h:20
+msgid ""
+"If you want us to encrypt messages when we respond to you, add your key ID, "
+"a link to your key, or the key as a public key block:"
+msgstr "å¦‚æžœæ‚¨å¸Œæœ›æˆ‘ä»¬å›žå¤æ‚¨æ—¶ä½¿ç”¨åŠ å¯†æ¶ˆæ¯ï¼Œæ·»åŠ æ‚¨çš„ 密钥编号，下载密钥用的链接或公钥字符串:"
+
+#: ../data/whisperback.ui.h:22
+msgid "Summary"
+msgstr "概要"
+
+#: ../data/whisperback.ui.h:23
+msgid "Bug description"
+msgstr "错误描述"
+
+#: ../data/whisperback.ui.h:24
+msgid "Optional email address to contact you"
+msgstr "用于联系您的Email地址（可选）"
+
+#: ../data/whisperback.ui.h:25
+msgid "optional PGP key"
+msgstr "PGP 密钥（可选 ）"
+
+#: ../data/whisperback.ui.h:26
+msgid "Technical details to include"
+msgstr "技术细节"
+
+#: ../data/whisperback.ui.h:27
+msgid "headers"
+msgstr ""
+
 #: ../data/whisperback.ui.h:28
 msgid "debugging info"
 msgstr "调试信息"
 
 #: ../data/whisperback.ui.h:29
-msgid "headers"
-msgstr ""
+msgid "Help"
+msgstr "帮助"
 
 #: ../data/whisperback.ui.h:30
-msgid "https://tails.boum.org/"
-msgstr "https://tails.boum.org/"
-
-#: ../data/whisperback.ui.h:31
-msgid "optional PGP key"
-msgstr "PGP 密钥（可选 ）"
+msgid "Send"
+msgstr "发送"