diff --git a/po/pl.po b/po/pl.po
index 66e2ae8..a8f7a0d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-28 03:09-0400\n"
-"PO-Revision-Date: 2018-05-14 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-06-11 03:09-0400\n"
+"PO-Revision-Date: 2018-06-11 07:09+0000\n"
+"Last-Translator: Karol Bieńkowski <karlossss1996@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/savoirfairelinux/ring/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,115 +54,71 @@
 msgid "End this call"
 msgstr "Skończ tą rozmowę"
 
-#: ui/currentcallview.ui:255 ui/currentcallview.ui:457
+#: ui/currentcallview.ui:255 ui/currentcallview.ui:483
 msgid "End call"
 msgstr "Skończ rozmowę"
 
 #: ui/currentcallview.ui:275
+msgid "Toggle transfer"
+msgstr ""
+
+#: ui/currentcallview.ui:294
 msgid "Toggle hold"
 msgstr "Włącz/wyłącz czekanie"
 
-#: ui/currentcallview.ui:279 ui/currentcallview.ui:304
-#: ui/currentcallview.ui:448
+#: ui/currentcallview.ui:298 ui/currentcallview.ui:323
+#: ui/currentcallview.ui:465
 msgid "Hold"
 msgstr "Czekanie"
 
-#: ui/currentcallview.ui:300
+#: ui/currentcallview.ui:319
 msgid "Toggle mute audio"
 msgstr "Włącz/wyłącz dźwięk"
 
-#: ui/currentcallview.ui:325
+#: ui/currentcallview.ui:344
 msgid "Toggle mute video"
 msgstr "Włącz/wyłącz wideo"
 
-#: ui/currentcallview.ui:329 ui/currentcallview.ui:439
+#: ui/currentcallview.ui:348 ui/currentcallview.ui:456
 msgid "Mute video"
 msgstr "Wyłącz video"
 
-#: ui/currentcallview.ui:352
-msgid "Toggle record audio"
-msgstr "Włącz/wyłącz nagrywanie dźwięku"
-
-#: ui/currentcallview.ui:355
-msgid "Record audio"
-msgstr "Nagraj dźwięk"
-
-#: ui/currentcallview.ui:376
-msgid "Adjust outgoing video quality"
+#: ui/currentcallview.ui:369
+msgid "Toggle recording"
 msgstr ""
 
-#: ui/currentcallview.ui:381 ui/currentcallview.ui:466
-msgid "Video quality"
-msgstr ""
-
-#: ui/currentcallview.ui:400
-msgid "Toggle show chat"
-msgstr "Włącz czat"
-
-#: ui/currentcallview.ui:404 ui/currentcallview.ui:421
-msgid "Chat"
-msgstr "Czat"
-
-#: ui/currentcallview.ui:430
-msgid "Mute audio"
-msgstr "Wyłącz dźwięk"
-
-#: ui/currentcallview.ui:475
+#: ui/currentcallview.ui:372 ui/currentcallview.ui:501
 msgid "Record"
 msgstr "Nagraj"
 
-#: ui/accountdevicestab.ui:21
-msgid "My Device ID:"
+#: ui/currentcallview.ui:393
+msgid "Adjust outgoing video quality"
 msgstr ""
 
-#: ui/accountdevicestab.ui:40
-msgid "Devices"
-msgstr "Urządzenia"
-
-#: ui/accountdevicestab.ui:66
-msgid "Add device"
+#: ui/currentcallview.ui:398 ui/currentcallview.ui:492
+msgid "Video quality"
 msgstr ""
 
-#: ui/accountdevicestab.ui:83
-msgid "Add New Device"
+#: ui/currentcallview.ui:417
+msgid "Toggle show chat"
+msgstr "Włącz czat"
+
+#: ui/currentcallview.ui:421 ui/currentcallview.ui:438
+msgid "Chat"
+msgstr "Czat"
+
+#: ui/currentcallview.ui:447
+msgid "Mute audio"
+msgstr "Wyłącz dźwięk"
+
+#: ui/currentcallview.ui:474
+msgid "Transfer"
+msgstr "Przełaczenie"
+
+#: ui/currentcallview.ui:524
+msgid "Transfer to"
 msgstr ""
 
-#: ui/accountdevicestab.ui:98
-msgid ""
-"To add a new device to your Ring account, you export your account on the "
-"Ring. This will generate a pin that must be entered on your new device "
-"within 5 minutes of its generation."
-msgstr ""
-
-#: ui/accountdevicestab.ui:107
-msgid "Password (required):"
-msgstr ""
-
-#: ui/accountdevicestab.ui:118
-msgid "Enter archive password"
-msgstr ""
-
-#: ui/accountdevicestab.ui:135 ui/accountcreationwizard.ui:84
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: ui/accountdevicestab.ui:141
-msgid "Export on the Ring"
-msgstr ""
-
-#: ui/accountdevicestab.ui:162
-msgid "Exporting account on the Ring..."
-msgstr ""
-
-#: ui/accountdevicestab.ui:186
-msgid "Your generated pin:"
-msgstr ""
-
-#: ui/accountdevicestab.ui:217 ui/accountdevicestab.ui:239
-#: ui/accountcreationwizard.ui:551
-msgid "OK"
-msgstr "OK"
-
 #: ui/accountcreationwizard.ui:34
 msgid "Welcome to"
 msgstr ""
@@ -183,6 +139,10 @@
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
+#: ui/accountcreationwizard.ui:84 ui/accountgeneraltab.ui:507
+msgid "Cancel"
+msgstr "Anuluj"
+
 #: ui/accountcreationwizard.ui:105
 msgid "Link this device to an existing account"
 msgstr ""
@@ -271,6 +231,11 @@
 msgid "Error creating/loading account."
 msgstr ""
 
+#: ui/accountcreationwizard.ui:551 ui/accountgeneraltab.ui:589
+#: ui/accountgeneraltab.ui:611
+msgid "OK"
+msgstr "OK"
+
 #: ui/generalsettingsview.ui:44
 msgid "Profile Settings"
 msgstr ""
@@ -423,42 +388,6 @@
 msgid "Select account type"
 msgstr ""
 
-#: ui/editcontactview.ui:12
-msgid "Select addressbook"
-msgstr "Wybierz książkę adresową"
-
-#: ui/editcontactview.ui:15
-msgid "Addressbook"
-msgstr "Książka adresowa"
-
-#: ui/editcontactview.ui:29
-msgid "Name"
-msgstr "Imię"
-
-#: ui/editcontactview.ui:32
-msgid "Contact name"
-msgstr "Imię kontaktu"
-
-#: ui/editcontactview.ui:47
-msgid "Select how this number will be categorized"
-msgstr "Wybierz sposób, w jakim ten number zostanie kategoryzowane"
-
-#: ui/editcontactview.ui:50
-msgid "Number category"
-msgstr "Kategoria numeru"
-
-#: ui/editcontactview.ui:66
-msgid "Number or Ring ID to be added"
-msgstr "Numer lub Ring ID do dodania"
-
-#: ui/editcontactview.ui:72
-msgid "Number or Ring ID"
-msgstr "Numer lub Ring ID"
-
-#: ui/editcontactview.ui:83
-msgid "Save"
-msgstr "Zapisz"
-
 #: ui/accountvideotab.ui:50
 msgid "Enable Video"
 msgstr "Włącz video"
@@ -630,43 +559,86 @@
 msgid "Send Invitation"
 msgstr ""
 
-#: ui/accountgeneraltab.ui:75
+#: ui/accountgeneraltab.ui:16
+msgid "Add device"
+msgstr ""
+
+#: ui/accountgeneraltab.ui:88
 msgid "Account"
 msgstr "Konto"
 
-#: ui/accountgeneraltab.ui:135
+#: ui/accountgeneraltab.ui:148
 msgid "Parameters"
 msgstr "Parametry"
 
-#: ui/accountgeneraltab.ui:159 ui/accountgeneraltab.ui:245
-#: src/accountgeneraltab.cpp:173 src/accountgeneraltab.cpp:239
+#: ui/accountgeneraltab.ui:185
+msgid "Known devices linked to this Ring account"
+msgstr "Znane urządzenia połączone z tym kontem Ring"
+
+#: ui/accountgeneraltab.ui:226
+msgid "Link another device to this account"
+msgstr "Połącz kolejne urządzenie z tym kontem"
+
+#: ui/accountgeneraltab.ui:257 ui/accountgeneraltab.ui:343
+#: src/accountgeneraltab.cpp:326 src/accountgeneraltab.cpp:529
 msgid "Change password"
 msgstr ""
 
-#: ui/accountgeneraltab.ui:175
+#: ui/accountgeneraltab.ui:273
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: ui/accountgeneraltab.ui:194
+#: ui/accountgeneraltab.ui:292
 msgid "Current password"
 msgstr ""
 
-#: ui/accountgeneraltab.ui:214
+#: ui/accountgeneraltab.ui:312
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: ui/accountgeneraltab.ui:234
+#: ui/accountgeneraltab.ui:332
 msgid "Confirm password"
 msgstr "Potwierdź hasło"
 
-#: ui/accountgeneraltab.ui:291
+#: ui/accountgeneraltab.ui:389
 msgid "Export account"
 msgstr "Wyeksportuj konto"
 
-#: ui/accountgeneraltab.ui:304
+#: ui/accountgeneraltab.ui:402
 msgid "Choose destination..."
 msgstr ""
 
+#: ui/accountgeneraltab.ui:455
+msgid "Add New Device"
+msgstr ""
+
+#: ui/accountgeneraltab.ui:470
+msgid ""
+"To add a new device to your Ring account, you export your account on the "
+"Ring. This will generate a pin that must be entered on your new device "
+"within 5 minutes of its generation."
+msgstr ""
+
+#: ui/accountgeneraltab.ui:479
+msgid "Password (required):"
+msgstr ""
+
+#: ui/accountgeneraltab.ui:490
+msgid "Enter archive password"
+msgstr ""
+
+#: ui/accountgeneraltab.ui:513
+msgid "Export on the Ring"
+msgstr ""
+
+#: ui/accountgeneraltab.ui:534
+msgid "Exporting account on the Ring..."
+msgstr ""
+
+#: ui/accountgeneraltab.ui:558
+msgid "Your generated pin:"
+msgstr ""
+
 #: ui/incomingcallview.ui:99
 msgid "Incoming..."
 msgstr "Przychodzące..."
@@ -852,7 +824,7 @@
 msgid "Invalid username"
 msgstr "Nieprawidłowa nazwa użytkownika"
 
-#: src/usernameregistrationbox.cpp:417 src/accountdevicestab.cpp:195
+#: src/usernameregistrationbox.cpp:417 src/accountgeneraltab.cpp:240
 msgid "Bad password"
 msgstr ""
 
@@ -874,13 +846,13 @@
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:187 src/accountgeneraltab.cpp:191
-#: src/avatarmanipulation.cpp:383 src/chatview.cpp:177
+#: src/generalsettingsview.cpp:187 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:383 src/chatview.cpp:172
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:189 src/accountgeneraltab.cpp:193
-#: src/chatview.cpp:179
+#: src/generalsettingsview.cpp:189 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:174
 msgid "_Save"
 msgstr ""
 
@@ -909,62 +881,100 @@
 msgid "UPnP enabled"
 msgstr "UPnP jest włączone"
 
-#: src/accountadvancedtab.cpp:598 src/accountgeneraltab.cpp:331
+#: src/accountadvancedtab.cpp:598 src/accountgeneraltab.cpp:686
 msgid "Hostname"
 msgstr "Nazwa hosta"
 
-#: src/accountgeneraltab.cpp:188 src/chatview.cpp:174
+#: src/accountgeneraltab.cpp:246
+msgid "Network error, try again"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:258
+msgid "Could not initiate export to the Ring, try again"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:169
 msgid "Save File"
 msgstr "Zapisz plik"
 
-#: src/accountgeneraltab.cpp:213
+#: src/accountgeneraltab.cpp:365
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:227
+#: src/accountgeneraltab.cpp:478
+msgid ""
+"Warning! This action will revoke the device!\n"
+"Note: this action cannot be undone."
+msgstr ""
+
+#: src/accountgeneraltab.cpp:479
+msgid "Enter password to revoke device"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:517
 msgid "New password and its confirmation are different"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:237
+#: src/accountgeneraltab.cpp:527
 msgid "Password changed!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:240
+#: src/accountgeneraltab.cpp:530
 msgid "Incorrect password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:265
+#: src/accountgeneraltab.cpp:561
+msgid "Save name"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:561
+msgid "Revoke device"
+msgstr "Odwołaj urządzenie"
+
+#: src/accountgeneraltab.cpp:582
+msgid "Error when revoking device"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:620
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountgeneraltab.cpp:276
+#: src/accountgeneraltab.cpp:631
 msgid "Type"
 msgstr "Typ"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:657
 msgid "auto-generating..."
 msgstr "Automatyczne generowanie..."
 
-#: src/accountgeneraltab.cpp:315 src/accountgeneraltab.cpp:341
+#: src/accountgeneraltab.cpp:670 src/accountgeneraltab.cpp:696
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: src/accountgeneraltab.cpp:351
+#: src/accountgeneraltab.cpp:706
 msgid "Password"
 msgstr "Hasło"
 
-#: src/accountgeneraltab.cpp:364
+#: src/accountgeneraltab.cpp:719
 msgid "Show password"
 msgstr "Pokaż hasło"
 
-#: src/accountgeneraltab.cpp:370
+#: src/accountgeneraltab.cpp:725
 msgid "Proxy"
 msgstr "Pełnomocnik"
 
-#: src/accountgeneraltab.cpp:380
+#: src/accountgeneraltab.cpp:735
 msgid "Voicemail number"
 msgstr "Numer poczty głosowej"
 
+#: src/accountgeneraltab.cpp:799
+msgid "Error: wrong password!"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:802
+msgid "Error: unknown device!"
+msgstr ""
+
 #: src/video/video_widget.cpp:566
 msgid "Share _screen area"
 msgstr ""
@@ -985,7 +995,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:385 src/chatview.cpp:179
+#: src/avatarmanipulation.cpp:385 src/chatview.cpp:174
 msgid "_Open"
 msgstr ""
 
@@ -1007,24 +1017,6 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/accountdevicestab.cpp:201
-msgid "Network error, try again"
-msgstr ""
-
-#: src/accountdevicestab.cpp:213
-msgid "Could not initiate export to the Ring, try again"
-msgstr ""
-
-#: src/accountdevicestab.cpp:246
-msgctxt "Device Name Column"
-msgid "Name"
-msgstr "Imię"
-
-#: src/accountdevicestab.cpp:251
-msgctxt "Device ID Column"
-msgid "ID"
-msgstr ""
-
 #: src/ringmainwindow.cpp:503
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
@@ -1042,11 +1034,6 @@
 msgid "Search contacts or enter number"
 msgstr "Szukaj kontakty lub wpisz numer"
 
-#: src/editcontactview.cpp:208
-msgctxt "Phone number category"
-msgid "home"
-msgstr "start"
-
 #: src/accountvideotab.cpp:184 src/accountaudiotab.cpp:175
 msgid "Enabled"
 msgstr "Włączone"
@@ -1177,72 +1164,55 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:174
+#: src/chatview.cpp:169
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:410
-msgid "Can't place call with banned contact"
-msgstr ""
-
-#: src/chatview.cpp:412
-msgid "Can't start conversation with banned contact"
-msgstr ""
-
-#: src/chatview.cpp:414
-msgid "Can't place audio call with banned contact"
-msgstr ""
-
-#: src/currentcallview.cpp:781
+#: src/currentcallview.cpp:956
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: src/accountview.cpp:188
+#: src/accountview.cpp:187
 msgctxt "Account settings"
 msgid "General"
 msgstr "Generalne"
 
-#: src/accountview.cpp:196
-msgctxt "Account settings"
-msgid "Devices"
-msgstr "Urządzenia"
-
-#: src/accountview.cpp:202
+#: src/accountview.cpp:193
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Zabezpieczenia"
 
-#: src/accountview.cpp:207
+#: src/accountview.cpp:198
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/accountview.cpp:214
+#: src/accountview.cpp:205
 msgctxt "List of banned peers"
 msgid "Bans"
 msgstr ""
 
-#: src/accountview.cpp:269
+#: src/accountview.cpp:260
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Czy jesteś pewien, że chcesz usunąć konto \"%s\" ?"
 
-#: src/accountview.cpp:403
+#: src/accountview.cpp:394
 msgid "New Account"
 msgstr "Nowe konto"
 
-#: src/accountview.cpp:490
+#: src/accountview.cpp:481
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Włączone"
 
-#: src/accountview.cpp:496
+#: src/accountview.cpp:487
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:504
+#: src/accountview.cpp:495
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Stan"