diff --git a/po/de.po b/po/de.po
index 506c748..f460151 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,34 +8,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: telegram-purple 1.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-07 03:00+0200\n"
-"PO-Revision-Date: 2015-10-04 16:03+0200\n"
-"Last-Translator: Matthias Jentsch <mtthsjntsch@gmail.com>\n"
+"POT-Creation-Date: 2015-10-07 20:47+0200\n"
+"PO-Revision-Date: 2015-10-07 21:18+0200\n"
+"Last-Translator: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.4\n"
 
 #: ../telegram-base.c:477
 msgid "Login Canceled"
-msgstr "Login Abgebrochen"
+msgstr "Login abgebrochen"
 
 #: ../telegram-base.c:477
-msgid ""
-"Authentication export to remote data centers failed, login not possible."
+msgid "Authentication export to remote data centers failed, login not possible."
 msgstr ""
-"Exportieren der Authentifiizierung zu allen Remote-Data-Centers\n"
-"ist fehlgeschlagen, ein Login ist nicht möglich."
+"Exportieren der Authentifizierung bei allen Servern\n"
+"fehlgeschlagen. Ein Login ist nicht möglich."
 
 #: ../telegram-base.c:524
-msgid "Group not created"
-msgstr "Gruppe wurde nicht erstellt"
+msgid "Couldn't create group"
+msgstr "Konnte Gruppe nicht erstellen."
 
 #: ../telegram-base.c:524
 msgid "Select at least one other user"
-msgstr "Mindestens einen anderen Nutzer auswählen"
+msgstr "Wählen Sie mindestens einen weiteren Benutzer"
 
 #: ../telegram-base.c:532
 msgid "Invalid phone number"
@@ -43,21 +43,22 @@ msgstr "Ungültige Telefonnummer"
 
 #: ../telegram-base.c:533
 msgid ""
-"Please enter only numbers in the international phone number format, a "
-"leading + following by the country prefix and the phone number.\n"
+"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 ""
-"Bitte gib nur Nummern im internationalen Format, bestehend aus einem "
-"führenden + gefolgt vom Länderprefix und der Rufnummer ein.\n"
-"Verwende keine anderen Sonderzeichen."
+"Bitte geben Sie Telefonnummern im internationalen Format ein, bestehend aus "
+"einem führenden + gefolgt vom Länderprefix\n"
+"(z.B. 49 für Deutschland) und der Rufnummer. Verwenden Sie keine anderen "
+"Sonderzeichen."
 
 #: ../telegram-base.c:647
 msgid "Query Failed"
-msgstr "Anfrage Fehlgeschlagen"
+msgstr "Anfrage fehlgeschlagen"
 
 #: ../telegram-purple.c:172
 msgid "Secret chat terminated."
-msgstr "Geheimer chat ist beendet."
+msgstr "Geheimer Chat wurde beendet."
 
 #: ../telegram-purple.c:215
 msgid "Message marked as read."
@@ -68,167 +69,159 @@ msgstr "Nachricht als gelesen markiert."
 msgid "Invite link: %s"
 msgstr "Einladungslink: %s"
 
-#: ../telegram-purple.c:498
-msgid "Failure"
-msgstr "Fehler"
+#: ../telegram-purple.c:498 ../telegram-purple.c:499
+msgid "Creating chat link failed"
+msgstr "Konnte keinen Link zum Chat erstellen"
 
-#: ../telegram-purple.c:498
-msgid "Creating Chat Link Failed"
-msgstr "Erstellen des Einladungslinks fehlgeschlagen"
-
-#: ../telegram-purple.c:499
+#: ../telegram-purple.c:500
 msgid "You need to be admin of the group to do that."
-msgstr "Du musst Gruppenadmin sein um das zu tun."
+msgstr "Sie müssen Gruppenadmin sein, um das zu tun."
 
-#: ../telegram-purple.c:525
-msgid "Success"
-msgstr "Erfolg"
-
-#: ../telegram-purple.c:525
+#: ../telegram-purple.c:526
 msgid "Chat joined"
 msgstr "Chat beigetreten"
 
-#: ../telegram-purple.c:525
-msgid "Chat added to list of chat rooms"
-msgstr "Chat wurde in die Liste der Chaträume eingefügt."
+#: ../telegram-purple.c:527
+msgid "Chat added to list of chat rooms."
+msgstr "Chat der Liste von Chat-Räumen hinzugefügt."
 
-#: ../telegram-purple.c:539
+#: ../telegram-purple.c:541
 msgid "Start secret chat ..."
-msgstr "Starte geheimen Chat ..."
+msgstr "Beginne geheimen Chat ..."
 
 #. Generate Public Link
-#: ../telegram-purple.c:545
+#: ../telegram-purple.c:547
 msgid "Invite users by link ..."
 msgstr "Nutzer per Link einladen ..."
 
 #. Delete self from chat
-#: ../telegram-purple.c:551
+#: ../telegram-purple.c:553
 msgid "Delete and exit ..."
 msgstr "Löschen und verlassen ..."
 
-#: ../telegram-purple.c:569
+#: ../telegram-purple.c:571
 #, c-format
 msgid ""
-"Error, server public key not found at %s. Make sure that Telegram-Purple is "
+"Error, server public key not found at %s. Make sure that telegram-purple is "
 "installed properly."
 msgstr ""
-"Fehler, öffentlicher schlüssel nicht in %s gefunden. Stelle sicher dass "
-"Telegram-Purple korrekt installiert ist"
+"Fehler, konnte öffentlichen Schlüssel nicht an %s finden. Stellen Sie sicher, "
+"dass telegram-purple korrekt installiert wurde."
 
-#: ../telegram-purple.c:578
+#: ../telegram-purple.c:580
 #, c-format
-msgid "Unable to sign on as %s: Missing file %s."
-msgstr ""
+msgid "Unable to sign on as %s: missing file %s."
+msgstr "Konnte nicht als %s einloggen: Fehlende Datei %s."
 
-#: ../telegram-purple.c:582
+#: ../telegram-purple.c:584
 msgid ""
 "Make sure telegram-purple is installed properly,\n"
 "including the .tglpub file."
 msgstr ""
+"Stellen Sie sicher, dass telegram-purple korrekt\n"
+"installiert wurde, inklusive der .tglpub Datei."
 
-#: ../telegram-purple.c:600
+#: ../telegram-purple.c:602
 #, c-format
-msgid "Unable to sign on as %s, phone number lacks country prefix."
-msgstr ""
+msgid "Unable to sign on as %s: phone number lacks country prefix."
+msgstr "Konnte nicht als %s anmelden: Telefonnummer hat kein Länderpräfix."
 
-#: ../telegram-purple.c:604
+#: ../telegram-purple.c:606
 msgid ""
 "Numbers must start with the full international\n"
 "prefix code, e.g. +49 for Germany."
 msgstr ""
+"Telefonnummern müssen mit dem vollen internationalen\n"
+"Präfix-Code beginnen, z.B. +49 für Deutschland."
 
-#: ../telegram-purple.c:748
-msgid "Not found"
-msgstr "Nicht gefunden"
-
-#: ../telegram-purple.c:748
-msgid "Cannot invite buddy to chat."
+#: ../telegram-purple.c:750 ../telegram-purple.c:751
+msgid "Cannot invite buddy to chat"
 msgstr "Kann den Freund nicht zum Chat einladen"
 
-#: ../telegram-purple.c:748
-msgid "Specified user is not existing."
-msgstr "Angegebener Nutzer existiert nicht"
+#: ../telegram-purple.c:752
+msgid "Specified user does not exist."
+msgstr "Angegebener Benutzer existiert nicht."
 
 #. Login
-#: ../telegram-purple.c:891
+#: ../telegram-purple.c:895
 msgid "Password (two factor authentication)"
 msgstr "Passwort (Zwei-Faktor-Authentifizierung)"
 
-#: ../telegram-purple.c:897
+#: ../telegram-purple.c:901
 msgid ""
 "Fallback SMS verification\n"
 "(Helps when not using Pidgin and you aren't being prompted for the code)"
 msgstr ""
-"Fallback SMS-Verifizierung\n"
-"(Hilfreich wenn du kein Pidgin verwendest und du nicht nach dem SMS-Code "
-"gefragt wirst)"
-
-#: ../telegram-purple.c:905
-msgid "Ask"
-msgstr "Nachfragen"
-
-#: ../telegram-purple.c:906
-msgid "Always"
-msgstr "Immer"
-
-#: ../telegram-purple.c:907
-msgid "Never"
-msgstr "Nie"
+"Ausweich SMS-Verifizierung\n"
+"(Hilfreich wenn Sie nicht Pidgin verwenden, und die Frage\n"
+"nach dem SMS-Code aus bleibt)"
 
 #: ../telegram-purple.c:909
-msgid "Accept Secret Chats"
-msgstr "Geheime Chats Akzeptieren"
+msgid "ask"
+msgstr "nachfragen"
 
-#: ../telegram-purple.c:914
+#: ../telegram-purple.c:910
+msgid "always"
+msgstr "immer"
+
+#: ../telegram-purple.c:911
+msgid "never"
+msgstr "nie"
+
+#: ../telegram-purple.c:913
+msgid "Accept secret chats"
+msgstr "Geheime Chats akzeptieren"
+
+#: ../telegram-purple.c:918
 msgid "Display buddies offline after (days)"
-msgstr "Freunde als Offline anzeigen nach (tage)"
+msgstr "Freunde als offline anzeigen nach (Tage)"
 
-#: ../telegram-purple.c:919
+#: ../telegram-purple.c:923
 msgid "Fetch past history on first login"
-msgstr "Abrufen der verganenen Historie beim ersten Login"
+msgstr "Abrufen des bisherigen Verlaufs beim ersten Login"
 
-#: ../telegram-purple.c:924
+#: ../telegram-purple.c:928
 msgid ""
 "Don't fetch history older than (days)\n"
 "(0 for unlimited)"
 msgstr ""
-"Abrufen keiner Historie älter als (tage)\n"
+"Abrufen des Verlaufs begrenzen auf (Tage)\n"
 "(0 für unbegrenzt)"
 
 #. Chats
-#: ../telegram-purple.c:932
+#: ../telegram-purple.c:936
 msgid "Add all group chats to buddy list"
 msgstr "Alle Gruppenchats in die Freundesliste einfügen"
 
 #. Read notifications
-#: ../telegram-purple.c:940
+#: ../telegram-purple.c:944
 msgid "Display notices of receipt"
 msgstr "Empfangsbestätigungen anzeigen"
 
-#: ../telegram-purple.c:945
+#: ../telegram-purple.c:949
 msgid "Send notices of receipt when present"
 msgstr "Empfangsbestätigungen senden wenn anwesend"
 
 #: ../tgp-2prpl.c:386 ../tgp-request.c:130
-msgid "First Name"
+msgid "First name"
 msgstr "Vorname"
 
 #: ../tgp-2prpl.c:387 ../tgp-request.c:132
-msgid "Last Name"
+msgid "Last name"
 msgstr "Nachname"
 
 #: ../tgp-2prpl.c:389
 msgid "Name"
 msgstr "Name"
 
-#: ../tgp-2prpl.c:394 ../tgp-request.c:245 ../tgp-request.c:249
-#: ../tgp-request.c:253
-msgid "User Name"
-msgstr ""
+#: ../tgp-2prpl.c:394 ../tgp-request.c:246 ../tgp-request.c:250
+#: ../tgp-request.c:254
+msgid "Username"
+msgstr "Benutzername"
 
 #: ../tgp-2prpl.c:399
 msgid "Last seen"
-msgstr "Zuletzte Gesehen"
+msgstr "Zuletzt gesehen"
 
 #: ../tgp-2prpl.c:404
 msgid "Phone"
@@ -236,11 +229,11 @@ msgstr "Telefonnummer"
 
 #: ../tgp-2prpl.c:417
 msgid "Waiting for the user to get online ..."
-msgstr "Warte darauf dass der Nutzer online kommt ..."
+msgstr "Warte auf Anmeldung des Benutzers ..."
 
 #: ../tgp-2prpl.c:421
-msgid "Self destructiom timer"
-msgstr "Selbstzertörungs-Timer"
+msgid "Self destruction timer"
+msgstr "Selbstzerstörungs-Timer"
 
 #: ../tgp-2prpl.c:427
 msgid "Off"
@@ -250,134 +243,165 @@ msgstr "Aus"
 msgid "Secret key"
 msgstr "Geheimer Schlüssel"
 
-#: ../tgp-msg.c:57
+#. This is preceded by a username.
+#: ../tgp-msg.c:58
 #, c-format
 msgid "created chat %s"
 msgstr "hat den Chat %s erstellt"
 
-#: ../tgp-msg.c:60
+#. This is preceded by a username.
+#: ../tgp-msg.c:62
 #, c-format
 msgid "changed title to %s"
-msgstr "hat den titel geändert zu %s"
+msgstr "hat den Titel zu %s geändert"
 
-#: ../tgp-msg.c:63
+#. This is preceded by a username.
+#: ../tgp-msg.c:66
 msgid "changed photo"
 msgstr "hat das Photo geändert"
 
-#: ../tgp-msg.c:66
+#. This is preceded by a username.
+#: ../tgp-msg.c:70
 msgid "deleted photo"
 msgstr "hat das Photo gelöscht"
 
-#: ../tgp-msg.c:74
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:79
 #, c-format
-msgid "%s added user %s by link"
-msgstr "%s hat den Nutzer %s per link hinzugefügt"
+msgid "%1$s added user %2$s by link"
+msgstr "%1$s fügte Benutzer %2$s per Link hinzu."
 
-#: ../tgp-msg.c:89
+#. This is preceded by a username.
+#: ../tgp-msg.c:95
 #, c-format
 msgid "added user %s."
 msgstr "hat den Nutzer %s hinzufügt."
 
-#: ../tgp-msg.c:112
+#. This is preceded by a username.
+#: ../tgp-msg.c:119
 #, c-format
-msgid "%s deleted user %s."
-msgstr "%s hat den Nutzer %s gelöscht."
+msgid "%1$s deleted user %2$s."
+msgstr "%1$s entfernte Benutzer %2$s."
 
-#: ../tgp-msg.c:128
+#. This is preceded by a username.
+#: ../tgp-msg.c:136
 #, c-format
 msgid "deleted user %s"
-msgstr "hat den Nutzer %s gelöscht"
+msgstr "hat den Nutzer %s entfernt"
 
-#: ../tgp-msg.c:134
+#. This is preceded by a username.
+#: ../tgp-msg.c:143
 #, c-format
-msgid "set TTL to %d seconds"
-msgstr "hat die TTL auf %d Sekunden gesetzt"
+msgid "set self destruction timer to %d seconds"
+msgstr "setzte Selbstzerstörungs-Timer auf %d Sekunden"
 
-#: ../tgp-msg.c:137
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:147
 #, c-format
 msgid "%d messages marked read"
 msgstr "%d Nachrichten als gelesen markiert"
 
-#: ../tgp-msg.c:140
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:151
 #, c-format
 msgid "%d messages deleted"
 msgstr "%d Nachrichten gelöscht"
 
-#: ../tgp-msg.c:143
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:155
 #, c-format
-msgid "%d messages screenshoted"
+msgid "%d messages screenshot'ed"
 msgstr "Es wurde ein Screenshot von %d Nachrichten erstellt"
 
-#: ../tgp-msg.c:146
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:159
 #, c-format
 msgid "updated layer to %d"
 msgstr "Update auf Layer %d"
 
-#: ../tgp-msg.c:149
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:163
 #, c-format
-msgid "Request rekey #%016llx"
+msgid "request rekey #%016llx"
+msgstr "beantragt neuen Schlüssel #%016llx"
+
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:167
+#, c-format
+msgid "accept rekey #%016llx"
+msgstr "akzeptiert neuen Schlüssel #%016llx"
+
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:171
+#, c-format
+msgid "commit rekey #%016llx"
+msgstr "bestätigt neuen Schlüssel #%016llx"
+
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:175
+#, c-format
+msgid "abort rekey #%016llx"
 msgstr ""
 
-#: ../tgp-msg.c:152
-#, c-format
-msgid "Accept rekey #%016llx"
-msgstr ""
-
-#: ../tgp-msg.c:155
-#, c-format
-msgid "Commit rekey #%016llx"
-msgstr ""
-
-#: ../tgp-msg.c:158
-#, c-format
-msgid "Abort rekey #%016llx"
-msgstr ""
-
-#: ../tgp-msg.c:189
+#: ../tgp-msg.c:205
 #, c-format
 msgid "Sending message failed. %d: %s"
 msgstr "Absenden der Nachricht fehlgeschlagen. %d: %s"
 
-#: ../tgp-msg.c:267
+#: ../tgp-msg.c:283
 msgid "Sending image failed."
 msgstr "Absenden des Bilds fehlgeschlagen."
 
-#: ../tgp-msg.c:280
+#: ../tgp-msg.c:296
 msgid "Sorry, sending documents to encrypted chats not yet supported."
 msgstr ""
-"Tut mir leid, aber das versenden von Dokumenten in verschlüsselten Chats "
-"wird noch nicht unterstüzt."
+"Tut uns Leid, aber das Versenden von Dokumenten in verschlüsselten Chats wird "
+"noch nicht unterstützt."
 
-#: ../tgp-msg.c:367
+#: ../tgp-msg.c:383
 #, c-format
-msgid "%s sent a sticker"
-msgstr "%s hat einen Sticker gesendet"
+msgid "%s sent a sticker."
+msgstr "%s hat einen Sticker gesendet."
 
 #: ../tgp-net.c:326
 msgid "Cannot connect to server"
 msgstr "Keine Verbindung zum Server"
 
 #: ../tgp-net.c:371
-msgid "Lost connection to the server..."
-msgstr "Verbindung zum Server verloren..."
+msgid "Lost connection to the server ..."
+msgstr "Verbindung zum Server verloren ..."
 
 #: ../tgp-request.c:76 ../tgp-request.c:137
-msgid "Login Code"
-msgstr "Login Abgebrochen"
+msgid "Login code"
+msgstr "Login-Code"
 
 #: ../tgp-request.c:76
-msgid "Enter Login Code"
-msgstr "Login Code Eingeben"
+msgid "Enter login code"
+msgstr "Login-Code eingeben"
 
 #: ../tgp-request.c:76
 msgid ""
-"Telegram wants to verify your identity, please enter the code, that you have "
+"Telegram wants to verify your identity. Please enter the code that you have "
 "received via SMS."
 msgstr ""
+"Telegram möchte Ihre Identität prüfen. Bitte geben Sie den Login-Code ein, den "
+"Sie per SMS erhalten haben."
+
+#: ../tgp-request.c:77
+msgid "the code"
+msgstr "der Login-Code"
+
+#: ../tgp-request.c:77 ../tgp-request.c:141 ../tgp-request.c:259
+msgid "OK"
+msgstr "Ok"
+
+#: ../tgp-request.c:78 ../tgp-request.c:142 ../tgp-request.c:260
+msgid "Cancel"
+msgstr "Abbrechen"
 
 #: ../tgp-request.c:85
 msgid "What is your SMS verification code?"
-msgstr "Was ist dein SMS-Verifizierungscode?"
+msgstr "Wie lautet Ihr Login-Code?"
 
 #: ../tgp-request.c:129
 msgid "Registration"
@@ -395,13 +419,22 @@ msgstr "Anmelden"
 msgid "Please register your phone number."
 msgstr "Bitte registriere deine Telefonnummer."
 
+#. purple_request API not available
+#: ../tgp-request.c:144
+msgid ""
+"Phone number is not registered. Please register your phone on a different "
+"client."
+msgstr ""
+"Telefonnummer wurde noch nicht bei Telegram registriert. Bitte registrieren "
+"Sie Ihre Telefonnummer mit einem anderen Client."
+
 #: ../tgp-request.c:146
 msgid "Not Registered"
-msgstr "Nicht Registriert"
+msgstr "Nicht registriert"
 
 #: ../tgp-request.c:169
 msgid "Password"
-msgstr "Password"
+msgstr "Passwort"
 
 #: ../tgp-request.c:174
 msgid "Password needed"
@@ -413,10 +446,11 @@ msgstr "Passwort für die Zwei-Faktor-Authentifizierung angeben"
 
 #: ../tgp-request.c:177
 msgid ""
-"No password for two factor authentication, enter it in extended settings."
+"No password set for two factor authentication. Please enter it in the extended "
+"settings."
 msgstr ""
-"Kein passwort für die Zwei-Faktor-Authentifizierung gesetzt, bitte\n"
-"spezifiere Eines in den erweiterten Einstellungen."
+"Kein Passwort für die Zwei-Faktor-Authentifizierung gesetzt, bitte\n"
+"spezifizieren Sie dies in den erweiterten Einstellungen."
 
 #: ../tgp-request.c:179
 msgid "Password invalid"
@@ -425,7 +459,7 @@ msgstr "Passwort ungültig"
 #: ../tgp-request.c:207
 #, c-format
 msgid "Accept Secret Chat '%s'?"
-msgstr "Geheimen Chat '%s' akzeptieren?"
+msgstr "Geheimen Chat '%s' auf diesem Gerät akzeptieren?"
 
 #: ../tgp-request.c:208
 msgid "Secret Chat"
@@ -433,64 +467,69 @@ msgstr "Geheimer Chat"
 
 #: ../tgp-request.c:208
 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 accept the chat on other devices."
+"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 accept the chat on other devices."
 msgstr ""
 "Geheime Chats können nur einen Endpunkt haben. Wenn du den geheimen Chat auf "
 "diesem Geräte akzeptierst werden die Nachrichten nirgendwo anders verfügbar "
 "sein. Wenn du ablehnst kannst du den Chat auf anderen Geräten akzeptieren."
 
-#: ../tgp-request.c:242
+#: ../tgp-request.c:243
 msgid ""
-"Use the autocompletion to invite at least one additional user.\n"
-" You can always add more users once the chat was created..."
+"Invite at least one additional user (Autocompletion available).\n"
+" You can add more users once the chat was created."
 msgstr ""
-"Benutze die Autocompletion um noch mindestens einen zusätzlichen Nutzer "
-"einzuladen.\n"
-" Du kannst später noch weitere Nutzer einladen sobald der Chat erstellt "
-"wurde..."
+"Lade noch mindestens einen zusätzlichen Benutzer ein.\n"
+" Sie können später weitere Nutzer einladen, sobald der Chat erstellt wurde."
 
-#: ../tgp-request.c:258 ../tgp-request.c:270
-msgid "Create Group Chat"
+#. 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:259 ../tgp-request.c:275
+msgid "Create group chat"
 msgstr "Gruppenchat erstellen"
 
-#: ../tgp-request.c:258
-msgid "Invite Users"
-msgstr "Nutzer Einladen"
-
-#: ../tgp-request.c:258
-msgid "Ok"
-msgstr "Ok"
-
 #: ../tgp-request.c:259
-msgid "Cancel"
-msgstr "Abbrechen"
+msgid "Invite users"
+msgstr "Benutzer einladen"
 
-#: ../tgp-request.c:268
+#: ../tgp-request.c:269
+msgid "Chat doesn't exist (yet)"
+msgstr "Chat existiert (noch) nicht"
+
+#: ../tgp-request.c:270
 #, c-format
-msgid "Chat doesn't exist, create a new group chat named '%s'?"
-msgstr ""
-"Der Chat existiert nicht, willst du einen neuen Gruppenchat mit dem Namen "
-"'%s' erstellen?"
+msgid "Do you want to create a new group chat named '%s'?"
+msgstr "Möchten Sie eine neue Gruppe \"%s\" erstellen?"
 
-#: ../tgp-utils.c:57
-#, c-format
-msgid "Recently"
-msgstr "Kürzlich"
+#. This should be the language's timestamp format.
+#. * This is preceded by a colon.
+#: ../tgp-utils.c:39
+msgid "%d.%m.%Y %H:%M"
+msgstr "%d.%m.%Y %H:%M"
 
+#. This is preceded by a colon.
 #: ../tgp-utils.c:60
 #, c-format
-msgid "Last week"
+msgid "recently"
+msgstr "Kürzlich"
+
+#. This is preceded by a colon.
+#: ../tgp-utils.c:64
+#, c-format
+msgid "last week"
 msgstr "Letzte Woche"
 
-#: ../tgp-utils.c:63
+#. This is preceded by a colon.
+#: ../tgp-utils.c:68
 #, c-format
-msgid "Last month"
+msgid "last month"
 msgstr "Letzten Monat"
 
-#: ../tgp-utils.c:66
-msgid "Unknown"
+#. This is preceded by a colon.
+#: ../tgp-utils.c:72
+msgid "unknown"
 msgstr "Unbekannt"
 
 #: ../tgp-chat.c:83
@@ -499,34 +538,17 @@ msgstr "Du hast diesen Chat bereits verlassen."
 
 #: ../tgp-chat.c:133
 msgid "Subject:"
-msgstr "Thema"
+msgstr "Thema:"
 
 #: ../tgp-chat.c:139
-msgid "Invite Link:"
-msgstr "Einladungslink: %s"
+msgid "Invite link:"
+msgstr "Einladungslink:"
 
 #: ../tgp-chat.c:145
-msgid "Chat Id:"
-msgstr "Chat Id:"
+msgid "Chat ID:"
+msgstr "Chat ID:"
 
 #: ../tgp-chat.c:244
 msgid "Users"
-msgstr "Nutzer"
+msgstr "Benutzer"
 
-#~ msgid "Create New Group Chat"
-#~ msgstr "Einen neuen Gruppenchat erstellen"
-
-#~ msgid "Username"
-#~ msgstr "Nutzername"
-
-#~ msgid "First name"
-#~ msgstr "Vorname"
-
-#~ msgid "Last name"
-#~ msgstr "Nachname"
-
-#~ msgid "Telegram Code"
-#~ msgstr "Telegram Code"
-
-#~ msgid "Authentication export failed."
-#~ msgstr "Konnte Authentifizierung nicht exportieren"
diff --git a/po/telegram-purple.pot b/po/telegram-purple.pot
index 4123a21..762b11e 100644
--- a/po/telegram-purple.pot
+++ b/po/telegram-purple.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-07 03:00+0200\n"
+"POT-Creation-Date: 2015-10-07 20:38+0200\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"
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 
 #: ../telegram-base.c:524
-msgid "Group not created"
+msgid "Couldn't create group"
 msgstr ""
 
 #: ../telegram-base.c:524
@@ -62,155 +62,143 @@ msgstr ""
 msgid "Invite link: %s"
 msgstr ""
 
-#: ../telegram-purple.c:498
-msgid "Failure"
+#: ../telegram-purple.c:498 ../telegram-purple.c:499
+msgid "Creating chat link failed"
 msgstr ""
 
-#: ../telegram-purple.c:498
-msgid "Creating Chat Link Failed"
-msgstr ""
-
-#: ../telegram-purple.c:499
+#: ../telegram-purple.c:500
 msgid "You need to be admin of the group to do that."
 msgstr ""
 
-#: ../telegram-purple.c:525
-msgid "Success"
-msgstr ""
-
-#: ../telegram-purple.c:525
+#: ../telegram-purple.c:526
 msgid "Chat joined"
 msgstr ""
 
-#: ../telegram-purple.c:525
-msgid "Chat added to list of chat rooms"
+#: ../telegram-purple.c:527
+msgid "Chat added to list of chat rooms."
 msgstr ""
 
-#: ../telegram-purple.c:539
+#: ../telegram-purple.c:541
 msgid "Start secret chat ..."
 msgstr ""
 
 #. Generate Public Link
-#: ../telegram-purple.c:545
+#: ../telegram-purple.c:547
 msgid "Invite users by link ..."
 msgstr ""
 
 #. Delete self from chat
-#: ../telegram-purple.c:551
+#: ../telegram-purple.c:553
 msgid "Delete and exit ..."
 msgstr ""
 
-#: ../telegram-purple.c:569
+#: ../telegram-purple.c:571
 #, c-format
 msgid ""
-"Error, server public key not found at %s. Make sure that Telegram-Purple is "
+"Error, server public key not found at %s. Make sure that telegram-purple is "
 "installed properly."
 msgstr ""
 
-#: ../telegram-purple.c:578
+#: ../telegram-purple.c:580
 #, c-format
-msgid "Unable to sign on as %s: Missing file %s."
+msgid "Unable to sign on as %s: missing file %s."
 msgstr ""
 
-#: ../telegram-purple.c:582
+#: ../telegram-purple.c:584
 msgid ""
 "Make sure telegram-purple is installed properly,\n"
 "including the .tglpub file."
 msgstr ""
 
-#: ../telegram-purple.c:600
+#: ../telegram-purple.c:602
 #, c-format
-msgid "Unable to sign on as %s, phone number lacks country prefix."
+msgid "Unable to sign on as %s: phone number lacks country prefix."
 msgstr ""
 
-#: ../telegram-purple.c:604
+#: ../telegram-purple.c:606
 msgid ""
 "Numbers must start with the full international\n"
 "prefix code, e.g. +49 for Germany."
 msgstr ""
 
-#: ../telegram-purple.c:748
-msgid "Not found"
+#: ../telegram-purple.c:750 ../telegram-purple.c:751
+msgid "Cannot invite buddy to chat"
 msgstr ""
 
-#: ../telegram-purple.c:748
-msgid "Cannot invite buddy to chat."
-msgstr ""
-
-#: ../telegram-purple.c:748
-msgid "Specified user is not existing."
+#: ../telegram-purple.c:752
+msgid "Specified user does not exist."
 msgstr ""
 
 #. Login
-#: ../telegram-purple.c:891
+#: ../telegram-purple.c:895
 msgid "Password (two factor authentication)"
 msgstr ""
 
-#: ../telegram-purple.c:897
+#: ../telegram-purple.c:901
 msgid ""
 "Fallback SMS verification\n"
 "(Helps when not using Pidgin and you aren't being prompted for the code)"
 msgstr ""
 
-#: ../telegram-purple.c:905
-msgid "Ask"
-msgstr ""
-
-#: ../telegram-purple.c:906
-msgid "Always"
-msgstr ""
-
-#: ../telegram-purple.c:907
-msgid "Never"
-msgstr ""
-
 #: ../telegram-purple.c:909
-msgid "Accept Secret Chats"
+msgid "ask"
 msgstr ""
 
-#: ../telegram-purple.c:914
+#: ../telegram-purple.c:910
+msgid "always"
+msgstr ""
+
+#: ../telegram-purple.c:911
+msgid "never"
+msgstr ""
+
+#: ../telegram-purple.c:913
+msgid "Accept secret chats"
+msgstr ""
+
+#: ../telegram-purple.c:918
 msgid "Display buddies offline after (days)"
 msgstr ""
 
-#: ../telegram-purple.c:919
+#: ../telegram-purple.c:923
 msgid "Fetch past history on first login"
 msgstr ""
 
-#: ../telegram-purple.c:924
+#: ../telegram-purple.c:928
 msgid ""
 "Don't fetch history older than (days)\n"
 "(0 for unlimited)"
 msgstr ""
 
 #. Chats
-#: ../telegram-purple.c:932
+#: ../telegram-purple.c:936
 msgid "Add all group chats to buddy list"
 msgstr ""
 
 #. Read notifications
-#: ../telegram-purple.c:940
+#: ../telegram-purple.c:944
 msgid "Display notices of receipt"
 msgstr ""
 
-#: ../telegram-purple.c:945
+#: ../telegram-purple.c:949
 msgid "Send notices of receipt when present"
 msgstr ""
 
 #: ../tgp-2prpl.c:386 ../tgp-request.c:130
-msgid "First Name"
+msgid "First name"
 msgstr ""
 
 #: ../tgp-2prpl.c:387 ../tgp-request.c:132
-msgid "Last Name"
+msgid "Last name"
 msgstr ""
 
 #: ../tgp-2prpl.c:389
 msgid "Name"
 msgstr ""
 
-#: ../tgp-2prpl.c:394 ../tgp-request.c:245 ../tgp-request.c:249
-#: ../tgp-request.c:253
-msgid "User Name"
+#: ../tgp-2prpl.c:394 ../tgp-request.c:246 ../tgp-request.c:250
+#: ../tgp-request.c:254
+msgid "Username"
 msgstr ""
 
 #: ../tgp-2prpl.c:399
@@ -226,7 +214,7 @@ msgid "Waiting for the user to get online ..."
 msgstr ""
 
 #: ../tgp-2prpl.c:421
-msgid "Self destructiom timer"
+msgid "Self destruction timer"
 msgstr ""
 
 #: ../tgp-2prpl.c:427
@@ -237,105 +225,122 @@ msgstr ""
 msgid "Secret key"
 msgstr ""
 
-#: ../tgp-msg.c:57
+#. This is preceded by a username.
+#: ../tgp-msg.c:58
 #, c-format
 msgid "created chat %s"
 msgstr ""
 
-#: ../tgp-msg.c:60
+#. This is preceded by a username.
+#: ../tgp-msg.c:62
 #, c-format
 msgid "changed title to %s"
 msgstr ""
 
-#: ../tgp-msg.c:63
+#. This is preceded by a username.
+#: ../tgp-msg.c:66
 msgid "changed photo"
 msgstr ""
 
-#: ../tgp-msg.c:66
+#. This is preceded by a username.
+#: ../tgp-msg.c:70
 msgid "deleted photo"
 msgstr ""
 
-#: ../tgp-msg.c:74
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:79
 #, c-format
-msgid "%s added user %s by link"
+msgid "%1$s added user %2$s by link"
 msgstr ""
 
-#: ../tgp-msg.c:89
+#. This is preceded by a username.
+#: ../tgp-msg.c:95
 #, c-format
 msgid "added user %s."
 msgstr ""
 
-#: ../tgp-msg.c:112
+#. This is preceded by a username.
+#: ../tgp-msg.c:119
 #, c-format
-msgid "%s deleted user %s."
+msgid "%1$s deleted user %2$s."
 msgstr ""
 
-#: ../tgp-msg.c:128
+#. This is preceded by a username.
+#: ../tgp-msg.c:136
 #, c-format
 msgid "deleted user %s"
 msgstr ""
 
-#: ../tgp-msg.c:134
+#. This is preceded by a username.
+#: ../tgp-msg.c:143
 #, c-format
-msgid "set TTL to %d seconds"
+msgid "set self destruction timer to %d seconds"
 msgstr ""
 
-#: ../tgp-msg.c:137
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:147
 #, c-format
 msgid "%d messages marked read"
 msgstr ""
 
-#: ../tgp-msg.c:140
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:151
 #, c-format
 msgid "%d messages deleted"
 msgstr ""
 
-#: ../tgp-msg.c:143
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:155
 #, c-format
-msgid "%d messages screenshoted"
+msgid "%d messages screenshot'ed"
 msgstr ""
 
-#: ../tgp-msg.c:146
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:159
 #, c-format
 msgid "updated layer to %d"
 msgstr ""
 
-#: ../tgp-msg.c:149
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:163
 #, c-format
-msgid "Request rekey #%016llx"
+msgid "request rekey #%016llx"
 msgstr ""
 
-#: ../tgp-msg.c:152
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:167
 #, c-format
-msgid "Accept rekey #%016llx"
+msgid "accept rekey #%016llx"
 msgstr ""
 
-#: ../tgp-msg.c:155
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:171
 #, c-format
-msgid "Commit rekey #%016llx"
+msgid "commit rekey #%016llx"
 msgstr ""
 
-#: ../tgp-msg.c:158
+#. This is (maybe?) preceded by a username.
+#: ../tgp-msg.c:175
 #, c-format
-msgid "Abort rekey #%016llx"
+msgid "abort rekey #%016llx"
 msgstr ""
 
-#: ../tgp-msg.c:189
+#: ../tgp-msg.c:205
 #, c-format
 msgid "Sending message failed. %d: %s"
 msgstr ""
 
-#: ../tgp-msg.c:267
+#: ../tgp-msg.c:283
 msgid "Sending image failed."
 msgstr ""
 
-#: ../tgp-msg.c:280
+#: ../tgp-msg.c:296
 msgid "Sorry, sending documents to encrypted chats not yet supported."
 msgstr ""
 
-#: ../tgp-msg.c:367
+#: ../tgp-msg.c:383
 #, c-format
-msgid "%s sent a sticker"
+msgid "%s sent a sticker."
 msgstr ""
 
 #: ../tgp-net.c:326
@@ -343,23 +348,35 @@ msgid "Cannot connect to server"
 msgstr ""
 
 #: ../tgp-net.c:371
-msgid "Lost connection to the server..."
+msgid "Lost connection to the server ..."
 msgstr ""
 
 #: ../tgp-request.c:76 ../tgp-request.c:137
-msgid "Login Code"
+msgid "Login code"
 msgstr ""
 
 #: ../tgp-request.c:76
-msgid "Enter Login Code"
+msgid "Enter login code"
 msgstr ""
 
 #: ../tgp-request.c:76
 msgid ""
-"Telegram wants to verify your identity, please enter the code, that you have "
+"Telegram wants to verify your identity. Please enter the code that you have "
 "received via SMS."
 msgstr ""
 
+#: ../tgp-request.c:77
+msgid "the code"
+msgstr ""
+
+#: ../tgp-request.c:77 ../tgp-request.c:141 ../tgp-request.c:259
+msgid "OK"
+msgstr ""
+
+#: ../tgp-request.c:78 ../tgp-request.c:142 ../tgp-request.c:260
+msgid "Cancel"
+msgstr ""
+
 #: ../tgp-request.c:85
 msgid "What is your SMS verification code?"
 msgstr ""
@@ -380,6 +397,13 @@ msgstr ""
 msgid "Please register your phone number."
 msgstr ""
 
+#. purple_request API not available
+#: ../tgp-request.c:144
+msgid ""
+"Phone number is not registered. Please register your phone on a different "
+"client."
+msgstr ""
+
 #: ../tgp-request.c:146
 msgid "Not Registered"
 msgstr ""
@@ -398,7 +422,8 @@ msgstr ""
 
 #: ../tgp-request.c:177
 msgid ""
-"No password for two factor authentication, enter it in extended settings."
+"No password set for two factor authentication. Please enter it in the "
+"extended settings."
 msgstr ""
 
 #: ../tgp-request.c:179
@@ -421,50 +446,59 @@ msgid ""
 "decline, you can accept the chat on other devices."
 msgstr ""
 
-#: ../tgp-request.c:242
+#: ../tgp-request.c:243
 msgid ""
-"Use the autocompletion to invite at least one additional user.\n"
-" You can always add more users once the chat was created..."
+"Invite at least one additional user (Autocompletion available).\n"
+" You can add more users once the chat was created."
 msgstr ""
 
-#: ../tgp-request.c:258 ../tgp-request.c:270
-msgid "Create Group Chat"
-msgstr ""
-
-#: ../tgp-request.c:258
-msgid "Invite Users"
-msgstr ""
-
-#: ../tgp-request.c:258
-msgid "Ok"
+#. 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:259 ../tgp-request.c:275
+msgid "Create group chat"
 msgstr ""
 
 #: ../tgp-request.c:259
-msgid "Cancel"
+msgid "Invite users"
 msgstr ""
 
-#: ../tgp-request.c:268
+#: ../tgp-request.c:269
+msgid "Chat doesn't exist (yet)"
+msgstr ""
+
+#: ../tgp-request.c:270
 #, c-format
-msgid "Chat doesn't exist, create a new group chat named '%s'?"
+msgid "Do you want to create a new group chat named '%s'?"
 msgstr ""
 
-#: ../tgp-utils.c:57
-#, c-format
-msgid "Recently"
+#. This should be the language's timestamp format.
+#. * This is preceded by a colon.
+#: ../tgp-utils.c:39
+msgid "%d.%m.%Y %H:%M"
 msgstr ""
 
+#. This is preceded by a colon.
 #: ../tgp-utils.c:60
 #, c-format
-msgid "Last week"
+msgid "recently"
 msgstr ""
 
-#: ../tgp-utils.c:63
+#. This is preceded by a colon.
+#: ../tgp-utils.c:64
 #, c-format
-msgid "Last month"
+msgid "last week"
 msgstr ""
 
-#: ../tgp-utils.c:66
-msgid "Unknown"
+#. This is preceded by a colon.
+#: ../tgp-utils.c:68
+#, c-format
+msgid "last month"
+msgstr ""
+
+#. This is preceded by a colon.
+#: ../tgp-utils.c:72
+msgid "unknown"
 msgstr ""
 
 #: ../tgp-chat.c:83
@@ -476,11 +510,11 @@ msgid "Subject:"
 msgstr ""
 
 #: ../tgp-chat.c:139
-msgid "Invite Link:"
+msgid "Invite link:"
 msgstr ""
 
 #: ../tgp-chat.c:145
-msgid "Chat Id:"
+msgid "Chat ID:"
 msgstr ""
 
 #: ../tgp-chat.c:244
diff --git a/telegram-base.c b/telegram-base.c
index 665a4da..dc9317c 100644
--- a/telegram-base.c
+++ b/telegram-base.c
@@ -521,7 +521,7 @@ void tgp_create_group_chat_by_usernames (struct tgl_state *TLS, const char *titl
     tgl_do_create_group_chat (TLS, j, ids, title, (int) strlen(title),
                               tgp_notify_on_error_gw, g_strdup (title));
   } else {
-    purple_notify_message (_telegram_protocol, PURPLE_NOTIFY_MSG_INFO, _("Group not created"), _("Select at least one other user"), NULL,
+    purple_notify_message (_telegram_protocol, PURPLE_NOTIFY_MSG_INFO, _("Couldn't create group"), _("Select at least one other user"), NULL,
                            NULL, NULL);
   }
 }
diff --git a/telegram-purple.c b/telegram-purple.c
index 003b01c..bf74deb 100644
--- a/telegram-purple.c
+++ b/telegram-purple.c
@@ -495,7 +495,8 @@ void export_chat_link_checked (struct tgl_state *TLS, const char *name) {
     return;
   }
   if (C->chat.admin_id != tgl_get_peer_id (TLS->our_id)) {
-    purple_notify_error (_telegram_protocol, _("Failure"), _("Creating Chat Link Failed"),
+    purple_notify_error (_telegram_protocol, _("Creating chat link failed"),
+                         _("Creating chat link failed"),
                          _("You need to be admin of the group to do that."));
     return;
   }
@@ -522,7 +523,8 @@ static void import_chat_link_done (struct tgl_state *TLS, void *extra, int succe
     tgp_notify_on_error_gw (TLS, NULL, success);
     return;
   }
-  purple_notify_info (_telegram_protocol, _("Success"), _("Chat joined"), _("Chat added to list of chat rooms"));
+  purple_notify_info (_telegram_protocol, _("Chat joined"), _("Chat joined"),
+                      _("Chat added to list of chat rooms."));
 }
 
 void import_chat_link_checked (struct tgl_state *TLS, const char *link) {
@@ -567,7 +569,7 @@ static void tgprpl_login (PurpleAccount * acct) {
   TLS->base_path = get_config_dir (TLS, purple_account_get_username (acct));
   tgl_set_download_directory (TLS, get_download_dir(TLS));
   if (!assert_file_exists (gc, pk_path, _("Error, server public key not found at %s."
-                      " Make sure that Telegram-Purple is installed properly."))) {
+                      " Make sure that telegram-purple is installed properly."))) {
     /* Already reported. */
     return;
   }
@@ -575,7 +577,7 @@ static void tgprpl_login (PurpleAccount * acct) {
   
   struct rsa_pubkey the_pubkey;
   if (! read_pubkey_file (pk_path, &the_pubkey)) {
-    char *cause = g_strdup_printf (_("Unable to sign on as %s: Missing file %s."),
+    char *cause = g_strdup_printf (_("Unable to sign on as %s: missing file %s."),
                     purple_account_get_username (acct), pk_path);
     purple_connection_error_reason (gc, PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, cause);
     purple_notify_message (_telegram_protocol, PURPLE_NOTIFY_MSG_ERROR, cause,
@@ -597,7 +599,7 @@ static void tgprpl_login (PurpleAccount * acct) {
   tgl_init (TLS);
 
   if (! tgp_startswith (purple_account_get_username (acct), "+")) {
-        char *cause = g_strdup_printf (_("Unable to sign on as %s, phone number lacks country prefix."),
+        char *cause = g_strdup_printf (_("Unable to sign on as %s: phone number lacks country prefix."),
                         purple_account_get_username (acct));
         purple_connection_error_reason (gc, PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, cause);
         purple_notify_message (_telegram_protocol, PURPLE_NOTIFY_MSG_ERROR, cause,
@@ -745,7 +747,9 @@ static void tgprpl_chat_invite (PurpleConnection * gc, int id, const char *messa
   tgl_peer_t *user = tgl_peer_get(conn->TLS, TGL_MK_USER (atoi(name)));
   
   if (! chat || ! user) {
-    purple_notify_error (_telegram_protocol, _("Not found"), _("Cannot invite buddy to chat."), _("Specified user is not existing."));
+    purple_notify_error (_telegram_protocol, _("Cannot invite buddy to chat"),
+                         _("Cannot invite buddy to chat"),
+                         _("Specified user does not exist."));
     return;
   }
   
@@ -902,11 +906,11 @@ static void tgprpl_init (PurplePlugin *plugin) {
   // Messaging
   
   GList *verification_values = NULL;
-  ADD_VALUE(verification_values, _("Ask"), "ask");
-  ADD_VALUE(verification_values, _("Always"), "always");
-  ADD_VALUE(verification_values, _("Never"), "never");
+  ADD_VALUE(verification_values, _("ask"), "ask");
+  ADD_VALUE(verification_values, _("always"), "always");
+  ADD_VALUE(verification_values, _("never"), "never");
   
-  opt = purple_account_option_list_new (_("Accept Secret Chats"),
+  opt = purple_account_option_list_new (_("Accept secret chats"),
                                         TGP_KEY_ACCEPT_SECRET_CHATS,
                                         verification_values);
   prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, opt);
diff --git a/telegram-purple.h b/telegram-purple.h
index 01eeb9d..978abee 100644
--- a/telegram-purple.h
+++ b/telegram-purple.h
@@ -41,6 +41,7 @@
 #include <connection.h>
 
 #define PLUGIN_ID "prpl-telegram"
+// FIXME: Name must be translated (for languages without latin script, it would look like gibberish. Just like Japanese script looks to me.)
 #define TG_AUTHOR "Matthias Jentsch <mtthsjntsch@gmail.com>, Vitaly Valtman, Christopher Althaus <althaus.christopher@gmail.com>, Markus Endres <endresma45241@th-nuernberg.de>. Based on libtgl by Vitaly Valtman."
 #define TG_DESCRIPTION "Telegram protocol."
 #define TG_BUILD "13"
diff --git a/tgp-2prpl.c b/tgp-2prpl.c
index bf4409a..dbea68b 100644
--- a/tgp-2prpl.c
+++ b/tgp-2prpl.c
@@ -383,15 +383,15 @@ PurpleNotifyUserInfo *p2tgl_notify_user_info_new (struct tgl_user *U) {
   PurpleNotifyUserInfo *info = purple_notify_user_info_new();
   
   if (str_not_empty(U->first_name) && str_not_empty(U->last_name)) {
-    purple_notify_user_info_add_pair (info, _("First Name"), U->first_name);
-    purple_notify_user_info_add_pair (info, _("Last Name"), U->last_name);
+    purple_notify_user_info_add_pair (info, _("First name"), U->first_name);
+    purple_notify_user_info_add_pair (info, _("Last name"), U->last_name);
   } else {
     purple_notify_user_info_add_pair (info, _("Name"), U->print_name);
   }
   
   if (str_not_empty (U->username)) {
     char *username = g_strdup_printf ("@%s", U->username);
-    purple_notify_user_info_add_pair (info, _("User Name"), username);
+    purple_notify_user_info_add_pair (info, _("Username"), username);
     g_free (username);
   }
   
@@ -418,7 +418,7 @@ PurpleNotifyUserInfo *p2tgl_notify_encrypted_chat_info_new (struct tgl_state *TL
     return info;
   }
   
-  const char *ttl_key = _("Self destructiom timer");
+  const char *ttl_key = _("Self destruction timer");
   if (secret->ttl) {
     char *ttl = g_strdup_printf ("%d", secret->ttl);
     purple_notify_user_info_add_pair (info, ttl_key, ttl);
diff --git a/tgp-chat.c b/tgp-chat.c
index 0fbfa8e..de42b75 100644
--- a/tgp-chat.c
+++ b/tgp-chat.c
@@ -136,13 +136,13 @@ GList *tgprpl_chat_join_info (PurpleConnection * gc) {
   GList *info = g_list_append (NULL, pce);
 
   pce = g_new0 (struct proto_chat_entry, 1);
-  pce->label = _("Invite Link:");
+  pce->label = _("Invite link:");
   pce->identifier = "link";
   pce->required = FALSE;
   info = g_list_append (info, pce);
 
   pce = g_new0 (struct proto_chat_entry, 1);
-  pce->label = _("Chat Id:");
+  pce->label = _("Chat ID:");
   pce->identifier = "id";
   pce->required = FALSE;
 
diff --git a/tgp-msg.c b/tgp-msg.c
index a158ef7..af9b2f0 100644
--- a/tgp-msg.c
+++ b/tgp-msg.c
@@ -54,15 +54,19 @@ static char *format_service_msg (struct tgl_state *TLS, struct tgl_message *M) {
 
   switch (M->action.type) {
     case tgl_message_action_chat_create:
+      /* This is preceded by a username. */
       txt_action = g_strdup_printf (_("created chat %s"), M->action.title);
       break;
     case tgl_message_action_chat_edit_title:
+      /* This is preceded by a username. */
       txt_action = g_strdup_printf (_("changed title to %s"), M->action.new_title);
       break;
     case tgl_message_action_chat_edit_photo:
+      /* This is preceded by a username. */
       txt_action = g_strdup (_("changed photo"));
       break;
     case tgl_message_action_chat_delete_photo:
+      /* This is preceded by a username. */
       txt_action = g_strdup (_("deleted photo"));
       break;
     case tgl_message_action_chat_add_user_by_link: {
@@ -71,7 +75,8 @@ static char *format_service_msg (struct tgl_state *TLS, struct tgl_message *M) {
         char *alias = p2tgl_strdup_alias (actionPeer);
         
         PurpleConversation *conv = purple_find_chat (conn->gc, tgl_get_peer_id (M->to_id));
-        txt_action = g_strdup_printf (_("%s added user %s by link"), alias, txt_user);
+        /* This is (maybe?) preceded by a username. */
+        txt_action = g_strdup_printf (_("%1$s added user %2$s by link"), alias, txt_user);
         if (conv) {
           p2tgl_conv_add_user (TLS, conv, tgl_get_peer_id (peer->id), NULL, 0, FALSE);
         }
@@ -86,6 +91,7 @@ static char *format_service_msg (struct tgl_state *TLS, struct tgl_message *M) {
       tgl_peer_t *peer = tgl_peer_get (TLS, TGL_MK_USER (M->action.user));
       if (peer) {
         char *alias = p2tgl_strdup_alias (peer);
+        /* This is preceded by a username. */
         txt_action = g_strdup_printf (_("added user %s."), alias);
         
         PurpleConversation *conv = purple_find_chat (conn->gc, tgl_get_peer_id (M->to_id));
@@ -109,7 +115,8 @@ static char *format_service_msg (struct tgl_state *TLS, struct tgl_message *M) {
         PurpleConversation *conv = tgp_chat_show (TLS, &chatPeer->chat);
         if (conv) {
           char *alias = p2tgl_strdup_alias (peer);
-          txt_action = g_strdup_printf (_("%s deleted user %s."), txt_user, alias);
+          /* This is preceded by a username. */
+          txt_action = g_strdup_printf (_("%1$s deleted user %2$s."), txt_user, alias);
           g_free (alias);
           
           p2tgl_conv_del_user (TLS, conv, txt_action, M->action.user);
@@ -125,37 +132,47 @@ static char *format_service_msg (struct tgl_state *TLS, struct tgl_message *M) {
         }
         
         char *alias = p2tgl_strdup_alias (peer);
+        /* This is preceded by a username. */
         txt_action = g_strdup_printf (_("deleted user %s"), alias);
         g_free (alias);
       }
       break;
     }
     case tgl_message_action_set_message_ttl:
-      txt_action = g_strdup_printf (_("set TTL to %d seconds"), M->action.ttl);
+      /* This is preceded by a username. */
+      txt_action = g_strdup_printf (_("set self destruction timer to %d seconds"), M->action.ttl);
       break;
     case tgl_message_action_read_messages:
+      /* This is (maybe?) preceded by a username. */
       txt_action = g_strdup_printf (_("%d messages marked read"), M->action.read_cnt);
       break;
     case tgl_message_action_delete_messages:
+      /* This is (maybe?) preceded by a username. */
       txt_action = g_strdup_printf (_("%d messages deleted"), M->action.delete_cnt);
       break;
     case tgl_message_action_screenshot_messages:
-      txt_action = g_strdup_printf (_("%d messages screenshoted"), M->action.screenshot_cnt);
+      /* This is (maybe?) preceded by a username. */
+      txt_action = g_strdup_printf (_("%d messages screenshot'ed"), M->action.screenshot_cnt);
       break;
     case tgl_message_action_notify_layer:
+      /* This is (maybe?) preceded by a username. */
       txt_action = g_strdup_printf (_("updated layer to %d"), M->action.layer);
       break;
     case tgl_message_action_request_key:
-      txt_action = g_strdup_printf (_("Request rekey #%016llx"), M->action.exchange_id);
+      /* This is (maybe?) preceded by a username. */
+      txt_action = g_strdup_printf (_("request rekey #%016llx"), M->action.exchange_id);
       break;
     case tgl_message_action_accept_key:
-      txt_action = g_strdup_printf (_("Accept rekey #%016llx"), M->action.exchange_id);
+      /* This is (maybe?) preceded by a username. */
+      txt_action = g_strdup_printf (_("accept rekey #%016llx"), M->action.exchange_id);
       break;
     case tgl_message_action_commit_key:
-      txt_action = g_strdup_printf (_("Commit rekey #%016llx"), M->action.exchange_id);
+      /* This is (maybe?) preceded by a username. */
+      txt_action = g_strdup_printf (_("commit rekey #%016llx"), M->action.exchange_id);
       break;
     case tgl_message_action_abort_key:
-      txt_action = g_strdup_printf (_("Abort rekey #%016llx"), M->action.exchange_id);
+      /* This is (maybe?) preceded by a username. */
+      txt_action = g_strdup_printf (_("abort rekey #%016llx"), M->action.exchange_id);
       break;
     default:
       txt_action = NULL;
@@ -170,7 +187,6 @@ static char *format_service_msg (struct tgl_state *TLS, struct tgl_message *M) {
 }
 
 static char *format_geo_link_osm (double lat, double lon) {
-
   // assure that the floats are formatted with a dot
   char *loc = setlocale (LC_NUMERIC, NULL);
   setlocale (LC_NUMERIC, "en_US");
@@ -364,7 +380,7 @@ static char *tgp_msg_sticker_display (struct tgl_state *TLS, tgl_peer_id_t from,
   *flags |= PURPLE_MESSAGE_IMAGES;
 #else
   char *txt_user = p2tgl_strdup_alias (tgl_peer_get (TLS, from));
-  text = g_strdup_printf (_("%s sent a sticker"), txt_user);
+  text = g_strdup_printf (_("%s sent a sticker."), txt_user);
   *flags |= PURPLE_MESSAGE_SYSTEM;
   g_free (txt_user);
 #endif
diff --git a/tgp-net.c b/tgp-net.c
index 6096095..88fdfa1 100644
--- a/tgp-net.c
+++ b/tgp-net.c
@@ -366,9 +366,9 @@ static void fail_connection (struct connection *c) {
   
   c->prpl_data = NULL;
 
-  info ("Lost connection to server... %s:%d\n", c->ip, c->port);
+  info ("Lost connection to server ... %s:%d\n", c->ip, c->port);
   purple_connection_error_reason (conn->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-                                  _("Lost connection to the server..."));
+                                  _("Lost connection to the server ..."));
 }
 
 //extern FILE *log_net_f;
diff --git a/tgp-request.c b/tgp-request.c
index 0338c3b..4a21412 100644
--- a/tgp-request.c
+++ b/tgp-request.c
@@ -73,9 +73,9 @@ void request_code (struct tgl_state *TLS, void (*callback) (struct tgl_state *TL
   data->callback = callback;
 
   if (purple_account_get_bool (tg_get_acc (TLS), "compat-verification", 0) ||
-      ! purple_request_input (conn->gc, _("Login Code"), _("Enter Login Code"), _("Telegram wants to verify your "
-        "identity, please enter the code, that you have received via SMS."), NULL, 0, 0, "code", "OK",
-        G_CALLBACK(request_code_entered), "Cancel", G_CALLBACK(request_code_canceled), conn->pa, NULL, NULL, data)) {
+      ! purple_request_input (conn->gc, _("Login code"), _("Enter login code"), _("Telegram wants to verify your "
+        "identity. Please enter the code that you have received via SMS."), NULL, 0, 0, _("the code"), _("OK"),
+        G_CALLBACK(request_code_entered), _("Cancel"), G_CALLBACK(request_code_canceled), conn->pa, NULL, NULL, data)) {
     
     // purple request API is not available, so we create a new conversation (the Telegram system
     // account "7770000") to prompt the user for the code
@@ -127,21 +127,21 @@ void request_name_and_code (struct tgl_state *TLS) {
   PurpleRequestField* field = 0;
   
   PurpleRequestFieldGroup* group = purple_request_field_group_new (_("Registration"));
-  field = purple_request_field_string_new ("first_name", _("First Name"), "", 0);
+  field = purple_request_field_string_new ("first_name", _("First name"), "", 0);
   purple_request_field_group_add_field (group, field);
-  field = purple_request_field_string_new ("last_name", _("Last Name"), "", 0);
+  field = purple_request_field_string_new ("last_name", _("Last name"), "", 0);
   purple_request_field_group_add_field (group, field);
   purple_request_fields_add_group (fields, group);
   
   group = purple_request_field_group_new (_("Authorization"));
-  field = purple_request_field_string_new ("code", _("Login Code"), "", 0);
+  field = purple_request_field_string_new ("code", _("Login code"), "", 0);
   purple_request_field_group_add_field (group, field);
   purple_request_fields_add_group (fields, group);
   
-  if (!purple_request_fields (conn->gc, _("Register"), _("Please register your phone number."), NULL, fields, "Ok",
-        G_CALLBACK(request_name_code_entered), "Cancel", NULL, conn->pa, NULL, NULL, conn->gc)) {
+  if (!purple_request_fields (conn->gc, _("Register"), _("Please register your phone number."), NULL, fields, _("OK"),
+        G_CALLBACK(request_name_code_entered), _("Cancel"), NULL, conn->pa, NULL, NULL, conn->gc)) {
     // purple_request API not available
-    const char *error = "Phone number is not registered, please register your phone on a different client.";
+    const char *error = _("Phone number is not registered. Please register your phone on a different client.");
     purple_connection_error_reason (conn->gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, error);
     purple_notify_error (_telegram_protocol, _("Not Registered"), _("Not Registered"), error);
   }
@@ -174,7 +174,7 @@ void request_password (struct tgl_state *TLS, void (*callback) (struct tgl_state
   if (! purple_request_fields (conn->gc, _("Password needed"), _("Enter password for two factor authentication"),
       NULL, fields, "Ok", G_CALLBACK(request_password_entered), "Cancel", NULL, conn->pa,
       NULL, NULL, data)) {
-    const char *error = _("No password for two factor authentication, enter it in extended settings.");
+    const char *error = _("No password set for two factor authentication. Please enter it in the extended settings.");
     purple_connection_error_reason (conn->gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, error);
     purple_notify_error (_telegram_protocol, _("Password invalid"), _("Password invalid"), error);
   }
@@ -214,6 +214,7 @@ void request_accept_secret_chat (struct tgl_state *TLS, struct tgl_secret_chat *
 
 static void create_group_chat_cb (void *_data, PurpleRequestFields* fields) {
   struct accept_create_chat_data *data = _data;
+  // FIXME: Oh god.
   const char *users[3] = {
     purple_request_fields_get_string (fields, "user1"),
     purple_request_fields_get_string (fields, "user2"),
@@ -239,23 +240,23 @@ void request_choose_user (struct accept_create_chat_data *data) {
   // the user to specify at least one other one.
   PurpleRequestFields* fields = purple_request_fields_new();
   PurpleRequestFieldGroup* group = purple_request_field_group_new (
-      _("Use the autocompletion to invite at least one additional user.\n You can always add more users once"
-      " the chat was created..."));
+      _("Invite at least one additional user (Autocompletion available).\n You can add more users once"
+      " the chat was created."));
   
-  PurpleRequestField *field = purple_request_field_string_new ("user1", _("User Name"), NULL, FALSE);
+  PurpleRequestField *field = purple_request_field_string_new ("user1", _("Username"), NULL, FALSE);
   purple_request_field_set_type_hint (field, "screenname");
   purple_request_field_group_add_field (group, field);
   
-  field = purple_request_field_string_new ("user2", _("User Name"), NULL, FALSE);
+  field = purple_request_field_string_new ("user2", _("Username"), NULL, FALSE);
   purple_request_field_set_type_hint (field, "screenname");
   purple_request_field_group_add_field (group, field);
   
-  field = purple_request_field_string_new ("user3", _("User Name"), NULL, FALSE);
+  field = purple_request_field_string_new ("user3", _("Username"), NULL, FALSE);
   purple_request_field_set_type_hint (field, "screenname");
   purple_request_field_group_add_field (group, field);
   
   purple_request_fields_add_group (fields, group);
-  purple_request_fields (conn->gc, _("Create Group Chat"), _("Invite Users"), NULL, fields, _("Ok"),
+  purple_request_fields (conn->gc, _("Create group chat"), _("Invite users"), NULL, fields, _("OK"),
       G_CALLBACK(create_group_chat_cb), _("Cancel"), G_CALLBACK(cancel_group_chat_cb), conn->pa, NULL, NULL, data);
 }
 
@@ -265,9 +266,13 @@ void request_create_chat (struct tgl_state *TLS, const char *subject) {
   struct accept_create_chat_data *data = malloc (sizeof (struct accept_create_chat_data));
   data->title = g_strdup (subject);
   data->TLS = TLS;
-  char *title = g_strdup_printf (_("Chat doesn't exist, create a new group chat named '%s'?"), subject);
+  char *title = _("Chat doesn't exist (yet)");
+  char *secondary = g_strdup_printf (_("Do you want to create a new group chat named '%s'?"), subject);
   
-  purple_request_accept_cancel (conn->gc, _("Create Group Chat"), title, NULL, 1, conn->pa, NULL,
+  // 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
+  purple_request_accept_cancel (conn->gc, _("Create group chat"), title, secondary, 1, conn->pa, NULL,
       NULL, data, G_CALLBACK(request_choose_user), G_CALLBACK(cancel_group_chat_cb));
-  g_free (title);
+  g_free (secondary);
 }
diff --git a/tgp-utils.c b/tgp-utils.c
index 5c7aa1c..997e6a9 100644
--- a/tgp-utils.c
+++ b/tgp-utils.c
@@ -34,7 +34,9 @@ connection_data *get_conn_from_buddy (PurpleBuddy *buddy) {
 
 const char *format_time (time_t date) {
   struct tm *datetime = localtime(&date);
-  return purple_utf8_strftime ("%d.%m.%Y %H:%M", datetime);
+  /* This should be the language's timestamp format.
+   * This is preceded by a colon. */
+  return purple_utf8_strftime (_("%d.%m.%Y %H:%M"), datetime);
 }
 
 char *tgp_format_img (int imgstore) {
@@ -54,16 +56,20 @@ char *tgp_format_user_status (struct tgl_user_status *status) {
       when = g_strdup_printf("%s", format_time (status->when));
       break;
     case -2:
-      when = g_strdup_printf (_("Recently"));
+      /* This is preceded by a colon. */
+      when = g_strdup_printf (_("recently"));
       break;
     case -3:
-      when = g_strdup_printf (_("Last week"));
+      /* This is preceded by a colon. */
+      when = g_strdup_printf (_("last week"));
       break;
     case -4:
-      when = g_strdup_printf (_("Last month"));
+      /* This is preceded by a colon. */
+      when = g_strdup_printf (_("last month"));
       break;
     default:
-      when = g_strdup (_("Unknown"));
+      /* This is preceded by a colon. */
+      when = g_strdup (_("unknown"));
       break;
   }
   return when;
@@ -102,10 +108,10 @@ long tgp_time_n_days_ago (int days) {
 char *tgp_g_format_size (gint64 size) {
   char *sizes[] = {
     "B",
-    "KB",
-    "MB",
-    "GB",
-    "PB"
+    "KiB",
+    "MiB",
+    "GiB",
+    "PiB"
   };
   int base = 0;
   double s = (double) size;