diff --git a/po/telegram-purple.pot b/po/telegram-purple.pot
index a12c7bc..4410d08 100644
--- a/po/telegram-purple.pot
+++ b/po/telegram-purple.pot
@@ -8,455 +8,457 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-20 00:11+0200\n"
+"POT-Creation-Date: 2015-11-21 14:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../telegram-base.c:477
-msgid "Login canceled"
-msgstr ""
-
-#: ../telegram-base.c:477
-msgid "Failed to send login data to telegram servers."
-msgstr ""
-
-#: ../telegram-base.c:524
+#: ../telegram-base.c:515
 msgid "Couldn't create group"
 msgstr ""
 
-#: ../telegram-base.c:524
+#: ../telegram-base.c:515
 msgid "Please select at least one other user."
 msgstr ""
 
-#: ../telegram-base.c:532
-msgid "Invalid phone number"
-msgstr ""
-
-#: ../telegram-base.c:533
-msgid ""
-"Please enter only numbers in the international phone number format:\n"
-"a leading + followed by the country prefix and the phone number.\n"
-"Do not use any other special chars."
-msgstr ""
-
-#: ../telegram-base.c:647
+#: ../telegram-base.c:570
 msgid "Query Failed"
 msgstr ""
 
-#: ../telegram-purple.c:202
+#: ../telegram-purple.c:193
+msgid "Secret chat ready."
+msgstr ""
+
+#: ../telegram-purple.c:200
 msgid "Secret chat terminated."
 msgstr ""
 
-#: ../telegram-purple.c:247
+#: ../telegram-purple.c:268
 msgid "Message marked as read."
 msgstr ""
 
-#: ../telegram-purple.c:484
+#: ../telegram-purple.c:486
 #, c-format
 msgid "Invite link: %s"
 msgstr ""
 
-#: ../telegram-purple.c:504 ../telegram-purple.c:505
+#: ../telegram-purple.c:506 ../telegram-purple.c:507
 msgid "Creating chat link failed"
 msgstr ""
 
-#: ../telegram-purple.c:506
-msgid "You need to be admin of the group to do that."
+#: ../telegram-purple.c:508
+msgid "You need to be admin of the group  to do that."
 msgstr ""
 
-#: ../telegram-purple.c:528
+#: ../telegram-purple.c:531
 msgid "Chat joined"
 msgstr ""
 
-#: ../telegram-purple.c:529
+#: ../telegram-purple.c:532
 msgid "Chat added to list of chat rooms."
 msgstr ""
 
-#: ../telegram-purple.c:543
-msgid "Start secret chat…"
+#: ../telegram-purple.c:552
+msgid "Start secret chat..."
 msgstr ""
 
 #. Generate Public Link
-#: ../telegram-purple.c:549
-msgid "Invite users by link…"
+#: ../telegram-purple.c:558
+msgid "Invite users by link..."
 msgstr ""
 
 #. Delete self from chat
-#: ../telegram-purple.c:555
-msgid "Delete and exit…"
+#: ../telegram-purple.c:564
+msgid "Delete and exit..."
 msgstr ""
 
-#: ../telegram-purple.c:573
+#: ../telegram-purple.c:632
 #, c-format
-msgid ""
-"Error, server public key not found at %s. Make sure that telegram-purple is "
-"installed properly."
+msgid "Unable to sign on as %s: pubkey not found."
 msgstr ""
 
-#: ../telegram-purple.c:582
+#: ../telegram-purple.c:636
 #, c-format
-msgid "Unable to sign on as %s: missing file %s."
-msgstr ""
-
-#: ../telegram-purple.c:586
 msgid ""
 "Make sure telegram-purple is installed properly,\n"
-"including the .tglpub file."
+"including the .tglpub file.\n"
+"If you're running SELinux (e.g. when using Tails),\n"
+"try 'make local_install', or simply copy\n"
+"%1$s to %2$s."
 msgstr ""
 
-#: ../telegram-purple.c:604
+#: ../telegram-purple.c:657
 #, c-format
 msgid ""
 "Unable to sign on as %s: phone number lacks country prefix. Numbers must "
 "start with the full international prefix code, e.g. +49 for Germany."
 msgstr ""
 
-#: ../telegram-purple.c:610
+#: ../telegram-purple.c:662
 msgid "Incomplete phone number"
 msgstr ""
 
-#: ../telegram-purple.c:735 ../telegram-purple.c:736
+#: ../telegram-purple.c:788 ../telegram-purple.c:789
 msgid "Cannot invite buddy to chat"
 msgstr ""
 
-#: ../telegram-purple.c:737
+#: ../telegram-purple.c:790
 msgid "Specified user does not exist."
 msgstr ""
 
 #. Login
-#: ../telegram-purple.c:879
+#: ../telegram-purple.c:932
 msgid "Password (two factor authentication)"
 msgstr ""
 
-#: ../telegram-purple.c:885
+#: ../telegram-purple.c:938
 msgid ""
 "Fallback SMS verification\n"
 "(Helps when not using Pidgin and you aren't being prompted for the code)"
 msgstr ""
 
-#: ../telegram-purple.c:893
+#: ../telegram-purple.c:946
 msgid "ask"
 msgstr ""
 
-#: ../telegram-purple.c:894
+#: ../telegram-purple.c:947
 msgid "always"
 msgstr ""
 
-#: ../telegram-purple.c:895
+#: ../telegram-purple.c:948
 msgid "never"
 msgstr ""
 
-#: ../telegram-purple.c:897
+#: ../telegram-purple.c:950
 msgid "Accept secret chats"
 msgstr ""
 
-#: ../telegram-purple.c:902
+#: ../telegram-purple.c:955
 msgid "Display buddies offline after (days)"
 msgstr ""
 
-#: ../telegram-purple.c:907
+#: ../telegram-purple.c:960
 msgid "Fetch past history on first login"
 msgstr ""
 
-#: ../telegram-purple.c:912
+#: ../telegram-purple.c:965
 msgid ""
 "Don't fetch history older than (days)\n"
 "(0 for unlimited)"
 msgstr ""
 
 #. Chats
-#: ../telegram-purple.c:920
+#: ../telegram-purple.c:973
 msgid "Add all group chats to buddy list"
 msgstr ""
 
 #. Read notifications
-#: ../telegram-purple.c:928
+#: ../telegram-purple.c:981
 msgid "Display notices of receipt"
 msgstr ""
 
-#: ../telegram-purple.c:933
+#: ../telegram-purple.c:986
 msgid "Send notices of receipt when present"
 msgstr ""
 
-#: ../tgp-2prpl.c:173 ../tgp-request.c:132
+#: ../tgp-2prpl.c:178 ../tgp-request.c:108
 msgid "First name"
 msgstr ""
 
-#: ../tgp-2prpl.c:174 ../tgp-request.c:134
+#: ../tgp-2prpl.c:179 ../tgp-request.c:111
 msgid "Last name"
 msgstr ""
 
-#: ../tgp-2prpl.c:176
+#: ../tgp-2prpl.c:181
 msgid "Name"
 msgstr ""
 
-#: ../tgp-2prpl.c:181 ../tgp-request.c:248 ../tgp-request.c:252
-#: ../tgp-request.c:256
+#: ../tgp-2prpl.c:186 ../tgp-request.c:197 ../tgp-request.c:201
+#: ../tgp-request.c:205
 msgid "Username"
 msgstr ""
 
-#: ../tgp-2prpl.c:186
+#: ../tgp-2prpl.c:191
 msgid "Last seen"
 msgstr ""
 
-#: ../tgp-2prpl.c:191
+#: ../tgp-2prpl.c:196
 msgid "Phone"
 msgstr ""
 
-#: ../tgp-2prpl.c:203
-msgid "Waiting for the user to get online…"
+#: ../tgp-2prpl.c:208
+msgid "Waiting for the user to get online..."
 msgstr ""
 
-#: ../tgp-2prpl.c:207
+#: ../tgp-2prpl.c:212
 msgid "Self destruction timer"
 msgstr ""
 
-#: ../tgp-2prpl.c:213
+#: ../tgp-2prpl.c:218
 msgid "Timer is not enabled."
 msgstr ""
 
-#: ../tgp-2prpl.c:220
+#: ../tgp-2prpl.c:225
 msgid "Secret key"
 msgstr ""
 
-#: ../tgp-msg.c:53
+#: ../tgp-msg.c:72
 #, c-format
 msgid "%2$s created chat %1$s."
 msgstr ""
 
-#: ../tgp-msg.c:56
+#: ../tgp-msg.c:75
 #, c-format
 msgid "%2$s changed title to %1$s."
 msgstr ""
 
-#: ../tgp-msg.c:59
+#: ../tgp-msg.c:78
 #, c-format
 msgid "%s changed photo."
 msgstr ""
 
-#: ../tgp-msg.c:62
+#: ../tgp-msg.c:81
 #, c-format
 msgid "%s deleted photo."
 msgstr ""
 
-#: ../tgp-msg.c:70
+#: ../tgp-msg.c:89
 #, c-format
 msgid "%1$s added user %2$s by link."
 msgstr ""
 
-#: ../tgp-msg.c:83
+#: ../tgp-msg.c:102
 #, c-format
 msgid "%2$s added user %1$s."
 msgstr ""
 
-#: ../tgp-msg.c:104 ../tgp-msg.c:118
+#: ../tgp-msg.c:125 ../tgp-msg.c:140
 #, c-format
 msgid "%2$s deleted user %1$s."
 msgstr ""
 
-#: ../tgp-msg.c:124
+#: ../tgp-msg.c:146
 #, c-format
 msgid "%2$s set self destruction timer to %1$d second."
 msgid_plural "%2$s set self destruction timer to %1$d seconds."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../tgp-msg.c:130
+#: ../tgp-msg.c:152
 #, c-format
 msgid "%2$s marked %1$d message read."
 msgid_plural "%2$s marked %1$d messages read."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../tgp-msg.c:136
+#: ../tgp-msg.c:158
 #, c-format
 msgid "%2$s deleted %1$d message."
 msgid_plural "%2$s deleted %1$d messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../tgp-msg.c:142
+#: ../tgp-msg.c:164
 #, c-format
 msgid "%2$s made a screenshot of %1$d message."
 msgid_plural "%2$s made a screenshot of %1$d messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../tgp-msg.c:169
+#: ../tgp-msg.c:191
 msgid "Sending message failed."
 msgstr ""
 
-#: ../tgp-msg.c:271
+#: ../tgp-msg.c:296
 msgid "Sending image failed."
 msgstr ""
 
-#: ../tgp-msg.c:285
+#: ../tgp-msg.c:310
 msgid "Sorry, sending documents to encrypted chats not yet supported."
 msgstr ""
 
-#: ../tgp-msg.c:372
+#: ../tgp-msg.c:400
 #, c-format
 msgid "%s sent a sticker."
 msgstr ""
 
-#: ../tgp-net.c:282
+#: ../tgp-net.c:286
 msgid "Cannot connect to main server"
 msgstr ""
 
-#: ../tgp-net.c:338
+#: ../tgp-net.c:342
 msgid "Cannot connect to server: Ping timeout."
 msgstr ""
 
-#: ../tgp-net.c:383
-msgid "Lost connection to the server…"
+#: ../tgp-net.c:387
+msgid "Lost connection to the server..."
 msgstr ""
 
-#: ../tgp-request.c:75
+#: ../tgp-request.c:64
 msgid ""
 "Telegram wants to verify your identity. Please enter the login code that you "
 "have received via SMS."
 msgstr ""
 
-#: ../tgp-request.c:78 ../tgp-request.c:139
+#: ../tgp-request.c:67
 msgid "Login code"
 msgstr ""
 
-#: ../tgp-request.c:78
+#: ../tgp-request.c:67
 msgid "Enter login code"
 msgstr ""
 
-#: ../tgp-request.c:78
+#: ../tgp-request.c:67
 msgid "the code"
 msgstr ""
 
-#: ../tgp-request.c:78 ../tgp-request.c:143 ../tgp-request.c:261
+#: ../tgp-request.c:67 ../tgp-request.c:116 ../tgp-request.c:210
+#: ../tgp-request.c:245 ../tgp-request.c:275
 msgid "OK"
 msgstr ""
 
-#: ../tgp-request.c:79 ../tgp-request.c:144 ../tgp-request.c:262
+#: ../tgp-request.c:68 ../tgp-request.c:116 ../tgp-request.c:135
+#: ../tgp-request.c:211 ../tgp-request.c:246 ../tgp-request.c:276
 msgid "Cancel"
 msgstr ""
 
-#. TODO: If registration is not supported, then what is this dialog doing?
-#: ../tgp-request.c:131
+#: ../tgp-request.c:107
 msgid "Registration"
 msgstr ""
 
-#: ../tgp-request.c:138
-msgid "Authorization"
-msgstr ""
-
-#: ../tgp-request.c:143
+#: ../tgp-request.c:115
 msgid "Register"
 msgstr ""
 
-#: ../tgp-request.c:143
+#: ../tgp-request.c:115
 msgid "Please register your phone number."
 msgstr ""
 
 #. purple_request API not available
-#: ../tgp-request.c:146
+#: ../tgp-request.c:120
 msgid ""
 "Phone number is not registered. Please register your phone on a different "
 "client."
 msgstr ""
 
-#: ../tgp-request.c:148
+#: ../tgp-request.c:122
 msgid "Not registered"
 msgstr ""
 
-#: ../tgp-request.c:171
-msgid "Password"
+#: ../tgp-request.c:134
+msgid "Password needed"
 msgstr ""
 
-#: ../tgp-request.c:176
-msgid "Enter password"
-msgstr ""
-
-#: ../tgp-request.c:176
+#: ../tgp-request.c:134
 msgid "Enter password for two factor authentication"
 msgstr ""
 
-#: ../tgp-request.c:179
+#: ../tgp-request.c:135
+msgid "Ok"
+msgstr ""
+
+#: ../tgp-request.c:137
 msgid ""
 "No password set for two factor authentication. Please enter it in the "
 "extended settings."
 msgstr ""
 
-#: ../tgp-request.c:181
+#: ../tgp-request.c:139
 msgid "Password invalid"
 msgstr ""
 
-#: ../tgp-request.c:209
+#: ../tgp-request.c:162
 #, c-format
 msgid "Accept secret chat '%s' on this device?"
 msgstr ""
 
-#: ../tgp-request.c:210
+#: ../tgp-request.c:163
 msgid "Secret chat"
 msgstr ""
 
-#: ../tgp-request.c:210
+#: ../tgp-request.c:163
 msgid ""
 "Secret chats can only have one end point. If you accept a secret chat on "
 "this device, its messages will not be available anywhere else. If you "
 "decline, you can still accept the chat on other devices."
 msgstr ""
 
-#: ../tgp-request.c:245
+#: ../tgp-request.c:194
 msgid ""
-"Invite at least one additional user (autocompletion available).\n"
+"Invite at least one additional user by specifying\n"
+" their full name (autocompletion available).\n"
 "You can add more users once the chat was created."
 msgstr ""
 
-#. FIXME: This dialog is pointless. It only asks whether the user wants to create a new chat.
-#. This should be merged with the next dialog.
-#. TODO: This still displays "Cancel" and "Accept", no matter $LANG
-#: ../tgp-request.c:261 ../tgp-request.c:277
+#: ../tgp-request.c:210
 msgid "Create group chat"
 msgstr ""
 
-#: ../tgp-request.c:261
+#: ../tgp-request.c:210
 msgid "Invite users"
 msgstr ""
 
-#: ../tgp-request.c:271
-msgid "Chat doesn't exist (yet)"
+#: ../tgp-request.c:229 ../tgp-request.c:244
+msgid "Change password"
 msgstr ""
 
-#: ../tgp-request.c:272
-#, c-format
-msgid "Do you want to create a new group chat named '%s'?"
+#: ../tgp-request.c:231
+msgid "Current"
+msgstr ""
+
+#: ../tgp-request.c:235 ../tgp-request.c:265
+msgid "Password"
+msgstr ""
+
+#: ../tgp-request.c:239 ../tgp-request.c:269
+msgid "Confirm"
+msgstr ""
+
+#: ../tgp-request.c:263 ../tgp-request.c:274
+msgid "New password"
+msgstr ""
+
+#. if we arrive here for the second time the specified phone number is not valid. We do not
+#. ask for the phone number directly, cause in that case the account would still be created
+#. named with the invalid phone number, even though the login will work
+#: ../tgp-request.c:312
+msgid "Invalid phone number"
+msgstr ""
+
+#: ../tgp-request.c:313
+msgid ""
+"Please enter only numbers in the international phone number format, a "
+"leading + following by the country prefix and the phone number.\n"
+"Do not use any other special chars."
 msgstr ""
 
 #. This should be the language's timestamp format. This is preceded by a colon.
-#: ../tgp-utils.c:33
+#: ../tgp-utils.c:32
 msgid "%d.%m.%Y %H:%M"
 msgstr ""
 
 #. This is preceded by a colon.
-#: ../tgp-utils.c:54
+#: ../tgp-utils.c:53
 msgid "recently"
 msgstr ""
 
 #. This is preceded by a colon.
-#: ../tgp-utils.c:58
+#: ../tgp-utils.c:57
 msgid "last week"
 msgstr ""
 
 #. This is preceded by a colon.
-#: ../tgp-utils.c:62
+#: ../tgp-utils.c:61
 msgid "last month"
 msgstr ""
 
 #. This is preceded by a colon. It refers to a point on time.
-#: ../tgp-utils.c:66
+#: ../tgp-utils.c:65
 msgid "unknown"
 msgstr ""
 
@@ -464,18 +466,18 @@ msgstr ""
 msgid "You have already left this chat."
 msgstr ""
 
-#: ../tgp-chat.c:122
+#: ../tgp-chat.c:127
 msgid "Subject:"
 msgstr ""
 
-#: ../tgp-chat.c:128
+#: ../tgp-chat.c:133
 msgid "Invite link:"
 msgstr ""
 
-#: ../tgp-chat.c:134
+#: ../tgp-chat.c:139
 msgid "Chat ID:"
 msgstr ""
 
-#: ../tgp-chat.c:232
+#: ../tgp-chat.c:238
 msgid "Users in chat"
 msgstr ""