diff --git a/po/ar.po b/po/ar.po
index 829f91b..c54b80b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Arabic (http://www.transifex.com/savoirfairelinux/ring/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "اسم المضيف"
 
@@ -60,7 +60,7 @@
 msgid "Unknown"
 msgstr "مجهول"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -98,39 +98,39 @@
 msgid "auto-generating..."
 msgstr "إنتاج تلقائي..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "اسم المستخدم"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "كلمة السر"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "اكشف كلمة السر"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "الوكيل"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "رقم البريد الصوتي"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "رد ألي على المكالمات"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP مفعل"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "نوع النغمة DTMF"
 
@@ -160,59 +160,59 @@
 msgid "Name"
 msgstr "الإسم"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "عام"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "تأمين"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "إعدادات متقدمة"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "هل أنت متأكد من حذف حساب \"%s\""
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "حساب جديد"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "مفعل"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "الاسم المستعار"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "الحالة"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -320,65 +320,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- وسيط GNOME إلى Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "إبحث عن إتصالات أو أدخل رقم"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "هاذا معرفك RingI\nانسخه و بثه لأصدقائك!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "جلب المعرف ring"
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -661,7 +669,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -688,7 +696,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "موافق"
 
@@ -775,60 +783,24 @@
 msgid "Import"
 msgstr "استيراد"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "كلمة السر:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -955,7 +927,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "أرسل"
 
@@ -1196,22 +1172,26 @@
 msgid "Accounts"
 msgstr "حسابات"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "إعدادات"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "محادثات"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "الاتصالات"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "تاريخ"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index f574aa8..05b5030 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Bulgarian (http://www.transifex.com/savoirfairelinux/ring/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Име на сървъра"
 
@@ -60,7 +60,7 @@
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Паролите не съвпадат"
 
@@ -98,39 +98,39 @@
 msgid "auto-generating..."
 msgstr "автоматично създаване…"
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Потребителско име"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Парола"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Показване на паролата"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Прокс"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Номер на гласова поща"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Авт. отговор на обажданията"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Вид на тоналното набиране:"
 
@@ -160,59 +160,59 @@
 msgid "Name"
 msgstr "Име"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Общи"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Устройства"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Сигурност"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Разширени"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Наистина ли искате да изтриете акаунта „%s“?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Нов акаунт"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Включен"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Псевдоним"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Състояние"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Отваряне"
 
@@ -320,65 +320,73 @@
 msgid "- GNOME client for Ring"
 msgstr "— Клиент на Ring за ГНОМ"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "започване на разговор"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "отваряне на чата"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Потърсете контакти или въведете номер"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Това е Вашият идентификатор за Ring.\nКопирайте го и го споделете с приятелите си!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "изтегляне на ид. за Ring…"
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -661,7 +669,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Парола (потвърди):"
 
@@ -688,7 +696,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "Добре"
 
@@ -775,62 +783,26 @@
 msgid "Import"
 msgstr "Внасяне"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Псевдоним:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Парола:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Регистрирай потребителското ми име по–късно"
-
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
 msgstr ""
@@ -955,7 +927,11 @@
 msgid "Place call"
 msgstr "Започване на разговор"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Изпращане"
 
@@ -1196,22 +1172,26 @@
 msgid "Accounts"
 msgstr "Акаунти"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Настройки"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Разговори"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Контакти"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "История"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "въведете потребителско име"
diff --git a/po/ca.po b/po/ca.po
index 5307b6d..f98417b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2017-01-02 19:34+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Catalan (http://www.transifex.com/savoirfairelinux/ring/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Nom d'amfitrió"
 
@@ -59,7 +59,7 @@
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -97,39 +97,39 @@
 msgid "auto-generating..."
 msgstr "autogenerant..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Contrasenya"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Mostra la contrasenya"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Intermediari"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Nombre de correu de veu"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Autorespondre trucades"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP habitlitat"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Tipus de to DTMF"
 
@@ -159,59 +159,59 @@
 msgid "Name"
 msgstr "Nom"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "General"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Seguretat"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Esteu segur que voleu esborrar el compte \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Compte Nou"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Àlies"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Estat"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -319,65 +319,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Client de GNOME per a Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Busqueu contactes o introduïu el nombre"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Aquest és el vostre RingID.\nCopieu i compartiu amb les vostres amistats!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "buscant RingID"
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -660,7 +668,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -687,7 +695,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -774,60 +782,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -954,7 +926,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Enviar"
 
@@ -1195,22 +1171,26 @@
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Opcions"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Converses"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Contactes"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historial"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index eda3c8c..43b2d3c 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -1,18 +1,19 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
 # Marek Suchánek <marek.suchanek@protonmail.com>, 2016
+# fri, 2017
 # Stepan Salenikovich <>, 2016
 # Tirifto <tirifto@openmailbox.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/savoirfairelinux/ring/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@
 msgid "_Remove server"
 msgstr "_Odstranit server"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Hostitelské jméno"
 
@@ -60,7 +61,7 @@
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Hesla se neshodují"
 
@@ -98,39 +99,39 @@
 msgid "auto-generating..."
 msgstr "autogenerace…"
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Heslo"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Ukázat heslo"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Číslo hlasové schránky"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "Adresa jmenné služby"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Automaticky přijímat hovory"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP povoleno"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Typ tónové volby:"
 
@@ -160,59 +161,59 @@
 msgid "Name"
 msgstr "Jméno"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Obecné"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Zařízení"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Zabezpečení"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Jste si jisti, že chcete odstranit účet „%s“?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nový účet"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Přezdívka"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Otevřít profilový obrázek"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Otevřít"
 
@@ -230,7 +231,7 @@
 msgid ""
 "Are you sure you want to delete contact \"%s\"? It will be removed from your"
 " system's addressbook."
-msgstr "Jste si jisti, že chcete odstranit kontakt „%s“? Bude odstraněn také z vašeho systémového adresáře."
+msgstr "Jste si jistý, že chcete odstranit kontakt „%s“? Toto spojení bude odstraněno také z vašeho systémového adresáře."
 
 #: src/contactpopupmenu.cpp:114
 msgid "_Call"
@@ -320,68 +321,76 @@
 msgid "- GNOME client for Ring"
 msgstr "- Klient GNOME pro Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "vyhledává se RingID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Neplatné uživatelské jméno Ring: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
-msgstr ""
+msgstr "Chyba při řešení uživatelského jména. Jmenný server je možná nedosažitelný"
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Nebylo možné přeložit uživatelské jméno Ring: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "zavolat"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "otevřít zprávy"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Hledat kontakty nebo zadat číslo"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
-msgstr ""
+msgstr "Toto je vaše uživatelské jméno pro Ring.\nZkopírujte a sdílejte jej s vašimi přáteli!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Toto je vaše RingID.\nKopírujte a sdílejte jej s přáteli!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "získávám RingID…"
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
-msgstr ""
+msgstr "Kód QR ID Ringu"
 
 #: src/usernameregistrationbox.cpp:128
 msgid "The entered username is not available"
@@ -425,7 +434,7 @@
 
 #: src/usernameregistrationbox.cpp:319
 msgid "Could not initiate name registration, try again."
-msgstr ""
+msgstr "Nebylo možné zahájit registraci jména, zkuste to znovu."
 
 #: src/usernameregistrationbox.cpp:361
 msgid "Register this username on the blockchain"
@@ -582,7 +591,7 @@
 
 #: ui/accountaudiotab.ui:75
 msgid "Audio Codecs"
-msgstr ""
+msgstr "Zvukové kodeky"
 
 #: ui/accountcreationwizard.ui:32
 msgid "Welcome to "
@@ -615,7 +624,7 @@
 "previous device, choose the Ring Account to use and select \"Link another "
 "device to this account\". You will get the necessary PIN to complete this "
 "form. The PIN is only valid for 10 minutes."
-msgstr ""
+msgstr "Pro připojení tohoto zařízení k jinému účtu potřebujete nejdříve získat kód PIN. Abyste jej vygenerovali, otevřete na předchozím zařízení nastavení správy účtů, zvolte, který Účet Ring použít, a vyberte „Připojit k tomuto účtu další zařízení“. \nDostanete PIN nezbytný k dokončení formuláře\nPIN zůstává platný 10 minut."
 
 #: ui/accountcreationwizard.ui:126 ui/accountcreationwizard.ui:215
 #: ui/accountcreationwizard.ui:427
@@ -624,7 +633,7 @@
 
 #: ui/accountcreationwizard.ui:134
 msgid "Okay, I have the PIN!"
-msgstr ""
+msgstr "OK. Mám PIN!"
 
 #: ui/accountcreationwizard.ui:172
 msgid "Enter your pin:"
@@ -644,7 +653,7 @@
 
 #: ui/accountcreationwizard.ui:285
 msgid "Full name:"
-msgstr ""
+msgstr "Celé jméno:"
 
 #: ui/accountcreationwizard.ui:327
 msgid "Ring Account"
@@ -652,16 +661,16 @@
 
 #: ui/accountcreationwizard.ui:340
 msgid "Register public username (experimental):"
-msgstr ""
+msgstr "Zaregistrovat veřejné jméno (pokusné)"
 
 #: ui/accountcreationwizard.ui:346
 msgid ""
 "By checking this, you will register a unique username on the Ring network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr ""
+msgstr "Zaškrtnutím tohoto nastavení si zaregistrujete jedinečné uživatelské jméno na síti Ring. Ostatní ho budou moci použít k navázání spojení, namísto obvyklého RingID, které je 40 znaků dlouhé."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Heslo (potvrďte):"
 
@@ -669,7 +678,7 @@
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
-msgstr ""
+msgstr "Toto heslo bude použito k zašifrování dat vašeho účtu a pro připojování nových zařízení k účtu."
 
 #: ui/accountcreationwizard.ui:459
 msgid "Generating your Ring account..."
@@ -688,7 +697,7 @@
 msgstr "Chyba při vytváření/nahrávání účtu."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "Budiž"
 
@@ -775,61 +784,25 @@
 msgid "Import"
 msgstr "Importovat"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Je potřeba migrace účtu"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "Následující účet musí být převeden do nového formátu účtů Ring:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Přezdívka:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Profilový obrázek:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Pro pokračování v převodu si musíte k účtu zvolit heslo. Toto heslo bude použito k zašifrování vašeho hlavního klíče. Bude požadováno pro přidávání nových zařízení k vašemu účtu Ring. Pokud nejste připraveni si heslo zvolit, můžete Ring zavřít a pokračovat v převodu později."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Heslo:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Převést účet"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Převádím účet…"
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Účet se nepovedlo převést. Zkuste to znovu."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Zvolte si uživatelské jméno Ring"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Ring má nyní decentralizovaný registr uživatelských jmen. To znamená, že teď můžete kontaktovat přátele pomocí jejich uživatelského jména místo jejich RingID. Registr je distribuovaný a všichni uživatelé do něj mohou nahlédnout."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Zaregistrovat uživatelské jméno později"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -909,7 +882,7 @@
 
 #: ui/accountvideotab.ui:98
 msgid "Video Codecs"
-msgstr ""
+msgstr "Obrazové kodeky"
 
 #: ui/accountview.ui:42 ui/accountview.ui:45
 msgid "Remove selected account"
@@ -955,7 +928,11 @@
 msgid "Place call"
 msgstr "Volat"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Odeslat"
 
@@ -1038,7 +1015,7 @@
 
 #: ui/editcontactview.ui:32
 msgid "Contact name"
-msgstr "Jméno kontaktu"
+msgstr "Název kontaktu"
 
 #: ui/editcontactview.ui:47
 msgid "Select how this number will be categorized"
@@ -1196,22 +1173,26 @@
 msgid "Accounts"
 msgstr "Účty"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Konverzace"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historie"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Žádosti o kontakt"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "vložte zde uživatelské jméno"
diff --git a/po/da_DK.po b/po/da_DK.po
index 35ba24a..03366d4 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -1,18 +1,18 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
-# Aputsiak Niels Janussen <aj@isit.gl>, 2016
-# Mikkel Kirkgaard Nielsen <memb_transifex@mikini.dk>, 2016
+# Aputsiak Niels Janussen (Skjalden) <aj@isit.gl>, 2016
+# Mikkel Kirkgaard Nielsen <memb_transifex@mikini.dk>, 2016-2017
 # scootergrisen, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2017-01-08 17:00+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Danish (Denmark) (http://www.transifex.com/savoirfairelinux/ring/language/da_DK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@
 msgid "_Remove server"
 msgstr "_Fjern server"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Værtsnavn"
 
@@ -60,7 +60,7 @@
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Kodeord stemmer ikke overens"
 
@@ -98,39 +98,39 @@
 msgid "auto-generating..."
 msgstr "auto-genererer..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Brugernavn"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Kodeord"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Vis kodeord"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Stedfortræder"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Telefonsvarernummer"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "Navne-service URL"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Svar automatisk opkald"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP aktiveret"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "DTMF-tonetype:"
 
@@ -160,59 +160,59 @@
 msgid "Name"
 msgstr "Navn"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Generelt"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Enheder"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Sikkerhed"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Er du sikker på at du vil slette kontoen \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Ny konto"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Åbn profilbillede"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Annuller"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Åbn"
 
@@ -320,65 +320,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-klient til Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "slår RingID op"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Ugyldigt Ring-brugernavn: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
-msgstr ""
+msgstr "Fejl under hentning af brugernavn, navneserver er muligvis ikke tilgængelig."
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Kunne ikke finde Ring-brugernavnet: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "foretag opkald"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "åbn beskedvindue"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Søg kontakt eller indtast nummer"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
-msgstr ""
+msgstr "Dette er dit Ring-brugernavn.\nKopier og del med dine venner!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Dette er dit RingID.\nKopier og del den med dine venner!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "henter RingID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring er fri software til universel kommunikation som respekterer sine brugeres frihed og privatliv."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "Ring-ID QR-kode"
@@ -425,7 +433,7 @@
 
 #: src/usernameregistrationbox.cpp:319
 msgid "Could not initiate name registration, try again."
-msgstr ""
+msgstr "Kunne ikke påbegynde registrering af navn, prøv igen."
 
 #: src/usernameregistrationbox.cpp:361
 msgid "Register this username on the blockchain"
@@ -615,7 +623,7 @@
 "previous device, choose the Ring Account to use and select \"Link another "
 "device to this account\". You will get the necessary PIN to complete this "
 "form. The PIN is only valid for 10 minutes."
-msgstr ""
+msgstr "For at tilknytte denne enhed til en anden konto, skal du først have en PIN-kode. For at generere en PIN-kode skal du gå ind i konto-indstillinger på en anden enhed, vælge Ring-kontoen du vil bruge og vælge \"Tilknyt en anden enhed til denne konto\". Dette vil generere PIN-koden du skal anvende her. PIN-koden er kun gyldig i 10 minutter."
 
 #: ui/accountcreationwizard.ui:126 ui/accountcreationwizard.ui:215
 #: ui/accountcreationwizard.ui:427
@@ -624,7 +632,7 @@
 
 #: ui/accountcreationwizard.ui:134
 msgid "Okay, I have the PIN!"
-msgstr ""
+msgstr "Okay, jeg har PIN-koden!"
 
 #: ui/accountcreationwizard.ui:172
 msgid "Enter your pin:"
@@ -652,16 +660,16 @@
 
 #: ui/accountcreationwizard.ui:340
 msgid "Register public username (experimental):"
-msgstr ""
+msgstr "Registrer offentligt brugernavn (eksperimentel funktionalitet)"
 
 #: ui/accountcreationwizard.ui:346
 msgid ""
 "By checking this, you will register a unique username on the Ring network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr ""
+msgstr "Ved at markere denne, vil et unikt brugernavn blive registreret på Ring-netværket. Andre kan bruge dette til at kontakte dig med, i stedet for dit RingID, som er 40 tegn langt."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Kodeord (bekræft):"
 
@@ -669,7 +677,7 @@
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
-msgstr ""
+msgstr "Dette kodeord vil blive brugt til at kryptere din kontos data og til at tilknytte nye enheder til din konto."
 
 #: ui/accountcreationwizard.ui:459
 msgid "Generating your Ring account..."
@@ -688,7 +696,7 @@
 msgstr "Fejl ved oprettelse/hentning af konto."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -775,61 +783,25 @@
 msgid "Import"
 msgstr "Import"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Konto-migrering påkrævet"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "De følgende konti skal migreres til det nye Ring-konto-format:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Profil-billede:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "For at fortsætte med migreringen, skal du vælge et kodeord til kontoen. Dette kodeord bruges til at kryptere din hovednøgle. Den skal bruges ved tilnytning af nye enheder til din Ring-konto. Hvis du ikke er klar til at vælge et kodeord, kan du lukke Ring og fortsætte med migreringen senere."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Kodeord:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Migrér konto"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Migrerer konto..."
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Konto-migrering mislykkedes. Prøv igen."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Vælg dit Ring-brugernavn"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Ring har nu et decentralt register med brugernavne. Dette betyder at du kan få forbindelse med dine kontakter ved at anvende deres brugernavne i stedet for RingID. Registeret er distribueret og alle brugere er i stand til at søge i det."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Registrer mit brugernavn senere"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -955,7 +927,11 @@
 msgid "Place call"
 msgstr "Foretag opkald"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Send"
 
@@ -1196,22 +1172,26 @@
 msgid "Accounts"
 msgstr "Konti"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Samtaler"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historie"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Kontaktforespørgsler"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "indtast brugernavn her"
diff --git a/po/de.po b/po/de.po
index f91a74b..cb4ee07 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,10 +1,11 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
 # Botho <botho.willer@gmx.net>, 2016
 # Ettore Atalan <atalanttore@googlemail.com>, 2016
+# nautilusx, 2017
 # M. Utkun Uyar, 2016
 # resajo sceniar <resajo-transifex@munin-soft.de>, 2016
 # rezor92 <rezor92@googlemail.com>, 2016
@@ -16,9 +17,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2017-01-14 16:21+0000\n"
-"Last-Translator: Vincent Bermel <palob@users.noreply.github.com>\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: German (http://www.transifex.com/savoirfairelinux/ring/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +31,7 @@
 msgid "_Remove server"
 msgstr "_Server entfernen"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Rechnername"
 
@@ -66,7 +67,7 @@
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Passwörter stimmen nicht überein"
 
@@ -104,39 +105,39 @@
 msgid "auto-generating..."
 msgstr "Automatische Erstellung..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Benutzername"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Passwort"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Passwort anzeigen"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Nummer des Anrufbeantworters"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "URL des Namensservers"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Anrufe automatisch beantworten"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP aktiviert"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "DTMF-Tontyp:"
 
@@ -166,59 +167,59 @@
 msgid "Name"
 msgstr "Name"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Allgemein"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Geräte"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Sicherheit"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Sind sie sich sicher, den Account \"%s\" löschen zu wollen?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Neues Konto"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Profilbild öffnen"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Öffnen"
 
@@ -279,7 +280,7 @@
 #: src/editcontactview.cpp:185
 msgctxt "Phone number category"
 msgid "home"
-msgstr "home"
+msgstr "Privat"
 
 #: src/generalsettingsview.cpp:102
 msgid ""
@@ -326,65 +327,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-Oberfläche für Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "suche nach der RingID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Ungültiger Ring-Benutzername: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr "Der Benutzername konnte nicht überprüft werden. Möglicherweise ist der Namensserver nicht erreichbar."
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Konnte den Ring-Benutzernamen %s nicht finden"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Anrufen"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Chat öffnen"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Kontakte suchen oder Nummer eingeben"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "Dies ist Ihr Ring-Benutzername.\nTeilen Sie ihn mit Ihren Freunden!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Dies ist Ihre Ring-ID.\nKopieren und teilen Sie sie mit ihren Freunden!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "beziehe Ring-ID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring ist eine Freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "QR-Code Ihrer Ring-ID"
@@ -588,7 +597,7 @@
 
 #: ui/accountaudiotab.ui:75
 msgid "Audio Codecs"
-msgstr ""
+msgstr "Audio Codecs"
 
 #: ui/accountcreationwizard.ui:32
 msgid "Welcome to "
@@ -667,7 +676,7 @@
 "characters long."
 msgstr "Wenn Sie dies anklicken, melden Sie einen einzigartigen Benutzername auf dem Ring-Netzwerk an. Damit können andere Leute Sie kontaktieren und brauchen nicht Ihre 40 Zeichen lange Ring-ID."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Passwort (bestätigen):"
 
@@ -694,7 +703,7 @@
 msgstr "Problem das Konto zu laden/zu erzeugen."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -781,61 +790,25 @@
 msgid "Import"
 msgstr "Import"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Kontomigration erforderlich"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "Diese Konten müssen in das neue Ring-Kontenformat migriert werden:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Aliasname:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Um die Migration fortzusetzen müssen Sie ein Kontopasswort festlegen. Dieses Passwort wird verwendet, um den Hauptschlüssel zu sichern, mit dem neue Geräte zu Ihrem Ring-Konto hinzuzufügt werden können. Wenn Sie momentan kein Passwort festlegen möchten, können Sie Ring beenden und die Migration später fortsetzen."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Passwort:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Konto migrieren"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Konto wird migriert..."
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Fehler beim Migrieren des Kontos. Versuchen Sie es erneut."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Wählen Sie Ihren Ring-Benutzernamen"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Ab jetzt hat Ring ein dezentralisiertes Benutzernamen-Register. Das bedeutet, dass sie Ihre Freunde fortan durch ihre jeweiligen Benutzernamen anstelle der Ring-IDs kontaktieren können. Das Benutzernamen-Register ist dezentralisiert und alle Benutzer können im Register nachschlagen."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Meinen Benutzernamen später registrieren"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -915,7 +888,7 @@
 
 #: ui/accountvideotab.ui:98
 msgid "Video Codecs"
-msgstr ""
+msgstr "Video Codecs"
 
 #: ui/accountview.ui:42 ui/accountview.ui:45
 msgid "Remove selected account"
@@ -961,7 +934,11 @@
 msgid "Place call"
 msgstr "Anrufen"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Senden"
 
@@ -1016,7 +993,7 @@
 
 #: ui/currentcallview.ui:377
 msgid "Toggle show chat"
-msgstr "Chat-Ansicht umschalten"
+msgstr "Chatansicht umschalten"
 
 #: ui/currentcallview.ui:381 ui/currentcallview.ui:398
 msgid "Chat"
@@ -1202,22 +1179,26 @@
 msgid "Accounts"
 msgstr "Konten"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Verlauf"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Kontaktanfragen"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "Benutzername hier eingeben"
diff --git a/po/de_DE.po b/po/de_DE.po
index 45c5e24..ef43273 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: German (Germany) (http://www.transifex.com/savoirfairelinux/ring/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -59,7 +59,7 @@
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -97,39 +97,39 @@
 msgid "auto-generating..."
 msgstr "automatische Erstellen..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Benutzername"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Passwort"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Kennwort anzeigen"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Voicemail-Rufnummer"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP aktiviert"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -159,59 +159,59 @@
 msgid "Name"
 msgstr "Name"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Allgemein"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Sicherheit"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr ""
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr ""
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -319,65 +319,73 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -660,7 +668,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -687,7 +695,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "Okay"
 
@@ -774,60 +782,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Kennwort:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -954,7 +926,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr ""
 
@@ -1195,22 +1171,26 @@
 msgid "Accounts"
 msgstr "Kontos"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Verlauf"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 97d62e3..a58a225 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Greek (http://www.transifex.com/savoirfairelinux/ring/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@
 msgid "_Remove server"
 msgstr "_Απομάκρυνση διακομιστή"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -60,7 +60,7 @@
 msgid "Unknown"
 msgstr "Άγνωστοι"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Οι κωδικοί πρόσβασης δεν ταιριάζουν"
 
@@ -98,39 +98,39 @@
 msgid "auto-generating..."
 msgstr "αυτόματη-παραγωγή..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Σύνθημα"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Εμφάνιση συνθήματος"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Διαμεσολαβητής"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Αριθμός Voicemail"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "URL υπηρεσίας ονομάτων"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Αυτόματη απάντηση κλήσεων"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP ενεργοποιημένο"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Τύπος τόνου DTMF:"
 
@@ -160,59 +160,59 @@
 msgid "Name"
 msgstr "Όνομα"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Γενικά"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Συσκευές"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Ασφάλεια"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Είσαι σίγουρος ότι θέλεις να διαγράψεις τον λογαριασμό  \"%s\";"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Νέος λογαριασμός"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Ψευδώνυμο"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Άνοιγμα εικόνας avatar"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "Άκυρο"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "Άνοιγμα"
 
@@ -320,65 +320,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Πελάτης GNOME για το Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "αναζήτηση RingID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Μη έγκυρο όνομα χρήστη Ring: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Αναζήτηση επαφών ή εισαγωγή αριθμού"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Αυτό είναι το RingID σου.\nΑντέγραψε το και μοιράσου το με τους φίλους σου!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "λήψη του RingID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -661,7 +669,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -688,7 +696,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -775,60 +783,24 @@
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Συνθηματικό:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -955,7 +927,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Αποστολή"
 
@@ -1196,22 +1172,26 @@
 msgid "Accounts"
 msgstr "Λογαριασμοί"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Συνομιλίες"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Ιστορικό"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 82dac36..d944df0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/savoirfairelinux/ring/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr ""
 
@@ -57,7 +57,7 @@
 msgid "Unknown"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -95,39 +95,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -157,59 +157,59 @@
 msgid "Name"
 msgstr "Name"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr ""
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr ""
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr ""
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr ""
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr ""
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr ""
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr ""
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -317,65 +317,73 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -658,7 +666,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -685,7 +693,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -772,60 +780,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -952,7 +924,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr ""
 
@@ -1193,22 +1169,26 @@
 msgid "Accounts"
 msgstr ""
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr ""
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr ""
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr ""
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 01fe6e2..5b64f6d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Esperanto (http://www.transifex.com/savoirfairelinux/ring/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@
 msgid "_Remove server"
 msgstr "_Forigi servilon"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Nomo de gastiga komputilo"
 
@@ -60,7 +60,7 @@
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Pasvortoj ne kongruas"
 
@@ -98,39 +98,39 @@
 msgid "auto-generating..."
 msgstr "aŭtomate generanta..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Uzantnomo"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Pasvorto"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Montru pasvorton"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Prokura servilo"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Parolita mesaĝo"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "URL de noma servo"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Aŭtomate respondi vokojn"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP ŝaltita"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Tipo de du-tona multfrekvenco:"
 
@@ -160,59 +160,59 @@
 msgid "Name"
 msgstr "Nomo"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Ĝenerala"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Aparatoj"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Sekurigo"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Speciala"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Ĉu vi certe volas forigi la konton \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nova konto"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Ŝaltita"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Kaŝnomo"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Stato"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Malfermi Profilbildon"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Rezigni"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Malfermi"
 
@@ -320,65 +320,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME kliento por Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "serĉanta RingID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Nevalida Ring uzantnomo: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Ne eblis trakti Ring uzantnomon: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "voki"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "malfermi babilejon"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Serĉu kontaktojn aŭ entajpu numeron"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Tio ĉi estas via RingID.\nKopiu kaj kunhavigu ĝin kun viaj amikoj!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "alportanta RingID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring estas libera programo por universala komunikado, kiu respektas liberon kaj privatecon de siaj uzantoj."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -661,7 +669,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Pasvorto (denove):"
 
@@ -688,7 +696,7 @@
 msgstr "Eraro kreante/ŝarĝante konton."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "Okej"
 
@@ -775,61 +783,25 @@
 msgid "Import"
 msgstr "Enporti"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Konta migrigo bezonata"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "La sekvanta konto bezonas migrigon en la novan formaton de Ring kontoj:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Kaŝnomo:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Profilbildo:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Por progresigi la migrigon, vi elektu pasvorton por via konto. Tiu ĉi pasvorto uzatos por ĉifrado de via ĉefa ŝlosilo. Ĝi bezonatos aldonante novajn aparatojn al via Ring konto. Se vi ne pretas elekti pasvorton, vi povas fermi Ring kaj daŭrigi la mirgigon poste."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Pasvorto:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Migrigi konton"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Migriganta konton..."
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Migrigo de konto malsukcesis. Provu denove."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Elektu vian Ring uzantnomon"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Nuntempe Ring havas disan uzantnoman registrejon. Tio signifas, ke vi povas kontakti viajn amikojn per iliaj uzantnomoj anstataŭ iliaj RingID-oj. La uzantnoma registrejo estas disa kaj ĉiuj uzantoj povas ĝin uzi."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Registru mian uzantnomon poste"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -955,7 +927,11 @@
 msgid "Place call"
 msgstr "Voki"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Sendi"
 
@@ -1196,22 +1172,26 @@
 msgid "Accounts"
 msgstr "Kontoj"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Agordoj"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Konversacioj"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historio"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "enigu uzantnomon ĉi tien"
diff --git a/po/es.po b/po/es.po
index 6dff1b8..3ce5942 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -20,9 +20,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-20 00:20+0000\n"
-"Last-Translator: Laura Arjona Reina <larjona@larjona.net>\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Spanish (http://www.transifex.com/savoirfairelinux/ring/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +34,7 @@
 msgid "_Remove server"
 msgstr "Quita_r servidor"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Nombre del host"
 
@@ -70,7 +70,7 @@
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Las contraseñas no coinciden"
 
@@ -108,39 +108,39 @@
 msgid "auto-generating..."
 msgstr "auto-generando..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Mostrar contraseña"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Número de Mensaje de Voz"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "URL del servicio de nombres"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Respuesta automática de llamadas"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP habilitado"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Tipo de tono DTMF"
 
@@ -170,59 +170,59 @@
 msgid "Name"
 msgstr "Nombre"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "General"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Seguridad"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "¿Está seguro de querer eliminar la cuenta \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nueva cuenta"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Estado"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Abrir imagen de avatar"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -330,65 +330,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Cliente Gnome para Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "buscando el RingID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Usuario Ring no válido: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr "Error en la resolución del nombre de usario, el nombre del servidor puede ser inaccesible."
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "No se pudo encontrar el usuario Ring: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "llamar"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Abrir chat"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Buscar contacto o introducir número"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "Este es tu nombre de usuario en Ring.\n¡Cópialo y compártelo con tus amigos!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Este es tu RingID.\n¡Cópialo y compártelo con tus amigos!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "Buscando RingID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring es software libre de comunicaciones que respeta las libertades y privacidad de sus usuarios."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "Código QR identificador Ring"
@@ -671,7 +679,7 @@
 "characters long."
 msgstr "Al marcar aquí, estarás registrando un nombre de usuario único en la red de Ring. Otras personas podrán utilizarlo para llamarte sin tener que utilizar tu identificador en Ring, RingID, de 40 caracteres."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Contraseña (confirmar):"
 
@@ -698,7 +706,7 @@
 msgstr "Error creando o cargando la cuenta."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -785,61 +793,25 @@
 msgid "Import"
 msgstr "Importar"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Es precisa la migración de la cuenta"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "La siguiente cuenta debe migrar al nuevo formato de cuenta Ring:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Para comenzar la migración debes escoger una contraseña para tu cuenta. Esta contraseña cifrará tu clave principal y será necesaria para añadir dispositivos a tu cuenta Ring. Si no estás listo para escoger una contraseña puedes cerrar el programa y retomarlo más adelante."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Contraseña:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Migrar cuenta"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Migrando cuenta..."
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Error al migrar la cuenta. Inténtalo de nuevo"
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Elige tu nombre de usuario Ring"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Ring ahora dispone de un registro de nombres descentralizado. Esto significa que puedes contactar con tus amigos usando sus nombres de usuario en lugar de los RingID. Todos los usuarios pueden consultar dicho registro."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Registrar mi nombre de usuario más tarde"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -965,7 +937,11 @@
 msgid "Place call"
 msgstr "Llamar"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Enviar"
 
@@ -1206,22 +1182,26 @@
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Configuración"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Conversaciones"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Contactos"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historial"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Solicitudes de contacto"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "escribe el nombre de usuario aquí"
diff --git a/po/et_EE.po b/po/et_EE.po
new file mode 100644
index 0000000..a46d084
--- /dev/null
+++ b/po/et_EE.po
@@ -0,0 +1,1198 @@
+# Gettext PO translation template file for the GNOME client of the Ring project.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
+# This file is distributed under the same license as the Ring package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Ring\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/savoirfairelinux/ring/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/accountadvancedtab.cpp:389
+msgid "_Remove server"
+msgstr ""
+
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
+msgid "Hostname"
+msgstr ""
+
+#: src/accountadvancedtab.cpp:510 ui/accountadvancedtab.ui:314
+msgid "Port"
+msgstr ""
+
+#: src/accountaudiotab.cpp:175 src/accountvideotab.cpp:184
+msgid "Enabled"
+msgstr ""
+
+#: src/accountaudiotab.cpp:181
+msgctxt "Name of the codec"
+msgid "Name"
+msgstr "Nimi"
+
+#: src/accountaudiotab.cpp:185 src/accountvideotab.cpp:194
+msgid "Bitrate"
+msgstr ""
+
+#: src/accountaudiotab.cpp:189
+msgid "Samplerate"
+msgstr ""
+
+#: src/accountcreationwizard.cpp:240
+msgid ""
+"Your account was created, but we could not register your username. Try again"
+" from the settings menu."
+msgstr ""
+
+#: src/accountcreationwizard.cpp:283
+msgctxt "The default username / account alias, if none is set by the user"
+msgid "Unknown"
+msgstr ""
+
+#: src/accountcreationwizard.cpp:461
+msgid "Passwords don't match"
+msgstr ""
+
+#: src/accountdevicestab.cpp:195 src/usernameregistrationbox.cpp:404
+msgid "Bad password"
+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 "Nimi"
+
+#: src/accountdevicestab.cpp:251
+msgctxt "Device ID Column"
+msgid "ID"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:201
+msgid "Alias"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:212
+msgid "Type"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:238
+msgid "auto-generating..."
+msgstr ""
+
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
+msgid "Username"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:287
+msgid "Password"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:300
+msgid "Show password"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:306
+msgid "Proxy"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:316
+msgid "Voicemail number"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:328
+msgid "Name service URL"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:341
+msgid "Auto-answer calls"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:349
+msgid "UPnP enabled"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:357
+msgid "DTMF tone type:"
+msgstr ""
+
+#: src/accountimportexportview.cpp:99
+msgid "Select account export location"
+msgstr ""
+
+#: src/accountimportexportview.cpp:102 ui/accountcreationwizard.ui:82
+#: ui/accountdevicestab.ui:135 ui/accountimportexportview.ui:161
+msgid "Cancel"
+msgstr ""
+
+#: src/accountimportexportview.cpp:104
+msgid "Select"
+msgstr ""
+
+#: src/accountimportexportview.cpp:211
+msgid "Error importing account(s)"
+msgstr ""
+
+#: src/accountimportexportview.cpp:263
+msgid "Error exporting account(s)"
+msgstr ""
+
+#: src/accountvideotab.cpp:190
+msgctxt "The name of the codec"
+msgid "Name"
+msgstr "Nimi"
+
+#: src/accountview.cpp:167
+msgctxt "Account settings"
+msgid "General"
+msgstr ""
+
+#: src/accountview.cpp:175
+msgctxt "Account settings"
+msgid "Devices"
+msgstr ""
+
+#: src/accountview.cpp:181
+msgctxt "Account settings"
+msgid "Security"
+msgstr ""
+
+#: src/accountview.cpp:186
+msgctxt "Account settings"
+msgid "Advanced"
+msgstr ""
+
+#: src/accountview.cpp:241
+#, c-format
+msgid "Are you sure you want to delete account \"%s\"?"
+msgstr ""
+
+#: src/accountview.cpp:368
+msgid "New Account"
+msgstr ""
+
+#: src/accountview.cpp:518
+msgctxt "Account state column"
+msgid "Enabled"
+msgstr ""
+
+#: src/accountview.cpp:524
+msgctxt "Account alias (name) column"
+msgid "Alias"
+msgstr ""
+
+#: src/accountview.cpp:532
+msgctxt "Account status column"
+msgid "Status"
+msgstr ""
+
+#: src/avatarmanipulation.cpp:380
+msgid "Open Avatar Image"
+msgstr ""
+
+#: src/avatarmanipulation.cpp:383
+msgid "_Cancel"
+msgstr ""
+
+#: src/avatarmanipulation.cpp:385
+msgid "_Open"
+msgstr ""
+
+#: src/backends/edscontactbackend.cpp:193
+msgid "Unknown EDS addressbook"
+msgstr ""
+
+#: src/backends/edscontactbackend.cpp:213
+msgctxt "Backend type"
+msgid "Contacts"
+msgstr ""
+
+#: src/contactpopupmenu.cpp:82
+#, c-format
+msgid ""
+"Are you sure you want to delete contact \"%s\"? It will be removed from your"
+" system's addressbook."
+msgstr ""
+
+#: src/contactpopupmenu.cpp:114
+msgid "_Call"
+msgstr ""
+
+#: src/contactpopupmenu.cpp:117
+msgid "_Copy name"
+msgstr ""
+
+#: src/contactpopupmenu.cpp:120
+msgid "_Copy number"
+msgstr ""
+
+#: src/contactpopupmenu.cpp:123
+msgid "_Add to contact"
+msgstr ""
+
+#: src/contactpopupmenu.cpp:126
+msgid "_Remove contact"
+msgstr ""
+
+#: src/dialogs.c:53
+msgid "Working..."
+msgstr ""
+
+#: src/dialogs.c:84
+#, c-format
+msgctxt "Do not translate the release name nor the status (beta, final, ...)"
+msgid ""
+"Gaston Miron - Beta 2\n"
+"built on %.25s"
+msgstr ""
+
+#: src/dialogs.c:132
+msgid ""
+"The GNOME client for Ring.\n"
+"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
+
+#: src/editcontactview.cpp:185
+msgctxt "Phone number category"
+msgid "home"
+msgstr ""
+
+#: src/generalsettingsview.cpp:102
+msgid ""
+"This is a destructive operation. Are you sure you want to delete all of your"
+" chat and call history?"
+msgstr ""
+
+#: src/historyview.cpp:293
+msgctxt "Call history"
+msgid "Call"
+msgstr ""
+
+#: src/historyview.cpp:338
+msgctxt "Call history"
+msgid "Date"
+msgstr ""
+
+#: src/ringnotify.cpp:148
+msgid "Incoming call"
+msgstr ""
+
+#: src/ringnotify.cpp:165 src/ringnotify.cpp:343
+msgctxt "notification action name"
+msgid "Show"
+msgstr ""
+
+#: src/ringnotify.cpp:267
+#, c-format
+msgctxt "Text message notification"
+msgid "%s says:"
+msgstr ""
+
+#: src/ring_client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/ring_client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/ring_client_options.c:85
+msgid "- GNOME client for Ring"
+msgstr ""
+
+#: src/ringmainwindow.cpp:613
+#, c-format
+msgid "Invalid Ring username: %s"
+msgstr ""
+
+#: src/ringmainwindow.cpp:628
+msgid "Error resolving username, nameserver is possibly unreachable"
+msgstr ""
+
+#: src/ringmainwindow.cpp:642
+#, c-format
+msgid "Could not resolve Ring username: %s"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1150
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1152
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Search contacts or enter number"
+msgstr ""
+
+#: src/ringwelcomeview.cpp:75
+msgid ""
+"This is your Ring username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/ringwelcomeview.cpp:83
+msgctxt "Do not translate \"RingID\""
+msgid ""
+"This is your RingID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/ringwelcomeview.cpp:90
+msgid "fetching RingID..."
+msgstr ""
+
+#: src/ringwelcomeview.cpp:148
+msgid ""
+"Ring is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/ringwelcomeview.cpp:202
+msgctxt "Do not translate \"Ring ID\""
+msgid "Ring ID QR code"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:128
+msgid "The entered username is not available"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:129
+msgid "Username is not available"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:138
+msgid "The entered username is not valid"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:139
+msgid "Username is not valid"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:148
+msgid "The entered username is available"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:149
+msgid "Username is available"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:158
+msgid "Failed to perform lookup"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:159
+msgid "Could not lookup username"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:248
+msgid "Looking up username availability..."
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:310 ui/accountcreationwizard.ui:485
+msgid "Registering username..."
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:319
+msgid "Could not initiate name registration, try again."
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:361
+msgid "Register this username on the blockchain"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:397
+msgid "Invalid username"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:411
+msgid "Username already taken"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:418
+msgid "Network error"
+msgstr ""
+
+#: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
+msgctxt "Name of error window (dialog)"
+msgid "Ring Error"
+msgstr ""
+
+#: src/native/dbuserrorhandler.cpp:57
+msgid "Trying to reconnect to the Ring daemon (dring)..."
+msgstr ""
+
+#: src/native/dbuserrorhandler.cpp:87
+msgid ""
+"Could not re-connect to the Ring daemon (dring).\n"
+"Ring will now quit."
+msgstr ""
+
+#: src/video/video_widget.cpp:525
+msgid "Share screen area"
+msgstr ""
+
+#: src/video/video_widget.cpp:535
+msgid "Share file"
+msgstr ""
+
+#: src/video/video_widget.cpp:549
+msgid "Show advanced information"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:81
+msgid "Registration expire timeout (seconds):"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:103
+msgid "Allow calls from unknown peers"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:117
+msgid "Allow calls from peers in your call history"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:131
+msgid "Allow calls from peers in your contacts list"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:149
+msgid "Registration"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:178
+msgid "Use random port"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:199
+msgid "Local port:"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:225
+msgid "Network Interface"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:253
+msgid "Same as local parameters"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:268
+msgid "Set published address and port:"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:292
+msgid "Address"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:340
+msgid "Use STUN"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:363 ui/accountadvancedtab.ui:412
+msgid "server URL"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:389
+msgid "Use TURN"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:434
+msgid "username"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:455
+msgid "password"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:479
+msgid "realm"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:508
+msgid "Published Address"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:536
+msgid "Bootstrap Servers"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:593
+msgid ""
+"These settings are only used during SDP session negotiation in case ICE is "
+"not supported by the server or peer."
+msgstr ""
+
+#: ui/accountadvancedtab.ui:618 ui/accountadvancedtab.ui:694
+msgid "Min"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:641 ui/accountadvancedtab.ui:717
+msgid "Max"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:665
+msgid "Audio RTP Port Range"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:741
+msgid "Video RTP Port Range"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:759
+msgid "SDP Session Negotiation (ICE Fallback)"
+msgstr ""
+
+#: ui/accountaudiotab.ui:57 ui/accountvideotab.ui:80
+msgid "Up"
+msgstr "Üles"
+
+#: ui/accountaudiotab.ui:64 ui/accountvideotab.ui:87
+msgid "Down"
+msgstr "Alla"
+
+#: ui/accountaudiotab.ui:75
+msgid "Audio Codecs"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:32
+msgid "Welcome to "
+msgstr ""
+
+#: ui/accountcreationwizard.ui:66
+msgid "Create Ring Account"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:67
+msgid "Create a new Ring account (for new users)"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:74
+msgid "Link this device to an account"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:75
+msgid "Link this devices to a Ring account created on another device"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:103 ui/accountcreationwizard.ui:157
+msgid "Link this device to an existing account"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:118
+msgid ""
+"To link this device to another account, you first need to obtain a PIN code."
+" To generate the pin code, go to the account management setting of a "
+"previous device, choose the Ring Account to use and select \"Link another "
+"device to this account\". You will get the necessary PIN to complete this "
+"form. The PIN is only valid for 10 minutes."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:126 ui/accountcreationwizard.ui:215
+#: ui/accountcreationwizard.ui:427
+msgid "Previous"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:134
+msgid "Okay, I have the PIN!"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:172
+msgid "Enter your pin:"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:191
+msgid "Enter your password:"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:223 ui/accountcreationwizard.ui:435
+msgid "Next"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:265
+msgid "Profile"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:285
+msgid "Full name:"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:327
+msgid "Ring Account"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:340
+msgid "Register public username (experimental):"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:346
+msgid ""
+"By checking this, you will register a unique username on the Ring network. "
+"People can use it to contact you instead of using your RingID, which is 40 "
+"characters long."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:369
+msgid "Password (confirm):"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:370
+msgid ""
+"This password will be used to encrypt your account data and to link new "
+"devices to your account."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:459
+msgid "Generating your Ring account..."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:492
+msgid "This may take a few minutes."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:518
+msgid "Retrieving your Ring account..."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:544
+msgid "Error creating/loading account."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
+#: ui/accountdevicestab.ui:239
+msgid "OK"
+msgstr ""
+
+#: ui/accountdevicestab.ui:21
+msgid "My Device ID:"
+msgstr ""
+
+#: ui/accountdevicestab.ui:40
+msgid "Devices"
+msgstr ""
+
+#: ui/accountdevicestab.ui:66
+msgid "Add device"
+msgstr ""
+
+#: ui/accountdevicestab.ui:83
+msgid "Add New Device"
+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 ui/accountimportexportview.ui:111
+msgid "Password (required):"
+msgstr ""
+
+#: ui/accountdevicestab.ui:118 ui/accountimportexportview.ui:126
+msgid "Enter archive password"
+msgstr ""
+
+#: 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/accountgeneraltab.ui:42
+msgid "Account"
+msgstr ""
+
+#: ui/accountgeneraltab.ui:82
+msgid "Parameters"
+msgstr ""
+
+#: ui/accountimportexportview.ui:14
+msgid "Export selected account"
+msgstr ""
+
+#: ui/accountimportexportview.ui:26
+msgid "Import accounts"
+msgstr ""
+
+#: ui/accountimportexportview.ui:49
+msgid "Location:"
+msgstr ""
+
+#: ui/accountimportexportview.ui:70
+msgid "choose location"
+msgstr ""
+
+#: ui/accountimportexportview.ui:76
+msgid "Choose export location"
+msgstr ""
+
+#: ui/accountimportexportview.ui:95
+msgid "Choose archive location"
+msgstr ""
+
+#: ui/accountimportexportview.ui:169 ui/accountview.ui:110
+msgid "Export"
+msgstr ""
+
+#: ui/accountimportexportview.ui:181 ui/accountview.ui:103
+msgid "Import"
+msgstr ""
+
+#: ui/accountmigrationview.ui:14
+msgid "Account migration required"
+msgstr ""
+
+#: ui/accountmigrationview.ui:39
+msgid "Alias:"
+msgstr ""
+
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
+
+#: ui/accountmigrationview.ui:129
+msgid "Migrate account"
+msgstr ""
+
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:37
+msgid "Encrypt media streams (SRTP)"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:58
+msgid "Key exchange protocol"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:76
+msgid "Fallback on RTP on encryption failure"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:94
+msgid "Media Stream Encryption"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:123
+msgid "Encrypt negotiation (TLS)"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:148
+msgid "CA certificate"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:185
+msgid "User certificate"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:222
+msgid "Private key"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:245
+msgid "Private key password"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:292
+msgid "TLS protocol method"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:315
+msgid "Outgoing TLS server name"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:337
+msgid "Negotiation timeout (seconds)"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:371
+msgid "Use default ciphers"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:387
+msgid "Use custom cipher list"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:444
+msgid "Verify incoming certificates (server side)"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:459
+msgid "Verify answer certificates (client side)"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:474
+msgid "Require a certificate for incoming TLS connections"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:493
+msgid "Negotiation Encryption"
+msgstr ""
+
+#: ui/accountvideotab.ui:50
+msgid "Enable Video"
+msgstr ""
+
+#: ui/accountvideotab.ui:98
+msgid "Video Codecs"
+msgstr ""
+
+#: ui/accountview.ui:42 ui/accountview.ui:45
+msgid "Remove selected account"
+msgstr ""
+
+#: ui/accountview.ui:63 ui/accountview.ui:66
+msgid "Add new account"
+msgstr ""
+
+#: ui/accountview.ui:75 ui/accountview.ui:78
+msgid "Select account type"
+msgstr ""
+
+#: ui/accountview.ui:104
+msgid "Import archived account(s)"
+msgstr ""
+
+#: ui/accountview.ui:112
+msgid "Export selected account(s)"
+msgstr ""
+
+#: ui/avatarmanipulation.ui:92 ui/avatarmanipulation.ui:125
+msgid "Take photo"
+msgstr ""
+
+#: ui/avatarmanipulation.ui:102
+msgid "Choose image from file"
+msgstr ""
+
+#: ui/avatarmanipulation.ui:135 ui/avatarmanipulation.ui:168
+msgid "Return"
+msgstr ""
+
+#: ui/avatarmanipulation.ui:158
+msgid "Set selection as image"
+msgstr ""
+
+#: ui/chatview.ui:19 ui/chatview.ui:22
+msgid "Hide chat view"
+msgstr ""
+
+#: ui/chatview.ui:45 ui/chatview.ui:48
+msgid "Place call"
+msgstr ""
+
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
+msgid "Send"
+msgstr ""
+
+#: ui/choosecontactview.ui:34
+msgid "Create New"
+msgstr ""
+
+#: ui/currentcallview.ui:247
+msgid "End this call"
+msgstr ""
+
+#: ui/currentcallview.ui:251 ui/currentcallview.ui:434
+msgid "End call"
+msgstr ""
+
+#: ui/currentcallview.ui:269
+msgid "Toggle hold"
+msgstr ""
+
+#: ui/currentcallview.ui:273 ui/currentcallview.ui:295
+#: ui/currentcallview.ui:425
+msgid "Hold"
+msgstr ""
+
+#: ui/currentcallview.ui:291
+msgid "Toggle mute audio"
+msgstr ""
+
+#: ui/currentcallview.ui:313
+msgid "Toggle mute video"
+msgstr ""
+
+#: ui/currentcallview.ui:317 ui/currentcallview.ui:416
+msgid "Mute video"
+msgstr ""
+
+#: ui/currentcallview.ui:336
+msgid "Toggle record audio"
+msgstr ""
+
+#: ui/currentcallview.ui:339
+msgid "Record audio"
+msgstr ""
+
+#: ui/currentcallview.ui:356
+msgid "Adjust outgoing video quality"
+msgstr ""
+
+#: ui/currentcallview.ui:361 ui/currentcallview.ui:443
+msgid "Video quality"
+msgstr ""
+
+#: ui/currentcallview.ui:377
+msgid "Toggle show chat"
+msgstr ""
+
+#: ui/currentcallview.ui:381 ui/currentcallview.ui:398
+msgid "Chat"
+msgstr ""
+
+#: ui/currentcallview.ui:407
+msgid "Mute audio"
+msgstr ""
+
+#: ui/currentcallview.ui:452
+msgid "Record"
+msgstr "Salvestus"
+
+#: ui/editcontactview.ui:12
+msgid "Select addressbook"
+msgstr ""
+
+#: ui/editcontactview.ui:15
+msgid "Addressbook"
+msgstr ""
+
+#: ui/editcontactview.ui:29
+msgid "Name"
+msgstr "Nimi"
+
+#: ui/editcontactview.ui:32
+msgid "Contact name"
+msgstr ""
+
+#: ui/editcontactview.ui:47
+msgid "Select how this number will be categorized"
+msgstr ""
+
+#: ui/editcontactview.ui:50
+msgid "Number category"
+msgstr ""
+
+#: ui/editcontactview.ui:66
+msgid "Number or Ring ID to be added"
+msgstr ""
+
+#: ui/editcontactview.ui:72
+msgid "Number or Ring ID"
+msgstr ""
+
+#: ui/editcontactview.ui:83
+msgid "Save"
+msgstr ""
+
+#: ui/generalsettingsview.ui:32
+msgid "Profile Settings"
+msgstr ""
+
+#: ui/generalsettingsview.ui:74
+msgid "Ring Settings"
+msgstr ""
+
+#: ui/generalsettingsview.ui:90
+msgid "Start Ring on login"
+msgstr ""
+
+#: ui/generalsettingsview.ui:98
+msgid "Show Ring icon in the notification area (systray)."
+msgstr ""
+
+#: ui/generalsettingsview.ui:106
+msgid "Bring Ring to the foreground on incoming calls."
+msgstr ""
+
+#: ui/generalsettingsview.ui:114
+msgid "Enable notifications for incoming calls."
+msgstr ""
+
+#: ui/generalsettingsview.ui:122
+msgid "Enable notifications for new chat messages."
+msgstr ""
+
+#: ui/generalsettingsview.ui:130
+msgid "Entering a number in the search entry will place a new call."
+msgstr ""
+
+#: ui/generalsettingsview.ui:143
+msgid "Show chat on the right."
+msgstr ""
+
+#: ui/generalsettingsview.ui:149
+msgid "Show chat on the bottom."
+msgstr ""
+
+#: ui/generalsettingsview.ui:171
+msgid "History Settings"
+msgstr ""
+
+#: ui/generalsettingsview.ui:189
+msgid "Keep history for (days):"
+msgstr ""
+
+#: ui/generalsettingsview.ui:210
+msgid "(set to 0 for unlimited history)"
+msgstr ""
+
+#: ui/generalsettingsview.ui:219
+msgid "Clear all history"
+msgstr ""
+
+#: ui/incomingcallview.ui:105
+msgid "Incoming..."
+msgstr ""
+
+#: ui/incomingcallview.ui:133
+msgid "   Accept"
+msgstr ""
+
+#: ui/incomingcallview.ui:148
+msgid "   Reject"
+msgstr ""
+
+#: ui/incomingcallview.ui:163
+msgid "   Hang-up"
+msgstr ""
+
+#: ui/mediasettingsview.ui:24
+msgid "Audio Settings"
+msgstr ""
+
+#: ui/mediasettingsview.ui:40
+msgid "Audio manager:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:52
+msgid "Ringtone device:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:64
+msgid "Output device:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:76
+msgid "Input device:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:134
+msgid "Camera Settings"
+msgstr ""
+
+#: ui/mediasettingsview.ui:150
+msgid "Device:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:162
+msgid "Channel:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:174
+msgid "Resolution:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:186
+msgid "Frame rate:"
+msgstr ""
+
+#: ui/ringgearsmenu.ui:13
+msgid "_About"
+msgstr ""
+
+#: ui/ringgearsmenu.ui:19
+msgid "_Quit"
+msgstr ""
+
+#: ui/ringmainwindow.ui:17
+msgid "Menu"
+msgstr ""
+
+#: ui/ringmainwindow.ui:51
+msgid "General"
+msgstr ""
+
+#: ui/ringmainwindow.ui:61
+msgid "Media"
+msgstr ""
+
+#: ui/ringmainwindow.ui:72
+msgid "Accounts"
+msgstr ""
+
+#: ui/ringmainwindow.ui:102
+msgid "Settings"
+msgstr ""
+
+#: ui/ringmainwindow.ui:206
+msgid "Conversations"
+msgstr ""
+
+#: ui/ringmainwindow.ui:228
+msgid "Contacts"
+msgstr ""
+
+#: ui/ringmainwindow.ui:250
+msgid "History"
+msgstr ""
+
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
+#: ui/usernameregistrationbox.ui:12
+msgid "enter username here"
+msgstr ""
+
+#: ui/usernameregistrationbox.ui:24
+msgid "Register"
+msgstr ""
diff --git a/po/fa_IR.po b/po/fa_IR.po
index 4d1d4bf..b9a28a6 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -1,18 +1,18 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
 # Amin Mahmudian, 2017
-# Danial Behzadi <dani.behzi@ubuntu.com>, 2016
+# Danial Behzadi <dani.behzi@ubuntu.com>, 2016-2017
 # Hessam Shahpouri, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2017-01-16 10:03+0000\n"
-"Last-Translator: Amin Mahmudian\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/savoirfairelinux/ring/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@
 msgid "_Remove server"
 msgstr "_برداشتن کارساز"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "نام هاست"
 
@@ -60,7 +60,7 @@
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "گذرواژه‌ها یکسان نیستند"
 
@@ -98,39 +98,39 @@
 msgid "auto-generating..."
 msgstr "تولید خودکار..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "نام کاربری"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "گذرواژه"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "نمایش گذرواژه"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "پراکسی"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "شماره پست صوتی"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "نشانی اینترنتی خدمت نام"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "پاسخگویی خودکار تماس‌ها"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP فعال شد"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "نوع تون DTMF"
 
@@ -160,59 +160,59 @@
 msgid "Name"
 msgstr "نام"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "همگانی"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "افزاره‌ها"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "امنیت"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "آیا مایل به حذف حساب « %s » هستید؟"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "حساب جدید"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "فعال"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "نام مستعار"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "وضعیت"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "گشودن تصویر آواتار"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_لغو"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_گشودن"
 
@@ -320,65 +320,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- نرم‌افزار Ring تحت GNOME"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "نام‌کاربری رینگ نامعتبر: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "گشودن گپ"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "این نام کاربری رینگ شماست.\nکپی‌اش کنید و با دوستان‌تان به اشتراک بگذارید!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "این آی‌دی رینگ شماست.\nکپی‌اش کنید و با دوستان‌تان به اشتراک بگذارید!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "رینگ یک نرم‌افزار ارتباطات عمومی است که به آزادی‌ها و حریم شخصی کاربرانش احترام می‌گذارد."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -446,7 +454,7 @@
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
-msgstr ""
+msgstr "خطای رینگ"
 
 #: src/native/dbuserrorhandler.cpp:57
 msgid "Trying to reconnect to the Ring daemon (dring)..."
@@ -464,11 +472,11 @@
 
 #: src/video/video_widget.cpp:535
 msgid "Share file"
-msgstr ""
+msgstr "هم‌رسانی پرونده"
 
 #: src/video/video_widget.cpp:549
 msgid "Show advanced information"
-msgstr ""
+msgstr "نمایش اطّلاعات پیشرفته"
 
 #: ui/accountadvancedtab.ui:81
 msgid "Registration expire timeout (seconds):"
@@ -496,7 +504,7 @@
 
 #: ui/accountadvancedtab.ui:199
 msgid "Local port:"
-msgstr ""
+msgstr "درگاه محلّی:"
 
 #: ui/accountadvancedtab.ui:225
 msgid "Network Interface"
@@ -504,7 +512,7 @@
 
 #: ui/accountadvancedtab.ui:253
 msgid "Same as local parameters"
-msgstr ""
+msgstr "همانند پارامتر‌های محلی"
 
 #: ui/accountadvancedtab.ui:268
 msgid "Set published address and port:"
@@ -516,7 +524,7 @@
 
 #: ui/accountadvancedtab.ui:340
 msgid "Use STUN"
-msgstr ""
+msgstr "از STUN استفاده کن"
 
 #: ui/accountadvancedtab.ui:363 ui/accountadvancedtab.ui:412
 msgid "server URL"
@@ -582,7 +590,7 @@
 
 #: ui/accountaudiotab.ui:75
 msgid "Audio Codecs"
-msgstr ""
+msgstr "رمزینه‌های صوتی"
 
 #: ui/accountcreationwizard.ui:32
 msgid "Welcome to "
@@ -620,7 +628,7 @@
 #: ui/accountcreationwizard.ui:126 ui/accountcreationwizard.ui:215
 #: ui/accountcreationwizard.ui:427
 msgid "Previous"
-msgstr ""
+msgstr "پیشین"
 
 #: ui/accountcreationwizard.ui:134
 msgid "Okay, I have the PIN!"
@@ -636,7 +644,7 @@
 
 #: ui/accountcreationwizard.ui:223 ui/accountcreationwizard.ui:435
 msgid "Next"
-msgstr ""
+msgstr "بعدی"
 
 #: ui/accountcreationwizard.ui:265
 msgid "Profile"
@@ -644,7 +652,7 @@
 
 #: ui/accountcreationwizard.ui:285
 msgid "Full name:"
-msgstr ""
+msgstr "نام کامل:"
 
 #: ui/accountcreationwizard.ui:327
 msgid "Ring Account"
@@ -661,7 +669,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -688,7 +696,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "خب"
 
@@ -775,60 +783,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "گذرواژه:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "نام کاربری رینگ خود را انتخاب کنید"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -853,11 +825,11 @@
 
 #: ui/accountsecuritytab.ui:148
 msgid "CA certificate"
-msgstr ""
+msgstr "گواهی CA"
 
 #: ui/accountsecuritytab.ui:185
 msgid "User certificate"
-msgstr ""
+msgstr "گواهی کاربر"
 
 #: ui/accountsecuritytab.ui:222
 msgid "Private key"
@@ -869,7 +841,7 @@
 
 #: ui/accountsecuritytab.ui:292
 msgid "TLS protocol method"
-msgstr ""
+msgstr "پروتکل روش TLS"
 
 #: ui/accountsecuritytab.ui:315
 msgid "Outgoing TLS server name"
@@ -955,10 +927,14 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
-msgid "Send"
+#: ui/chatview.ui:60
+msgid "Send invitation"
 msgstr ""
 
+#: ui/chatview.ui:122
+msgid "Send"
+msgstr "ارسال"
+
 #: ui/choosecontactview.ui:34
 msgid "Create New"
 msgstr ""
@@ -1196,22 +1172,26 @@
 msgid "Accounts"
 msgstr "حساب‌ها"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "مخاطبین"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "تاریخچه"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "درخواست‌های تماس"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 9f6228f..d409aeb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Finnish (http://www.transifex.com/savoirfairelinux/ring/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Yhteysosoite"
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Salasanat eivät täsmää"
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr "automaattinen generointi..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Salasana"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Näytä salasana"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Välityspalvelin"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Vastaajan numero"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Automaattivastaus"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP päällä"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "Nimi"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Yleiset"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Turvallisuus"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Edistyneet asetukset"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Oletko varma että haluat poistaa tunnuksen \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Uusi tunnus"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Päällä"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Lempinimi"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Tilanne"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME asiakasohjelma Ringille"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr "Tuo"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Vaaditaan tunnuksen siirtoa"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "Tämä tunnus tulee siirtää uuteen Ring-tunnuksen muotoon:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Jatkaaksesi tunnuksensiirtoa sinun tulee valita salasana tunnuksellesi. Tätä salasanaa käytetään pääavaimesi kryptaamiseen. Sitä tarvitaan uusien laitteiden yhdistämiseen Ring-tunnuksesi kanssa. Jos et nyt halua valita salasanaa, voit sulkea ohjelman ja jatkaa siirtoa myöhemmin. "
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Salasana:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Lähetä"
 
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "Tunnukset"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Keskustelu"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historia"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 7136893..fa65ef5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -22,9 +22,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2017-01-09 10:33+0000\n"
-"Last-Translator: Pierre-Luc Soulé-Noulibos <plsn@outlook.fr>\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: French (http://www.transifex.com/savoirfairelinux/ring/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@
 msgid "_Remove server"
 msgstr "_Supprimer le serveur"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Nom d’hôte"
 
@@ -72,7 +72,7 @@
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Les mots de passes ne correspondent pas"
 
@@ -110,39 +110,39 @@
 msgid "auto-generating..."
 msgstr "Génération automatique…"
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Afficher le mot de passe"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Serveur mandataire"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Numéro de boîte vocale"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "URL du service de noms"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Répondre automatiquement aux appels"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP activé"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Type de tonalité DTMF :"
 
@@ -172,59 +172,59 @@
 msgid "Name"
 msgstr "Nom"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Général"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Appareils"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Sécurité"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Options avancées"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Êtes-vous certain de vouloir supprimer le compte \"%s\" ?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nouveau compte"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Activé"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Nom du compte"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "État"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Ouvrir l’image de profil"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -332,65 +332,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Le client GNOME pour Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "recherche du RingID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Nom d'utilisateur Ring invalide : %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr "Erreur dans la résolution du nom d'utilisateur, le nom du serveur peut être inaccessible"
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Impossible de résoudre le nom d'utilisateur Ring : %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Appeler"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Ouvrir la discussion"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Rechercher dans les contacts ou appeler un numéro"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "Voici votre nom d'utilisateur Ring. \nCopiez-le et partagez-le avec vos amis!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Voici votre RingID.\nCopiez-le et partagez-le avec vos amis !"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "récupération de l’identifiant Ring…"
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring est un logiciel libre de communication universelle qui respecte les libertés et la vie privée de ses utilisateurs."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "Code QR Identifiant Ring"
@@ -673,7 +681,7 @@
 "characters long."
 msgstr "En cliquant ici, votre nom d'utilisateur unique sera enregistré sur le réseau de Ring. Les gens peuvent l'utiliser pour vous contacter au lieu d'utiliser votre Identifiant Ring qui contient 40 caractères."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Mot de passe (à confirmer) :"
 
@@ -700,7 +708,7 @@
 msgstr "Erreur lors de la création ou du chargement du compte."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -787,61 +795,25 @@
 msgid "Import"
 msgstr "Importer"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Migration de compte nécessaire"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "Le compte suivant doit être migré vers le nouveau format Ring"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Alias :"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Avatar :"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Pour continuer, choisissez un mot de passe pour ce compte. Ce mot de passe sera utilisé pour encrypter votre compte. Il sera requis pour lier de nouveaux appareils à ce compte Ring.\nSi vous n'êtes pas prêt à choisir un mot de passe, vous pouvez fermer Ring et reprendre la migration plus tard."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Migrer le compte"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Migration du compte…"
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Échec de la migration de compte. Veuillez ré-essayer."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Choisissez votre nom d'utilisateur Ring"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "À ce jour, Ring utilise un registre décentralisé de noms d'utilisateur. Cela signifie que, dorénavant, vous pouvez contacter vos amis par leur nom d'utilisateur au lieu de leur identifiant Ring. Le registre est distribué et n'importe quel utilisateur peut le consulter."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Enregistrer mon nom d'utilisateur plus tard"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -967,7 +939,11 @@
 msgid "Place call"
 msgstr "Appeler"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Envoyer"
 
@@ -1208,22 +1184,26 @@
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historique"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Invitations"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "Entrer un nom d'utilisateur"
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 6a83124..5df3507 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -1,16 +1,17 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
 # Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>, 2015
+# Julie LeBrun <julie.lebrun@savoirfairelinux.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: French (Canada) (http://www.transifex.com/savoirfairelinux/ring/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +21,19 @@
 
 #: src/accountadvancedtab.cpp:389
 msgid "_Remove server"
-msgstr ""
+msgstr "_Retirer le serveur de la liste"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
-msgstr ""
+msgstr "Nom d'hôte"
 
 #: src/accountadvancedtab.cpp:510 ui/accountadvancedtab.ui:314
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: src/accountaudiotab.cpp:175 src/accountvideotab.cpp:184
 msgid "Enabled"
-msgstr ""
+msgstr "Activer"
 
 #: src/accountaudiotab.cpp:181
 msgctxt "Name of the codec"
@@ -51,24 +52,24 @@
 msgid ""
 "Your account was created, but we could not register your username. Try again"
 " from the settings menu."
-msgstr ""
+msgstr "Votre compte a bien été créé mais nous n'avons pas pu enregistrer votre nom d'utilisateur.  Essayer à nouveau à partir de votre menu Paramètres"
 
 #: src/accountcreationwizard.cpp:283
 msgctxt "The default username / account alias, if none is set by the user"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
-msgstr ""
+msgstr "Les mots de passes en sont pas identiques"
 
 #: src/accountdevicestab.cpp:195 src/usernameregistrationbox.cpp:404
 msgid "Bad password"
-msgstr ""
+msgstr "Mauvais mot de passe"
 
 #: src/accountdevicestab.cpp:201
 msgid "Network error, try again"
-msgstr ""
+msgstr "Erreur réseau, essayer à nouveau"
 
 #: src/accountdevicestab.cpp:213
 msgid "Could not initiate export to the Ring, try again"
@@ -82,137 +83,137 @@
 #: src/accountdevicestab.cpp:251
 msgctxt "Device ID Column"
 msgid "ID"
-msgstr ""
+msgstr "Identifiant"
 
 #: src/accountgeneraltab.cpp:201
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #: src/accountgeneraltab.cpp:212
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #: src/accountgeneraltab.cpp:238
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
-msgstr ""
+msgstr "Nom d'utilisateur"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
-msgstr ""
+msgstr "Mot de passe"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
-msgstr ""
+msgstr "Afficher le mot de passe"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
-msgstr ""
+msgstr "Numéro de boîte vocale"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
-msgstr ""
+msgstr "Réponse-automatique aux appels"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
 #: src/accountimportexportview.cpp:99
 msgid "Select account export location"
-msgstr ""
+msgstr "Choisir l'emplacement de l'exportation du compte"
 
 #: src/accountimportexportview.cpp:102 ui/accountcreationwizard.ui:82
 #: ui/accountdevicestab.ui:135 ui/accountimportexportview.ui:161
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #: src/accountimportexportview.cpp:104
 msgid "Select"
-msgstr ""
+msgstr "Sélectionner"
 
 #: src/accountimportexportview.cpp:211
 msgid "Error importing account(s)"
-msgstr ""
+msgstr "Une erreur s'est produite lors de l'importation du ou des compte(s)"
 
 #: src/accountimportexportview.cpp:263
 msgid "Error exporting account(s)"
-msgstr ""
+msgstr "Une erreur s'est produite lors de l'exportation du ou des compte(s)"
 
 #: src/accountvideotab.cpp:190
 msgctxt "The name of the codec"
 msgid "Name"
 msgstr "Nom"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
-msgstr ""
+msgstr "Général"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
-msgstr ""
+msgstr "Appareils"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
-msgstr ""
+msgstr "Sécurité"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
-msgstr ""
+msgstr "Avancé"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
-msgstr ""
+msgstr "Êtes-vous certain de vouloir supprimer le compte \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
-msgstr ""
+msgstr "Nouveau compte"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
-msgstr ""
+msgstr "Activer"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
-msgstr ""
+msgstr "Statut"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
-msgstr ""
+msgstr "Ouvrir l'image de l'avatar"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annuler"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
-msgstr ""
+msgstr "_Ouvrir"
 
 #: src/backends/edscontactbackend.cpp:193
 msgid "Unknown EDS addressbook"
@@ -228,31 +229,31 @@
 msgid ""
 "Are you sure you want to delete contact \"%s\"? It will be removed from your"
 " system's addressbook."
-msgstr ""
+msgstr "Êtes-vous certain de vouloir supprimer le contact \"%s/? Il sera supprimé du carnet d'adresse de votre système."
 
 #: src/contactpopupmenu.cpp:114
 msgid "_Call"
-msgstr ""
+msgstr "_Appel"
 
 #: src/contactpopupmenu.cpp:117
 msgid "_Copy name"
-msgstr ""
+msgstr "_Copier nom"
 
 #: src/contactpopupmenu.cpp:120
 msgid "_Copy number"
-msgstr ""
+msgstr "_Copier numéro"
 
 #: src/contactpopupmenu.cpp:123
 msgid "_Add to contact"
-msgstr ""
+msgstr "_Ajouter au contact"
 
 #: src/contactpopupmenu.cpp:126
 msgid "_Remove contact"
-msgstr ""
+msgstr "_Supprimer contact"
 
 #: src/dialogs.c:53
 msgid "Working..."
-msgstr ""
+msgstr "En train de travailler"
 
 #: src/dialogs.c:84
 #, c-format
@@ -266,18 +267,18 @@
 msgid ""
 "The GNOME client for Ring.\n"
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr ""
+msgstr "Le client GNOME pour Ring.\nRing est un logiciel libre pour une communication universelle qui respecte la liberté et vie privée de ses utilisateurs."
 
 #: src/editcontactview.cpp:185
 msgctxt "Phone number category"
 msgid "home"
-msgstr ""
+msgstr "Accueil"
 
 #: src/generalsettingsview.cpp:102
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
-msgstr ""
+msgstr "Êtes-vous certain de vouloir supprimer tout l'historique de votre clavardage et de vos appels?  Cette opération est destructrice."
 
 #: src/historyview.cpp:293
 msgctxt "Call history"
@@ -287,7 +288,7 @@
 #: src/historyview.cpp:338
 msgctxt "Call history"
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #: src/ringnotify.cpp:148
 msgid "Incoming call"
@@ -296,7 +297,7 @@
 #: src/ringnotify.cpp:165 src/ringnotify.cpp:343
 msgctxt "notification action name"
 msgid "Show"
-msgstr ""
+msgstr "Afficher"
 
 #: src/ringnotify.cpp:267
 #, c-format
@@ -318,92 +319,100 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
-msgstr ""
+msgstr "Appeler"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
+msgstr "Ouvrir le clavardage"
+
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
-msgstr ""
+msgstr "Rechercher des contacts ou entrer le numéro"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
-msgstr ""
+msgstr "Ceci est votre nom d'utilisateur Ring.\nCopiez-le et partagez-le avec vos amis!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
-msgstr ""
+msgstr "Code QR de votre identifiant Ring"
 
 #: src/usernameregistrationbox.cpp:128
 msgid "The entered username is not available"
-msgstr ""
+msgstr "Le nom d'utilisateur entré n'est pas disponible"
 
 #: src/usernameregistrationbox.cpp:129
 msgid "Username is not available"
-msgstr ""
+msgstr "Le nom d'utilisateur n'est pas disponible"
 
 #: src/usernameregistrationbox.cpp:138
 msgid "The entered username is not valid"
-msgstr ""
+msgstr "Le nom d'utilisateur entré n'est pas valide"
 
 #: src/usernameregistrationbox.cpp:139
 msgid "Username is not valid"
-msgstr ""
+msgstr "Le nom d'utilisateur n'est pas valide."
 
 #: src/usernameregistrationbox.cpp:148
 msgid "The entered username is available"
-msgstr ""
+msgstr "Le nom d'utilisateur entré est disponible"
 
 #: src/usernameregistrationbox.cpp:149
 msgid "Username is available"
-msgstr ""
+msgstr "Le nom d'utilisateur est disponible"
 
 #: src/usernameregistrationbox.cpp:158
 msgid "Failed to perform lookup"
@@ -431,15 +440,15 @@
 
 #: src/usernameregistrationbox.cpp:397
 msgid "Invalid username"
-msgstr ""
+msgstr "Nom d'utilisateur invalide"
 
 #: src/usernameregistrationbox.cpp:411
 msgid "Username already taken"
-msgstr ""
+msgstr "Nom d'utilisateur non-disponible"
 
 #: src/usernameregistrationbox.cpp:418
 msgid "Network error"
-msgstr ""
+msgstr "Erreur de réseau"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
@@ -458,11 +467,11 @@
 
 #: src/video/video_widget.cpp:525
 msgid "Share screen area"
-msgstr ""
+msgstr "Partager une partie de l'écran"
 
 #: src/video/video_widget.cpp:535
 msgid "Share file"
-msgstr ""
+msgstr "Partager le fichier"
 
 #: src/video/video_widget.cpp:549
 msgid "Show advanced information"
@@ -486,7 +495,7 @@
 
 #: ui/accountadvancedtab.ui:149
 msgid "Registration"
-msgstr ""
+msgstr "Enregistrement"
 
 #: ui/accountadvancedtab.ui:178
 msgid "Use random port"
@@ -498,7 +507,7 @@
 
 #: ui/accountadvancedtab.ui:225
 msgid "Network Interface"
-msgstr ""
+msgstr "Interface réseau"
 
 #: ui/accountadvancedtab.ui:253
 msgid "Same as local parameters"
@@ -510,7 +519,7 @@
 
 #: ui/accountadvancedtab.ui:292
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #: ui/accountadvancedtab.ui:340
 msgid "Use STUN"
@@ -522,15 +531,15 @@
 
 #: ui/accountadvancedtab.ui:389
 msgid "Use TURN"
-msgstr ""
+msgstr "Utiliser le TURN"
 
 #: ui/accountadvancedtab.ui:434
 msgid "username"
-msgstr ""
+msgstr "Nom d'utilisateur"
 
 #: ui/accountadvancedtab.ui:455
 msgid "password"
-msgstr ""
+msgstr "mot de passe"
 
 #: ui/accountadvancedtab.ui:479
 msgid "realm"
@@ -538,7 +547,7 @@
 
 #: ui/accountadvancedtab.ui:508
 msgid "Published Address"
-msgstr ""
+msgstr "Adresse publiée"
 
 #: ui/accountadvancedtab.ui:536
 msgid "Bootstrap Servers"
@@ -552,11 +561,11 @@
 
 #: ui/accountadvancedtab.ui:618 ui/accountadvancedtab.ui:694
 msgid "Min"
-msgstr ""
+msgstr "Min"
 
 #: ui/accountadvancedtab.ui:641 ui/accountadvancedtab.ui:717
 msgid "Max"
-msgstr ""
+msgstr "Max"
 
 #: ui/accountadvancedtab.ui:665
 msgid "Audio RTP Port Range"
@@ -584,11 +593,11 @@
 
 #: ui/accountcreationwizard.ui:32
 msgid "Welcome to "
-msgstr ""
+msgstr "Bienvenue à"
 
 #: ui/accountcreationwizard.ui:66
 msgid "Create Ring Account"
-msgstr ""
+msgstr "Créer un compte Ring"
 
 #: ui/accountcreationwizard.ui:67
 msgid "Create a new Ring account (for new users)"
@@ -596,7 +605,7 @@
 
 #: ui/accountcreationwizard.ui:74
 msgid "Link this device to an account"
-msgstr ""
+msgstr "Lier cet appareil à un compte"
 
 #: ui/accountcreationwizard.ui:75
 msgid "Link this devices to a Ring account created on another device"
@@ -626,23 +635,23 @@
 
 #: ui/accountcreationwizard.ui:172
 msgid "Enter your pin:"
-msgstr ""
+msgstr "Entrer votre NIP:"
 
 #: ui/accountcreationwizard.ui:191
 msgid "Enter your password:"
-msgstr ""
+msgstr "Entrer votre mot de passe:"
 
 #: ui/accountcreationwizard.ui:223 ui/accountcreationwizard.ui:435
 msgid "Next"
-msgstr ""
+msgstr "Suivant"
 
 #: ui/accountcreationwizard.ui:265
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #: ui/accountcreationwizard.ui:285
 msgid "Full name:"
-msgstr ""
+msgstr "Nom complet: "
 
 #: ui/accountcreationwizard.ui:327
 msgid "Ring Account"
@@ -659,7 +668,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +695,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -696,7 +705,7 @@
 
 #: ui/accountdevicestab.ui:40
 msgid "Devices"
-msgstr ""
+msgstr "Appareils"
 
 #: ui/accountdevicestab.ui:66
 msgid "Add device"
@@ -735,11 +744,11 @@
 
 #: ui/accountgeneraltab.ui:42
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #: ui/accountgeneraltab.ui:82
 msgid "Parameters"
-msgstr ""
+msgstr "Paramètres"
 
 #: ui/accountimportexportview.ui:14
 msgid "Export selected account"
@@ -767,66 +776,30 @@
 
 #: ui/accountimportexportview.ui:169 ui/accountview.ui:110
 msgid "Export"
-msgstr ""
+msgstr "Exportation"
 
 #: ui/accountimportexportview.ui:181 ui/accountview.ui:103
 msgid "Import"
-msgstr ""
+msgstr "Importation"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -903,7 +876,7 @@
 
 #: ui/accountvideotab.ui:50
 msgid "Enable Video"
-msgstr ""
+msgstr "Activer le vidéo"
 
 #: ui/accountvideotab.ui:98
 msgid "Video Codecs"
@@ -953,7 +926,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr ""
 
@@ -1012,7 +989,7 @@
 
 #: ui/currentcallview.ui:381 ui/currentcallview.ui:398
 msgid "Chat"
-msgstr ""
+msgstr "Clavardage"
 
 #: ui/currentcallview.ui:407
 msgid "Mute audio"
@@ -1020,7 +997,7 @@
 
 #: ui/currentcallview.ui:452
 msgid "Record"
-msgstr ""
+msgstr "Enregistrement"
 
 #: ui/editcontactview.ui:12
 msgid "Select addressbook"
@@ -1100,7 +1077,7 @@
 
 #: ui/generalsettingsview.ui:171
 msgid "History Settings"
-msgstr ""
+msgstr "Paramètres de l'historique"
 
 #: ui/generalsettingsview.ui:189
 msgid "Keep history for (days):"
@@ -1112,7 +1089,7 @@
 
 #: ui/generalsettingsview.ui:219
 msgid "Clear all history"
-msgstr ""
+msgstr "Effacer tout l'historique"
 
 #: ui/incomingcallview.ui:105
 msgid "Incoming..."
@@ -1120,19 +1097,19 @@
 
 #: ui/incomingcallview.ui:133
 msgid "   Accept"
-msgstr ""
+msgstr "Accepter"
 
 #: ui/incomingcallview.ui:148
 msgid "   Reject"
-msgstr ""
+msgstr "Rejeter"
 
 #: ui/incomingcallview.ui:163
 msgid "   Hang-up"
-msgstr ""
+msgstr "Raccrocher"
 
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
-msgstr ""
+msgstr "Paramètres audio"
 
 #: ui/mediasettingsview.ui:40
 msgid "Audio manager:"
@@ -1140,7 +1117,7 @@
 
 #: ui/mediasettingsview.ui:52
 msgid "Ringtone device:"
-msgstr ""
+msgstr "Sonnerie de l'appareil:"
 
 #: ui/mediasettingsview.ui:64
 msgid "Output device:"
@@ -1156,7 +1133,7 @@
 
 #: ui/mediasettingsview.ui:150
 msgid "Device:"
-msgstr ""
+msgstr "Appareil:"
 
 #: ui/mediasettingsview.ui:162
 msgid "Channel:"
@@ -1172,48 +1149,52 @@
 
 #: ui/ringgearsmenu.ui:13
 msgid "_About"
-msgstr ""
+msgstr "_A propos"
 
 #: ui/ringgearsmenu.ui:19
 msgid "_Quit"
-msgstr ""
+msgstr "_Quitter"
 
 #: ui/ringmainwindow.ui:17
 msgid "Menu"
-msgstr ""
+msgstr "Menu"
 
 #: ui/ringmainwindow.ui:51
 msgid "General"
-msgstr ""
+msgstr "Général"
 
 #: ui/ringmainwindow.ui:61
 msgid "Media"
-msgstr ""
+msgstr "Média"
 
 #: ui/ringmainwindow.ui:72
 msgid "Accounts"
-msgstr ""
+msgstr "Comptes"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Réglages"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "historique"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
-msgstr ""
+msgstr "entrer le nom d'utilisateur ici"
 
 #: ui/usernameregistrationbox.ui:24
 msgid "Register"
-msgstr ""
+msgstr "S'inscrire"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index ac85095..006169e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: French (France) (http://www.transifex.com/savoirfairelinux/ring/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr ""
 
@@ -57,7 +57,7 @@
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Les mots de passe saisis sont différents"
 
@@ -95,39 +95,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "mot de passe"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -157,59 +157,59 @@
 msgid "Name"
 msgstr ""
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr ""
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr ""
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr ""
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr ""
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr ""
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr ""
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr ""
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -317,65 +317,73 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -571,11 +579,11 @@
 
 #: ui/accountaudiotab.ui:57 ui/accountvideotab.ui:80
 msgid "Up"
-msgstr ""
+msgstr "Save"
 
 #: ui/accountaudiotab.ui:64 ui/accountvideotab.ui:87
 msgid "Down"
-msgstr ""
+msgstr "Bas"
 
 #: ui/accountaudiotab.ui:75
 msgid "Audio Codecs"
@@ -633,7 +641,7 @@
 
 #: ui/accountcreationwizard.ui:223 ui/accountcreationwizard.ui:435
 msgid "Next"
-msgstr ""
+msgstr "Suivant"
 
 #: ui/accountcreationwizard.ui:265
 msgid "Profile"
@@ -658,7 +666,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -685,7 +693,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -772,60 +780,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -952,7 +924,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr ""
 
@@ -1193,22 +1169,26 @@
 msgid "Accounts"
 msgstr ""
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Réglages"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr ""
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr ""
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 02142f0..93c54bf 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Hebrew (http://www.transifex.com/savoirfairelinux/ring/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "שם מארח"
 
@@ -59,7 +59,7 @@
 msgid "Unknown"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -97,39 +97,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "שם משתמש"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "סיסמה"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "הצג סיסמה"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "פרוקסי"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "מספר תא קולי"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP מאופשר"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -159,59 +159,59 @@
 msgid "Name"
 msgstr "שם"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "כלליות"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "אבטחה"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "האם אתה בטוח כי ברצונך למחוק חשבון \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "חשבון חדש"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "מאופשר"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "כינוי"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "מצב"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -319,65 +319,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- לקוח GNOME עבור Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "חפש אנשי קשר או הזן מספר"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "כעת מושך מזהה Ring..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -660,7 +668,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -687,7 +695,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -774,60 +782,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -954,7 +926,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "שלח"
 
@@ -1195,22 +1171,26 @@
 msgid "Accounts"
 msgstr "חשבונות"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "הגדרות"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "דיונים"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "היסטוריה"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/hi_IN.po b/po/hi_IN.po
new file mode 100644
index 0000000..64f853a
--- /dev/null
+++ b/po/hi_IN.po
@@ -0,0 +1,1198 @@
+# Gettext PO translation template file for the GNOME client of the Ring project.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
+# This file is distributed under the same license as the Ring package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Ring\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
+"Language-Team: Hindi (India) (http://www.transifex.com/savoirfairelinux/ring/language/hi_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/accountadvancedtab.cpp:389
+msgid "_Remove server"
+msgstr ""
+
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
+msgid "Hostname"
+msgstr ""
+
+#: src/accountadvancedtab.cpp:510 ui/accountadvancedtab.ui:314
+msgid "Port"
+msgstr ""
+
+#: src/accountaudiotab.cpp:175 src/accountvideotab.cpp:184
+msgid "Enabled"
+msgstr ""
+
+#: src/accountaudiotab.cpp:181
+msgctxt "Name of the codec"
+msgid "Name"
+msgstr "नाम"
+
+#: src/accountaudiotab.cpp:185 src/accountvideotab.cpp:194
+msgid "Bitrate"
+msgstr ""
+
+#: src/accountaudiotab.cpp:189
+msgid "Samplerate"
+msgstr ""
+
+#: src/accountcreationwizard.cpp:240
+msgid ""
+"Your account was created, but we could not register your username. Try again"
+" from the settings menu."
+msgstr ""
+
+#: src/accountcreationwizard.cpp:283
+msgctxt "The default username / account alias, if none is set by the user"
+msgid "Unknown"
+msgstr ""
+
+#: src/accountcreationwizard.cpp:461
+msgid "Passwords don't match"
+msgstr ""
+
+#: src/accountdevicestab.cpp:195 src/usernameregistrationbox.cpp:404
+msgid "Bad password"
+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 "नाम"
+
+#: src/accountdevicestab.cpp:251
+msgctxt "Device ID Column"
+msgid "ID"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:201
+msgid "Alias"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:212
+msgid "Type"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:238
+msgid "auto-generating..."
+msgstr ""
+
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
+msgid "Username"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:287
+msgid "Password"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:300
+msgid "Show password"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:306
+msgid "Proxy"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:316
+msgid "Voicemail number"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:328
+msgid "Name service URL"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:341
+msgid "Auto-answer calls"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:349
+msgid "UPnP enabled"
+msgstr ""
+
+#: src/accountgeneraltab.cpp:357
+msgid "DTMF tone type:"
+msgstr ""
+
+#: src/accountimportexportview.cpp:99
+msgid "Select account export location"
+msgstr ""
+
+#: src/accountimportexportview.cpp:102 ui/accountcreationwizard.ui:82
+#: ui/accountdevicestab.ui:135 ui/accountimportexportview.ui:161
+msgid "Cancel"
+msgstr ""
+
+#: src/accountimportexportview.cpp:104
+msgid "Select"
+msgstr ""
+
+#: src/accountimportexportview.cpp:211
+msgid "Error importing account(s)"
+msgstr ""
+
+#: src/accountimportexportview.cpp:263
+msgid "Error exporting account(s)"
+msgstr ""
+
+#: src/accountvideotab.cpp:190
+msgctxt "The name of the codec"
+msgid "Name"
+msgstr "नाम"
+
+#: src/accountview.cpp:167
+msgctxt "Account settings"
+msgid "General"
+msgstr ""
+
+#: src/accountview.cpp:175
+msgctxt "Account settings"
+msgid "Devices"
+msgstr ""
+
+#: src/accountview.cpp:181
+msgctxt "Account settings"
+msgid "Security"
+msgstr ""
+
+#: src/accountview.cpp:186
+msgctxt "Account settings"
+msgid "Advanced"
+msgstr ""
+
+#: src/accountview.cpp:241
+#, c-format
+msgid "Are you sure you want to delete account \"%s\"?"
+msgstr ""
+
+#: src/accountview.cpp:368
+msgid "New Account"
+msgstr ""
+
+#: src/accountview.cpp:518
+msgctxt "Account state column"
+msgid "Enabled"
+msgstr ""
+
+#: src/accountview.cpp:524
+msgctxt "Account alias (name) column"
+msgid "Alias"
+msgstr ""
+
+#: src/accountview.cpp:532
+msgctxt "Account status column"
+msgid "Status"
+msgstr ""
+
+#: src/avatarmanipulation.cpp:380
+msgid "Open Avatar Image"
+msgstr ""
+
+#: src/avatarmanipulation.cpp:383
+msgid "_Cancel"
+msgstr ""
+
+#: src/avatarmanipulation.cpp:385
+msgid "_Open"
+msgstr ""
+
+#: src/backends/edscontactbackend.cpp:193
+msgid "Unknown EDS addressbook"
+msgstr ""
+
+#: src/backends/edscontactbackend.cpp:213
+msgctxt "Backend type"
+msgid "Contacts"
+msgstr ""
+
+#: src/contactpopupmenu.cpp:82
+#, c-format
+msgid ""
+"Are you sure you want to delete contact \"%s\"? It will be removed from your"
+" system's addressbook."
+msgstr ""
+
+#: src/contactpopupmenu.cpp:114
+msgid "_Call"
+msgstr ""
+
+#: src/contactpopupmenu.cpp:117
+msgid "_Copy name"
+msgstr ""
+
+#: src/contactpopupmenu.cpp:120
+msgid "_Copy number"
+msgstr ""
+
+#: src/contactpopupmenu.cpp:123
+msgid "_Add to contact"
+msgstr ""
+
+#: src/contactpopupmenu.cpp:126
+msgid "_Remove contact"
+msgstr ""
+
+#: src/dialogs.c:53
+msgid "Working..."
+msgstr ""
+
+#: src/dialogs.c:84
+#, c-format
+msgctxt "Do not translate the release name nor the status (beta, final, ...)"
+msgid ""
+"Gaston Miron - Beta 2\n"
+"built on %.25s"
+msgstr ""
+
+#: src/dialogs.c:132
+msgid ""
+"The GNOME client for Ring.\n"
+"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
+
+#: src/editcontactview.cpp:185
+msgctxt "Phone number category"
+msgid "home"
+msgstr ""
+
+#: src/generalsettingsview.cpp:102
+msgid ""
+"This is a destructive operation. Are you sure you want to delete all of your"
+" chat and call history?"
+msgstr ""
+
+#: src/historyview.cpp:293
+msgctxt "Call history"
+msgid "Call"
+msgstr ""
+
+#: src/historyview.cpp:338
+msgctxt "Call history"
+msgid "Date"
+msgstr ""
+
+#: src/ringnotify.cpp:148
+msgid "Incoming call"
+msgstr ""
+
+#: src/ringnotify.cpp:165 src/ringnotify.cpp:343
+msgctxt "notification action name"
+msgid "Show"
+msgstr ""
+
+#: src/ringnotify.cpp:267
+#, c-format
+msgctxt "Text message notification"
+msgid "%s says:"
+msgstr ""
+
+#: src/ring_client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/ring_client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/ring_client_options.c:85
+msgid "- GNOME client for Ring"
+msgstr ""
+
+#: src/ringmainwindow.cpp:613
+#, c-format
+msgid "Invalid Ring username: %s"
+msgstr ""
+
+#: src/ringmainwindow.cpp:628
+msgid "Error resolving username, nameserver is possibly unreachable"
+msgstr ""
+
+#: src/ringmainwindow.cpp:642
+#, c-format
+msgid "Could not resolve Ring username: %s"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1150
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1152
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Search contacts or enter number"
+msgstr ""
+
+#: src/ringwelcomeview.cpp:75
+msgid ""
+"This is your Ring username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/ringwelcomeview.cpp:83
+msgctxt "Do not translate \"RingID\""
+msgid ""
+"This is your RingID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/ringwelcomeview.cpp:90
+msgid "fetching RingID..."
+msgstr ""
+
+#: src/ringwelcomeview.cpp:148
+msgid ""
+"Ring is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "रिंग हर तरह के संविद के लिये एक मुक्त/स्विधीन साॅफ्टवेयर है, जो अपने उपभोक्ताओं की स्वाधीनता व गोपनीयता का सम्मान करता है"
+
+#: src/ringwelcomeview.cpp:202
+msgctxt "Do not translate \"Ring ID\""
+msgid "Ring ID QR code"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:128
+msgid "The entered username is not available"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:129
+msgid "Username is not available"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:138
+msgid "The entered username is not valid"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:139
+msgid "Username is not valid"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:148
+msgid "The entered username is available"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:149
+msgid "Username is available"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:158
+msgid "Failed to perform lookup"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:159
+msgid "Could not lookup username"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:248
+msgid "Looking up username availability..."
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:310 ui/accountcreationwizard.ui:485
+msgid "Registering username..."
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:319
+msgid "Could not initiate name registration, try again."
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:361
+msgid "Register this username on the blockchain"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:397
+msgid "Invalid username"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:411
+msgid "Username already taken"
+msgstr ""
+
+#: src/usernameregistrationbox.cpp:418
+msgid "Network error"
+msgstr ""
+
+#: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
+msgctxt "Name of error window (dialog)"
+msgid "Ring Error"
+msgstr ""
+
+#: src/native/dbuserrorhandler.cpp:57
+msgid "Trying to reconnect to the Ring daemon (dring)..."
+msgstr ""
+
+#: src/native/dbuserrorhandler.cpp:87
+msgid ""
+"Could not re-connect to the Ring daemon (dring).\n"
+"Ring will now quit."
+msgstr ""
+
+#: src/video/video_widget.cpp:525
+msgid "Share screen area"
+msgstr ""
+
+#: src/video/video_widget.cpp:535
+msgid "Share file"
+msgstr ""
+
+#: src/video/video_widget.cpp:549
+msgid "Show advanced information"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:81
+msgid "Registration expire timeout (seconds):"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:103
+msgid "Allow calls from unknown peers"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:117
+msgid "Allow calls from peers in your call history"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:131
+msgid "Allow calls from peers in your contacts list"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:149
+msgid "Registration"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:178
+msgid "Use random port"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:199
+msgid "Local port:"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:225
+msgid "Network Interface"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:253
+msgid "Same as local parameters"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:268
+msgid "Set published address and port:"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:292
+msgid "Address"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:340
+msgid "Use STUN"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:363 ui/accountadvancedtab.ui:412
+msgid "server URL"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:389
+msgid "Use TURN"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:434
+msgid "username"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:455
+msgid "password"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:479
+msgid "realm"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:508
+msgid "Published Address"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:536
+msgid "Bootstrap Servers"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:593
+msgid ""
+"These settings are only used during SDP session negotiation in case ICE is "
+"not supported by the server or peer."
+msgstr ""
+
+#: ui/accountadvancedtab.ui:618 ui/accountadvancedtab.ui:694
+msgid "Min"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:641 ui/accountadvancedtab.ui:717
+msgid "Max"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:665
+msgid "Audio RTP Port Range"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:741
+msgid "Video RTP Port Range"
+msgstr ""
+
+#: ui/accountadvancedtab.ui:759
+msgid "SDP Session Negotiation (ICE Fallback)"
+msgstr ""
+
+#: ui/accountaudiotab.ui:57 ui/accountvideotab.ui:80
+msgid "Up"
+msgstr "ऊपर"
+
+#: ui/accountaudiotab.ui:64 ui/accountvideotab.ui:87
+msgid "Down"
+msgstr "नीचे"
+
+#: ui/accountaudiotab.ui:75
+msgid "Audio Codecs"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:32
+msgid "Welcome to "
+msgstr ""
+
+#: ui/accountcreationwizard.ui:66
+msgid "Create Ring Account"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:67
+msgid "Create a new Ring account (for new users)"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:74
+msgid "Link this device to an account"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:75
+msgid "Link this devices to a Ring account created on another device"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:103 ui/accountcreationwizard.ui:157
+msgid "Link this device to an existing account"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:118
+msgid ""
+"To link this device to another account, you first need to obtain a PIN code."
+" To generate the pin code, go to the account management setting of a "
+"previous device, choose the Ring Account to use and select \"Link another "
+"device to this account\". You will get the necessary PIN to complete this "
+"form. The PIN is only valid for 10 minutes."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:126 ui/accountcreationwizard.ui:215
+#: ui/accountcreationwizard.ui:427
+msgid "Previous"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:134
+msgid "Okay, I have the PIN!"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:172
+msgid "Enter your pin:"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:191
+msgid "Enter your password:"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:223 ui/accountcreationwizard.ui:435
+msgid "Next"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:265
+msgid "Profile"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:285
+msgid "Full name:"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:327
+msgid "Ring Account"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:340
+msgid "Register public username (experimental):"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:346
+msgid ""
+"By checking this, you will register a unique username on the Ring network. "
+"People can use it to contact you instead of using your RingID, which is 40 "
+"characters long."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:369
+msgid "Password (confirm):"
+msgstr ""
+
+#: ui/accountcreationwizard.ui:370
+msgid ""
+"This password will be used to encrypt your account data and to link new "
+"devices to your account."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:459
+msgid "Generating your Ring account..."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:492
+msgid "This may take a few minutes."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:518
+msgid "Retrieving your Ring account..."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:544
+msgid "Error creating/loading account."
+msgstr ""
+
+#: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
+#: ui/accountdevicestab.ui:239
+msgid "OK"
+msgstr ""
+
+#: ui/accountdevicestab.ui:21
+msgid "My Device ID:"
+msgstr ""
+
+#: ui/accountdevicestab.ui:40
+msgid "Devices"
+msgstr ""
+
+#: ui/accountdevicestab.ui:66
+msgid "Add device"
+msgstr ""
+
+#: ui/accountdevicestab.ui:83
+msgid "Add New Device"
+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 ui/accountimportexportview.ui:111
+msgid "Password (required):"
+msgstr ""
+
+#: ui/accountdevicestab.ui:118 ui/accountimportexportview.ui:126
+msgid "Enter archive password"
+msgstr ""
+
+#: 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/accountgeneraltab.ui:42
+msgid "Account"
+msgstr "खाता"
+
+#: ui/accountgeneraltab.ui:82
+msgid "Parameters"
+msgstr ""
+
+#: ui/accountimportexportview.ui:14
+msgid "Export selected account"
+msgstr ""
+
+#: ui/accountimportexportview.ui:26
+msgid "Import accounts"
+msgstr ""
+
+#: ui/accountimportexportview.ui:49
+msgid "Location:"
+msgstr ""
+
+#: ui/accountimportexportview.ui:70
+msgid "choose location"
+msgstr ""
+
+#: ui/accountimportexportview.ui:76
+msgid "Choose export location"
+msgstr ""
+
+#: ui/accountimportexportview.ui:95
+msgid "Choose archive location"
+msgstr ""
+
+#: ui/accountimportexportview.ui:169 ui/accountview.ui:110
+msgid "Export"
+msgstr ""
+
+#: ui/accountimportexportview.ui:181 ui/accountview.ui:103
+msgid "Import"
+msgstr ""
+
+#: ui/accountmigrationview.ui:14
+msgid "Account migration required"
+msgstr ""
+
+#: ui/accountmigrationview.ui:39
+msgid "Alias:"
+msgstr ""
+
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
+
+#: ui/accountmigrationview.ui:129
+msgid "Migrate account"
+msgstr ""
+
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:37
+msgid "Encrypt media streams (SRTP)"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:58
+msgid "Key exchange protocol"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:76
+msgid "Fallback on RTP on encryption failure"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:94
+msgid "Media Stream Encryption"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:123
+msgid "Encrypt negotiation (TLS)"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:148
+msgid "CA certificate"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:185
+msgid "User certificate"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:222
+msgid "Private key"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:245
+msgid "Private key password"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:292
+msgid "TLS protocol method"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:315
+msgid "Outgoing TLS server name"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:337
+msgid "Negotiation timeout (seconds)"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:371
+msgid "Use default ciphers"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:387
+msgid "Use custom cipher list"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:444
+msgid "Verify incoming certificates (server side)"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:459
+msgid "Verify answer certificates (client side)"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:474
+msgid "Require a certificate for incoming TLS connections"
+msgstr ""
+
+#: ui/accountsecuritytab.ui:493
+msgid "Negotiation Encryption"
+msgstr ""
+
+#: ui/accountvideotab.ui:50
+msgid "Enable Video"
+msgstr ""
+
+#: ui/accountvideotab.ui:98
+msgid "Video Codecs"
+msgstr ""
+
+#: ui/accountview.ui:42 ui/accountview.ui:45
+msgid "Remove selected account"
+msgstr ""
+
+#: ui/accountview.ui:63 ui/accountview.ui:66
+msgid "Add new account"
+msgstr ""
+
+#: ui/accountview.ui:75 ui/accountview.ui:78
+msgid "Select account type"
+msgstr ""
+
+#: ui/accountview.ui:104
+msgid "Import archived account(s)"
+msgstr ""
+
+#: ui/accountview.ui:112
+msgid "Export selected account(s)"
+msgstr ""
+
+#: ui/avatarmanipulation.ui:92 ui/avatarmanipulation.ui:125
+msgid "Take photo"
+msgstr ""
+
+#: ui/avatarmanipulation.ui:102
+msgid "Choose image from file"
+msgstr ""
+
+#: ui/avatarmanipulation.ui:135 ui/avatarmanipulation.ui:168
+msgid "Return"
+msgstr ""
+
+#: ui/avatarmanipulation.ui:158
+msgid "Set selection as image"
+msgstr ""
+
+#: ui/chatview.ui:19 ui/chatview.ui:22
+msgid "Hide chat view"
+msgstr ""
+
+#: ui/chatview.ui:45 ui/chatview.ui:48
+msgid "Place call"
+msgstr ""
+
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
+msgid "Send"
+msgstr ""
+
+#: ui/choosecontactview.ui:34
+msgid "Create New"
+msgstr ""
+
+#: ui/currentcallview.ui:247
+msgid "End this call"
+msgstr ""
+
+#: ui/currentcallview.ui:251 ui/currentcallview.ui:434
+msgid "End call"
+msgstr ""
+
+#: ui/currentcallview.ui:269
+msgid "Toggle hold"
+msgstr ""
+
+#: ui/currentcallview.ui:273 ui/currentcallview.ui:295
+#: ui/currentcallview.ui:425
+msgid "Hold"
+msgstr ""
+
+#: ui/currentcallview.ui:291
+msgid "Toggle mute audio"
+msgstr ""
+
+#: ui/currentcallview.ui:313
+msgid "Toggle mute video"
+msgstr ""
+
+#: ui/currentcallview.ui:317 ui/currentcallview.ui:416
+msgid "Mute video"
+msgstr ""
+
+#: ui/currentcallview.ui:336
+msgid "Toggle record audio"
+msgstr ""
+
+#: ui/currentcallview.ui:339
+msgid "Record audio"
+msgstr ""
+
+#: ui/currentcallview.ui:356
+msgid "Adjust outgoing video quality"
+msgstr ""
+
+#: ui/currentcallview.ui:361 ui/currentcallview.ui:443
+msgid "Video quality"
+msgstr ""
+
+#: ui/currentcallview.ui:377
+msgid "Toggle show chat"
+msgstr ""
+
+#: ui/currentcallview.ui:381 ui/currentcallview.ui:398
+msgid "Chat"
+msgstr ""
+
+#: ui/currentcallview.ui:407
+msgid "Mute audio"
+msgstr ""
+
+#: ui/currentcallview.ui:452
+msgid "Record"
+msgstr ""
+
+#: ui/editcontactview.ui:12
+msgid "Select addressbook"
+msgstr ""
+
+#: ui/editcontactview.ui:15
+msgid "Addressbook"
+msgstr ""
+
+#: ui/editcontactview.ui:29
+msgid "Name"
+msgstr "नाम"
+
+#: ui/editcontactview.ui:32
+msgid "Contact name"
+msgstr ""
+
+#: ui/editcontactview.ui:47
+msgid "Select how this number will be categorized"
+msgstr ""
+
+#: ui/editcontactview.ui:50
+msgid "Number category"
+msgstr ""
+
+#: ui/editcontactview.ui:66
+msgid "Number or Ring ID to be added"
+msgstr ""
+
+#: ui/editcontactview.ui:72
+msgid "Number or Ring ID"
+msgstr ""
+
+#: ui/editcontactview.ui:83
+msgid "Save"
+msgstr ""
+
+#: ui/generalsettingsview.ui:32
+msgid "Profile Settings"
+msgstr ""
+
+#: ui/generalsettingsview.ui:74
+msgid "Ring Settings"
+msgstr ""
+
+#: ui/generalsettingsview.ui:90
+msgid "Start Ring on login"
+msgstr ""
+
+#: ui/generalsettingsview.ui:98
+msgid "Show Ring icon in the notification area (systray)."
+msgstr ""
+
+#: ui/generalsettingsview.ui:106
+msgid "Bring Ring to the foreground on incoming calls."
+msgstr ""
+
+#: ui/generalsettingsview.ui:114
+msgid "Enable notifications for incoming calls."
+msgstr ""
+
+#: ui/generalsettingsview.ui:122
+msgid "Enable notifications for new chat messages."
+msgstr ""
+
+#: ui/generalsettingsview.ui:130
+msgid "Entering a number in the search entry will place a new call."
+msgstr ""
+
+#: ui/generalsettingsview.ui:143
+msgid "Show chat on the right."
+msgstr ""
+
+#: ui/generalsettingsview.ui:149
+msgid "Show chat on the bottom."
+msgstr ""
+
+#: ui/generalsettingsview.ui:171
+msgid "History Settings"
+msgstr ""
+
+#: ui/generalsettingsview.ui:189
+msgid "Keep history for (days):"
+msgstr ""
+
+#: ui/generalsettingsview.ui:210
+msgid "(set to 0 for unlimited history)"
+msgstr ""
+
+#: ui/generalsettingsview.ui:219
+msgid "Clear all history"
+msgstr ""
+
+#: ui/incomingcallview.ui:105
+msgid "Incoming..."
+msgstr ""
+
+#: ui/incomingcallview.ui:133
+msgid "   Accept"
+msgstr ""
+
+#: ui/incomingcallview.ui:148
+msgid "   Reject"
+msgstr ""
+
+#: ui/incomingcallview.ui:163
+msgid "   Hang-up"
+msgstr ""
+
+#: ui/mediasettingsview.ui:24
+msgid "Audio Settings"
+msgstr ""
+
+#: ui/mediasettingsview.ui:40
+msgid "Audio manager:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:52
+msgid "Ringtone device:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:64
+msgid "Output device:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:76
+msgid "Input device:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:134
+msgid "Camera Settings"
+msgstr ""
+
+#: ui/mediasettingsview.ui:150
+msgid "Device:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:162
+msgid "Channel:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:174
+msgid "Resolution:"
+msgstr ""
+
+#: ui/mediasettingsview.ui:186
+msgid "Frame rate:"
+msgstr ""
+
+#: ui/ringgearsmenu.ui:13
+msgid "_About"
+msgstr ""
+
+#: ui/ringgearsmenu.ui:19
+msgid "_Quit"
+msgstr ""
+
+#: ui/ringmainwindow.ui:17
+msgid "Menu"
+msgstr ""
+
+#: ui/ringmainwindow.ui:51
+msgid "General"
+msgstr ""
+
+#: ui/ringmainwindow.ui:61
+msgid "Media"
+msgstr ""
+
+#: ui/ringmainwindow.ui:72
+msgid "Accounts"
+msgstr ""
+
+#: ui/ringmainwindow.ui:102
+msgid "Settings"
+msgstr ""
+
+#: ui/ringmainwindow.ui:206
+msgid "Conversations"
+msgstr ""
+
+#: ui/ringmainwindow.ui:228
+msgid "Contacts"
+msgstr ""
+
+#: ui/ringmainwindow.ui:250
+msgid "History"
+msgstr ""
+
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
+#: ui/usernameregistrationbox.ui:12
+msgid "enter username here"
+msgstr ""
+
+#: ui/usernameregistrationbox.ui:24
+msgid "Register"
+msgstr ""
diff --git a/po/hr.po b/po/hr.po
index b971ab1..cd7f439 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Croatian (http://www.transifex.com/savoirfairelinux/ring/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Ime poslužitelja"
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Prikaži lozinku"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Broj govorne pošte"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Automatski primi pozive"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP omogućen"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "Ime"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Opće"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Sigurnost"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Jeste li sigurni da želite izbrisati račun \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Novi račun"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Uključeno"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME klijent za Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Traži kontakt ili unesi broj"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -439,7 +447,7 @@
 
 #: src/usernameregistrationbox.cpp:418
 msgid "Network error"
-msgstr ""
+msgstr "Greška mreže"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "U redu"
 
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr "Uvezi"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Lozinka:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Pošalji"
 
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "Računi"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Postavke"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Razgovori"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Povijest"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index b345c92..91c4503 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Hungarian (http://www.transifex.com/savoirfairelinux/ring/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Kiszolgálónév"
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Jelszó"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Jelszó mutatása"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Hangpostaszám"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Hívások automatikus fogadása"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP engedélyezve"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "Név"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Általános"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Biztonság"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Haladó"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Biztos, hogy törölni szeretné a következő fiókot: \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Új fiók"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Álnév"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Állapot"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-kliens a Ringhez"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Partnerek keresése vagy szám beírása"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Ez az ön Ringazonosítója.\nMásolja ki és ossza meg a barátaival!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "Ringazonosító lekérése..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr "Importálás"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Elküld"
 
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "Fiókok"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Beállítások"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Beszélgetések"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Partnerek"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Előzmények"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 325cfaa..9c254dd 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Indonesian (http://www.transifex.com/savoirfairelinux/ring/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr ""
 
@@ -57,7 +57,7 @@
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -95,39 +95,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -157,59 +157,59 @@
 msgid "Name"
 msgstr "Nama"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr ""
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr ""
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr ""
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr ""
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr ""
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr ""
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr ""
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -317,65 +317,73 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -633,7 +641,7 @@
 
 #: ui/accountcreationwizard.ui:223 ui/accountcreationwizard.ui:435
 msgid "Next"
-msgstr ""
+msgstr "Selanjutnya"
 
 #: ui/accountcreationwizard.ui:265
 msgid "Profile"
@@ -658,7 +666,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -685,7 +693,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -772,60 +780,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -952,10 +924,14 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
-msgid "Send"
+#: ui/chatview.ui:60
+msgid "Send invitation"
 msgstr ""
 
+#: ui/chatview.ui:122
+msgid "Send"
+msgstr "Kirim"
+
 #: ui/choosecontactview.ui:34
 msgid "Create New"
 msgstr ""
@@ -1193,22 +1169,26 @@
 msgid "Accounts"
 msgstr ""
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr ""
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontak"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Riwayat"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 92d59aa..f95c33c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Italian (http://www.transifex.com/savoirfairelinux/ring/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@
 msgid "_Remove server"
 msgstr "_Rimuovi server"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Nome Host"
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr "auto-generazione in corso…"
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Nome utente"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Password"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Mostrare la password"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Numero di segreteria telefonica"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Risposta automatica alle chiamate"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP attivato"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Tipo di tono DTMF:"
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "Nome"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Generale"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Sicurezza"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Confermare la soppressione dell'account \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nuovo account"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Attivato"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Aprire l'immagine di avatar"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "A_bbandonare"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Aprire"
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Cliente GNOME per Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Ricercare contatto o digitare un numero"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Questo è il suo RingID.\nDa copiare e condividere con gli amici!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "scaricando RingID…"
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr "Importare"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Mandare"
 
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Converzazioni"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Contatti"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Cronologia"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index c4789d7..7e5da88 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,18 +1,19 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
 # Gianluca Scacco <gianluca.scacco@gmail.com>, 2016
 # Matteo Fortini <matteo.fortini@gmail.com>, 2017
+# Nicolò Santamaria <nicolo.santamaria@gmail.com>, 2017
 # oven pasta <ovenpasta@pizzahack.eu>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2017-01-16 17:36+0000\n"
-"Last-Translator: Matteo Fortini <matteo.fortini@gmail.com>\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/savoirfairelinux/ring/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,9 +23,9 @@
 
 #: src/accountadvancedtab.cpp:389
 msgid "_Remove server"
-msgstr ""
+msgstr "_Elimina il server"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -60,7 +61,7 @@
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Le password non coincidono"
 
@@ -98,39 +99,39 @@
 msgid "auto-generating..."
 msgstr "auto-generazione..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Utente"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Password"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Visualizza password"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Numero voicemail"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "URL del servizio di nomi"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Chiamate auto risposte"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP abilitato"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "tipo di tono DTMF"
 
@@ -160,59 +161,59 @@
 msgid "Name"
 msgstr "Nome"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Generale"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Dispositivi"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Sicurezza"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Sei sicuro di voler cancellare l'account \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nuovo Account"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Stato"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Apri immagine dell'Avatar"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Apri"
 
@@ -320,65 +321,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Client GNOME per Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "Ricerca del RingID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Nome utente Ring non valido: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr "Errore di risoluzione del nome utente, il server di nome è probabilmente non raggiungibile"
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Non è stato possibile risolvere il nome utente Ring: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "chiama"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "apri chat"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Cerca tra i contatti o inserisci un numero"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "Questo è il tuo nome utente Ring.\nCopialo e condividilo con i tuoi amici!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Questo è il tuo RingID.\nCopialo e condividilo con i tuoi amici!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "sto estraendo il RingID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring è software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "Codice QR del Ring ID"
@@ -661,7 +670,7 @@
 "characters long."
 msgstr "Selezionando questo, registrerai un nome utente unico nella rete Ring. Le persone possono utilizzarlo per contattarti invece di usare il tuo RingID, che è lungo 40 caratteri."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Password (conferma):"
 
@@ -688,7 +697,7 @@
 msgstr "Errore di creazione/caricamento account."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -713,23 +722,23 @@
 "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 ""
+msgstr "Per aggiungere un nuovo dispositivo al tuo account Ring, esporta il tuo account su Ring. Questo genererà un pin che deve essere immesso sul tuo nuovo dispositivo entro 5 minuti dalla sua generazione."
 
 #: ui/accountdevicestab.ui:107 ui/accountimportexportview.ui:111
 msgid "Password (required):"
-msgstr ""
+msgstr "Password (obbligatorio):"
 
 #: ui/accountdevicestab.ui:118 ui/accountimportexportview.ui:126
 msgid "Enter archive password"
-msgstr ""
+msgstr "Immetti password archivio"
 
 #: ui/accountdevicestab.ui:141
 msgid "Export on the Ring"
-msgstr ""
+msgstr "Esporta su Ring"
 
 #: ui/accountdevicestab.ui:162
 msgid "Exporting account on the Ring..."
-msgstr ""
+msgstr "Esportando l'account su Ring..."
 
 #: ui/accountdevicestab.ui:186
 msgid "Your generated pin:"
@@ -745,27 +754,27 @@
 
 #: ui/accountimportexportview.ui:14
 msgid "Export selected account"
-msgstr ""
+msgstr "Esporta l'account selezionato"
 
 #: ui/accountimportexportview.ui:26
 msgid "Import accounts"
-msgstr ""
+msgstr "Importa account"
 
 #: ui/accountimportexportview.ui:49
 msgid "Location:"
-msgstr ""
+msgstr "Località:"
 
 #: ui/accountimportexportview.ui:70
 msgid "choose location"
-msgstr ""
+msgstr "Scegli località"
 
 #: ui/accountimportexportview.ui:76
 msgid "Choose export location"
-msgstr ""
+msgstr "Scegli il percorso di esportazione"
 
 #: ui/accountimportexportview.ui:95
 msgid "Choose archive location"
-msgstr ""
+msgstr "Scegli il percorso dell'archivio"
 
 #: ui/accountimportexportview.ui:169 ui/accountview.ui:110
 msgid "Export"
@@ -775,62 +784,26 @@
 msgid "Import"
 msgstr "Importa"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Migrazione account richiesta"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "Il seguente account ha bisogno di essere migrato al nuovo formato di account Ring:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
+msgstr "Alias:"
+
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Per continuare la migrazione, devi scegliere una password per il tuo account. Questa password verrà usata per cifrare la tua master key. Verrà richiesta per aggiungere nuovi dispositivi al tuo account Ring. Se non sei pronto a scegliere una password, dovresti chiudere Ring e riprendere la migrazione più tardi."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Password:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
+msgstr "Migra account"
+
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Scegli il tuo nome utente Ring:"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Registra il mio nome utente in un secondo momento"
-
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
 msgstr "Cripta i flussi (SRTP)"
@@ -873,7 +846,7 @@
 
 #: ui/accountsecuritytab.ui:315
 msgid "Outgoing TLS server name"
-msgstr ""
+msgstr "Nome del server TLS in uscita"
 
 #: ui/accountsecuritytab.ui:337
 msgid "Negotiation timeout (seconds)"
@@ -909,35 +882,35 @@
 
 #: ui/accountvideotab.ui:98
 msgid "Video Codecs"
-msgstr ""
+msgstr "Codec Video"
 
 #: ui/accountview.ui:42 ui/accountview.ui:45
 msgid "Remove selected account"
-msgstr ""
+msgstr "Rimuovi l'account selezionato"
 
 #: ui/accountview.ui:63 ui/accountview.ui:66
 msgid "Add new account"
-msgstr ""
+msgstr "Aggiungi un nuovo account"
 
 #: ui/accountview.ui:75 ui/accountview.ui:78
 msgid "Select account type"
-msgstr ""
+msgstr "Seleziona il tipo di account"
 
 #: ui/accountview.ui:104
 msgid "Import archived account(s)"
-msgstr ""
+msgstr "Importa account archiviati"
 
 #: ui/accountview.ui:112
 msgid "Export selected account(s)"
-msgstr ""
+msgstr "Esporta gli account selezionati"
 
 #: ui/avatarmanipulation.ui:92 ui/avatarmanipulation.ui:125
 msgid "Take photo"
-msgstr ""
+msgstr "Scatta una foto"
 
 #: ui/avatarmanipulation.ui:102
 msgid "Choose image from file"
-msgstr ""
+msgstr "Scegli un file immagine"
 
 #: ui/avatarmanipulation.ui:135 ui/avatarmanipulation.ui:168
 msgid "Return"
@@ -945,31 +918,35 @@
 
 #: ui/avatarmanipulation.ui:158
 msgid "Set selection as image"
-msgstr ""
+msgstr "Imposta l'immagine selezionata"
 
 #: ui/chatview.ui:19 ui/chatview.ui:22
 msgid "Hide chat view"
-msgstr ""
+msgstr "Nascondi la vista della chat"
 
 #: ui/chatview.ui:45 ui/chatview.ui:48
 msgid "Place call"
+msgstr "Chiama"
+
+#: ui/chatview.ui:60
+msgid "Send invitation"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:122
 msgid "Send"
-msgstr ""
+msgstr "Invia"
 
 #: ui/choosecontactview.ui:34
 msgid "Create New"
-msgstr ""
+msgstr "Crea Nuovo"
 
 #: ui/currentcallview.ui:247
 msgid "End this call"
-msgstr ""
+msgstr "Termina questa chiamata"
 
 #: ui/currentcallview.ui:251 ui/currentcallview.ui:434
 msgid "End call"
-msgstr ""
+msgstr "Termina la chiamata"
 
 #: ui/currentcallview.ui:269
 msgid "Toggle hold"
@@ -998,19 +975,19 @@
 
 #: ui/currentcallview.ui:339
 msgid "Record audio"
-msgstr ""
+msgstr "Registra audio"
 
 #: ui/currentcallview.ui:356
 msgid "Adjust outgoing video quality"
-msgstr ""
+msgstr "Imposta la qualità del video in uscita"
 
 #: ui/currentcallview.ui:361 ui/currentcallview.ui:443
 msgid "Video quality"
-msgstr ""
+msgstr "Qualità del video"
 
 #: ui/currentcallview.ui:377
 msgid "Toggle show chat"
-msgstr ""
+msgstr "Toggle mostra chat"
 
 #: ui/currentcallview.ui:381 ui/currentcallview.ui:398
 msgid "Chat"
@@ -1026,11 +1003,11 @@
 
 #: ui/editcontactview.ui:12
 msgid "Select addressbook"
-msgstr ""
+msgstr "Seleziona rubrica"
 
 #: ui/editcontactview.ui:15
 msgid "Addressbook"
-msgstr ""
+msgstr "Rubrica"
 
 #: ui/editcontactview.ui:29
 msgid "Name"
@@ -1038,67 +1015,67 @@
 
 #: ui/editcontactview.ui:32
 msgid "Contact name"
-msgstr ""
+msgstr "Nome contatto"
 
 #: ui/editcontactview.ui:47
 msgid "Select how this number will be categorized"
-msgstr ""
+msgstr "Seleziona il modo in cui questo numero sarà categorizzato"
 
 #: ui/editcontactview.ui:50
 msgid "Number category"
-msgstr ""
+msgstr "Categoria del numero"
 
 #: ui/editcontactview.ui:66
 msgid "Number or Ring ID to be added"
-msgstr ""
+msgstr "Numero o RingID da aggiungere"
 
 #: ui/editcontactview.ui:72
 msgid "Number or Ring ID"
-msgstr ""
+msgstr "Numero o RingID"
 
 #: ui/editcontactview.ui:83
 msgid "Save"
-msgstr ""
+msgstr "Salva"
 
 #: ui/generalsettingsview.ui:32
 msgid "Profile Settings"
-msgstr ""
+msgstr "Impostazioni Profilo"
 
 #: ui/generalsettingsview.ui:74
 msgid "Ring Settings"
-msgstr ""
+msgstr "Impostazioni Ring"
 
 #: ui/generalsettingsview.ui:90
 msgid "Start Ring on login"
-msgstr ""
+msgstr "Avvia Ring al login"
 
 #: ui/generalsettingsview.ui:98
 msgid "Show Ring icon in the notification area (systray)."
-msgstr ""
+msgstr "Mostra l'icona di Ring nell'area di notifica (systray)."
 
 #: ui/generalsettingsview.ui:106
 msgid "Bring Ring to the foreground on incoming calls."
-msgstr ""
+msgstr "Mostra Ring in primo piano durante le chiamate in arrivo."
 
 #: ui/generalsettingsview.ui:114
 msgid "Enable notifications for incoming calls."
-msgstr ""
+msgstr "Abilita le notifiche per le chiamate in entrata."
 
 #: ui/generalsettingsview.ui:122
 msgid "Enable notifications for new chat messages."
-msgstr ""
+msgstr "Abilita le notifiche per i nuovi messaggi della chat."
 
 #: ui/generalsettingsview.ui:130
 msgid "Entering a number in the search entry will place a new call."
-msgstr ""
+msgstr "L'immissione di un numero nel campo di ricerca effettuerà una chiamata"
 
 #: ui/generalsettingsview.ui:143
 msgid "Show chat on the right."
-msgstr ""
+msgstr "Mostra chat sulla destra."
 
 #: ui/generalsettingsview.ui:149
 msgid "Show chat on the bottom."
-msgstr ""
+msgstr "Mostra la chat in basso."
 
 #: ui/generalsettingsview.ui:171
 msgid "History Settings"
@@ -1106,71 +1083,71 @@
 
 #: ui/generalsettingsview.ui:189
 msgid "Keep history for (days):"
-msgstr ""
+msgstr "Mantieni la cronologia per (giorni):"
 
 #: ui/generalsettingsview.ui:210
 msgid "(set to 0 for unlimited history)"
-msgstr ""
+msgstr "(imposta 0 per cronologia illimitata)"
 
 #: ui/generalsettingsview.ui:219
 msgid "Clear all history"
-msgstr ""
+msgstr "Pulisci la cronologia"
 
 #: ui/incomingcallview.ui:105
 msgid "Incoming..."
-msgstr ""
+msgstr "In arrivo..."
 
 #: ui/incomingcallview.ui:133
 msgid "   Accept"
-msgstr ""
+msgstr "Accetta"
 
 #: ui/incomingcallview.ui:148
 msgid "   Reject"
-msgstr ""
+msgstr "Rifiuta"
 
 #: ui/incomingcallview.ui:163
 msgid "   Hang-up"
-msgstr ""
+msgstr "Riattacca"
 
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
-msgstr ""
+msgstr "Impostazioni Audio"
 
 #: ui/mediasettingsview.ui:40
 msgid "Audio manager:"
-msgstr ""
+msgstr "Audio manager:"
 
 #: ui/mediasettingsview.ui:52
 msgid "Ringtone device:"
-msgstr ""
+msgstr "Dispositivo suoneria:"
 
 #: ui/mediasettingsview.ui:64
 msgid "Output device:"
-msgstr ""
+msgstr "Dispositivo di output:"
 
 #: ui/mediasettingsview.ui:76
 msgid "Input device:"
-msgstr ""
+msgstr "Dispositivo di input:"
 
 #: ui/mediasettingsview.ui:134
 msgid "Camera Settings"
-msgstr ""
+msgstr "Impostazioni Fotocamera"
 
 #: ui/mediasettingsview.ui:150
 msgid "Device:"
-msgstr ""
+msgstr "Dispositivo:"
 
 #: ui/mediasettingsview.ui:162
 msgid "Channel:"
-msgstr ""
+msgstr "Canale:"
 
 #: ui/mediasettingsview.ui:174
 msgid "Resolution:"
-msgstr ""
+msgstr "Risoluzione:"
 
 #: ui/mediasettingsview.ui:186
 msgid "Frame rate:"
-msgstr ""
+msgstr "Frame rate:"
 
 #: ui/ringgearsmenu.ui:13
 msgid "_About"
@@ -1178,7 +1155,7 @@
 
 #: ui/ringgearsmenu.ui:19
 msgid "_Quit"
-msgstr ""
+msgstr "_Esci"
 
 #: ui/ringmainwindow.ui:17
 msgid "Menu"
@@ -1196,25 +1173,29 @@
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Opzioni"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
-msgstr ""
+msgstr "Conversazioni"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Contatti"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Cronologia"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Richiesta di contatto"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
-msgstr ""
+msgstr "immetti il nome utente qui"
 
 #: ui/usernameregistrationbox.ui:24
 msgid "Register"
diff --git a/po/ja.po b/po/ja.po
index 219718a..e8aab24 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Japanese (http://www.transifex.com/savoirfairelinux/ring/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@
 msgid "_Remove server"
 msgstr "サーバーを削除(_R)"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "ホスト名"
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr "不明"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "パスワードが一致しません"
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr "自動生成..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "ユーザー名"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "パスワード"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "パスワードを表示"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "ボイスメール番号"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "名前サービス URL"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "自動応答呼び出し"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP 有効"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "DTMF トーン形式:"
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "名前"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "全般"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "端末"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "セキュリティ"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "詳細"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "アカウント \"%s\" を削除してもよろしいですか？"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "新規アカウント"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "有効"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "別名"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "状態"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "アバター画像を開く"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "開く(_O)"
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Ring 用の GNOME クライアント"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "RingID を検索"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "不正な Ring ユーザー名: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Ring ユーザー名を解決できません: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "チャットを開く"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "連絡先または番号を検索"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "RingID を取得しています..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr ""
+msgstr "Ring は、ユーザーの自由とプライバシーを尊重する普遍的なコミュニケーションのためのフリーソフトウェアです。"
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -584,7 +592,7 @@
 
 #: ui/accountcreationwizard.ui:32
 msgid "Welcome to "
-msgstr ""
+msgstr "ようこそ"
 
 #: ui/accountcreationwizard.ui:66
 msgid "Create Ring Account"
@@ -634,7 +642,7 @@
 
 #: ui/accountcreationwizard.ui:223 ui/accountcreationwizard.ui:435
 msgid "Next"
-msgstr ""
+msgstr "次へ"
 
 #: ui/accountcreationwizard.ui:265
 msgid "Profile"
@@ -646,7 +654,7 @@
 
 #: ui/accountcreationwizard.ui:327
 msgid "Ring Account"
-msgstr ""
+msgstr "Ringアカウント"
 
 #: ui/accountcreationwizard.ui:340
 msgid "Register public username (experimental):"
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -739,7 +747,7 @@
 
 #: ui/accountgeneraltab.ui:82
 msgid "Parameters"
-msgstr ""
+msgstr "パラメーター"
 
 #: ui/accountimportexportview.ui:14
 msgid "Export selected account"
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
-msgstr ""
+msgstr "アカウントの移行が必要です"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -859,7 +831,7 @@
 
 #: ui/accountsecuritytab.ui:222
 msgid "Private key"
-msgstr ""
+msgstr "プライベートキー"
 
 #: ui/accountsecuritytab.ui:245
 msgid "Private key password"
@@ -867,7 +839,7 @@
 
 #: ui/accountsecuritytab.ui:292
 msgid "TLS protocol method"
-msgstr ""
+msgstr "TLSプロトコル方式"
 
 #: ui/accountsecuritytab.ui:315
 msgid "Outgoing TLS server name"
@@ -883,7 +855,7 @@
 
 #: ui/accountsecuritytab.ui:387
 msgid "Use custom cipher list"
-msgstr ""
+msgstr "独自の暗号リストを使用"
 
 #: ui/accountsecuritytab.ui:444
 msgid "Verify incoming certificates (server side)"
@@ -953,10 +925,14 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
-msgid "Send"
+#: ui/chatview.ui:60
+msgid "Send invitation"
 msgstr ""
 
+#: ui/chatview.ui:122
+msgid "Send"
+msgstr "送信"
+
 #: ui/choosecontactview.ui:34
 msgid "Create New"
 msgstr ""
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "アカウント"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "設定"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "連絡先"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "履歴"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "連絡先のリクエスト"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 577baeb..0882182 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2017-01-17 16:11+0000\n"
-"Last-Translator: Moo\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Lithuanian (http://www.transifex.com/savoirfairelinux/ring/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@
 msgid "_Remove server"
 msgstr "Š_alinti serverį"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Kompiuterio vardas"
 
@@ -60,7 +60,7 @@
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Slaptažodžiai nesutampa"
 
@@ -98,39 +98,39 @@
 msgid "auto-generating..."
 msgstr "automatiškai kuriama..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Naudotojo vardas"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Rodyti slaptažodį"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Įgaliotasis serveris"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Balso pašto numeris"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
-msgstr ""
+msgstr "Vardų paslaugos URL"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Automatiškai atsiliepti į skambučius"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP įjungta"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "DTMF tono tipas:"
 
@@ -160,59 +160,59 @@
 msgid "Name"
 msgstr "Vardas"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Bendra"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Įrenginiai"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Saugumas"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Išplėstiniai"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Ar tikrai norite ištrinti paskyrą \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nauja paskyra"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Įjungta"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Slapyvardis"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Būsena"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Atverti avataro paveikslą"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "A_tverti"
 
@@ -320,65 +320,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME kliento programa, skirta Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Neteisingas Ring naudotojo vardas: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
-msgstr ""
+msgstr "Klaida, nustatant naudotojo vardą, tikriausiai, vardų serveris yra nepasiekiamas"
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Nepavyko nustatyti Ring naudotojo vardo: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
-msgstr ""
+msgstr "skambinti"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "atverti pokalbį"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Ieškokite kontaktus arba įveskite numerį"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "Tai yra jūsų Ring naudotojo vardas.\nNukopijuokite ir dalinkitės juo su draugais!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Tai yra jūsų RingID.\nNukopijuokite ir dalinkitės juo su savo draugais!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "gaunamas RingID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring yra visuotiniam susisiekimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "Ring ID QR kodas"
@@ -425,11 +433,11 @@
 
 #: src/usernameregistrationbox.cpp:319
 msgid "Could not initiate name registration, try again."
-msgstr ""
+msgstr "Nepavyko inicijuoti vardo registracijos, bandykite dar kartą."
 
 #: src/usernameregistrationbox.cpp:361
 msgid "Register this username on the blockchain"
-msgstr ""
+msgstr "Registruoti šį naudotojo vardą blokų grandinėje"
 
 #: src/usernameregistrationbox.cpp:397
 msgid "Invalid username"
@@ -615,7 +623,7 @@
 "previous device, choose the Ring Account to use and select \"Link another "
 "device to this account\". You will get the necessary PIN to complete this "
 "form. The PIN is only valid for 10 minutes."
-msgstr ""
+msgstr "Norėdami susieti šį įrenginį su kita paskyra, jūs, iš pradžių, turite gauti PIN kodą. Tam, kad sukurtumėte PIN kodą, ankstesniame įrenginyje pereikite į paskyros tvarkymo nustatymą, pasirinkite norimą naudoti Ring paskyra ir pasirinkite \"Susieti kitą įrenginį su šia paskyra\". Jūs gausite šiai formai užpildyti reikalingą PIN kodą. PIN kodas galioja tik 10 minučių."
 
 #: ui/accountcreationwizard.ui:126 ui/accountcreationwizard.ui:215
 #: ui/accountcreationwizard.ui:427
@@ -624,7 +632,7 @@
 
 #: ui/accountcreationwizard.ui:134
 msgid "Okay, I have the PIN!"
-msgstr ""
+msgstr "Gerai, aš turiu PIN!"
 
 #: ui/accountcreationwizard.ui:172
 msgid "Enter your pin:"
@@ -644,7 +652,7 @@
 
 #: ui/accountcreationwizard.ui:285
 msgid "Full name:"
-msgstr ""
+msgstr "Visas vardas:"
 
 #: ui/accountcreationwizard.ui:327
 msgid "Ring Account"
@@ -659,9 +667,9 @@
 "By checking this, you will register a unique username on the Ring network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr ""
+msgstr "Tai pažymėję, jūs Ring tinkle užregistruosite unikalų naudotojo vardą. Norėdami su jumis susisiekti, žmonės galės jį naudoti vietoj jūsų RingID, kuris yra 40 simbolių ilgio."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Slaptažodis (patvirtinkite):"
 
@@ -669,7 +677,7 @@
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
-msgstr ""
+msgstr "Šis slaptažodis bus naudojamas jūsų paskyros duomenų šifravimui ir, norint susieti naują įrenginį su jūsų paskyra."
 
 #: ui/accountcreationwizard.ui:459
 msgid "Generating your Ring account..."
@@ -688,7 +696,7 @@
 msgstr "Klaida, kuriant/įkeliant paskyrą."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "Gerai"
 
@@ -725,15 +733,15 @@
 
 #: ui/accountdevicestab.ui:141
 msgid "Export on the Ring"
-msgstr ""
+msgstr "Eksportuoti Ring sistemoje"
 
 #: ui/accountdevicestab.ui:162
 msgid "Exporting account on the Ring..."
-msgstr ""
+msgstr "Eksportuojama paskyra Ring sistemoje..."
 
 #: ui/accountdevicestab.ui:186
 msgid "Your generated pin:"
-msgstr ""
+msgstr "Jūsų sukurtas pin:"
 
 #: ui/accountgeneraltab.ui:42
 msgid "Account"
@@ -757,7 +765,7 @@
 
 #: ui/accountimportexportview.ui:70
 msgid "choose location"
-msgstr ""
+msgstr "pasirinkite vietą"
 
 #: ui/accountimportexportview.ui:76
 msgid "Choose export location"
@@ -765,7 +773,7 @@
 
 #: ui/accountimportexportview.ui:95
 msgid "Choose archive location"
-msgstr ""
+msgstr "Pasirinkite archyvo vietą"
 
 #: ui/accountimportexportview.ui:169 ui/accountview.ui:110
 msgid "Export"
@@ -775,61 +783,25 @@
 msgid "Import"
 msgstr "Importuoti"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Reikalingas paskyros perkėlimas"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "Ši paskyra turi būti perkelta į naująjį Ring paskyros formatą:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Slapyvardis:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Avataras:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Norėdami tęsti perkėlimą, privalote pasirinkti savo paskyrai slaptažodį. Šis slaptažodis bus naudojamas jūsų pagrindiniam raktui užšifruoti. Taip pat jis bus reikalingas pridedant naujus įrenginius į jūsų Ring paskyrą. Jeigu jūs nesate pasiruošę pasirinkti slaptažodį, tuomet galite užverti Ring ir pratęsti perkėlimą vėliau."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Slaptažodis:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Perkelti paskyrą"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Perkeliama paskyra..."
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Nepavyko perkelti paskyros. Bandykite vėl."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Pasirinkite savo Ring naudotojo vardą"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Šiuo metu Ring turi decentralizuotą naudotojų vardų registrą. Tai reiškia, kad dabar su savo draugais galite susisiekti vietoj jų RingID, naudodami jų naudotojų vardus. Naudotojų vardų registras yra paskirstytas ir visi naudotojai gali jame ieškoti informacijos."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Registruoti mano naudotojo vardą vėliau"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -953,9 +925,13 @@
 
 #: ui/chatview.ui:45 ui/chatview.ui:48
 msgid "Place call"
+msgstr "Skambinti"
+
+#: ui/chatview.ui:60
+msgid "Send invitation"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Siųsti"
 
@@ -1090,7 +1066,7 @@
 
 #: ui/generalsettingsview.ui:130
 msgid "Entering a number in the search entry will place a new call."
-msgstr ""
+msgstr "Įvedus numerį į paieškos įrašą, bus pradedama skambinti."
 
 #: ui/generalsettingsview.ui:143
 msgid "Show chat on the right."
@@ -1196,22 +1172,26 @@
 msgid "Accounts"
 msgstr "Paskyros"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Pokalbiai"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Istorija"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Kontakto užklausos"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "čia įveskite naudotojo vardą"
diff --git a/po/ms.po b/po/ms.po
index aa0071c..c914d4f 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Malay (http://www.transifex.com/savoirfairelinux/ring/language/ms/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Alamat server"
 
@@ -57,7 +57,7 @@
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -95,39 +95,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Nama pengguna"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Kara laluan"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proksi"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Nombor peti suara"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Jawab panggilan automatik"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP diaktifkan"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -157,59 +157,59 @@
 msgid "Name"
 msgstr "Nama"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Utama"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Perangkat"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Penyulitan"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Lanjut"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr ""
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr ""
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr ""
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Nama panggilan"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -317,65 +317,73 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -658,7 +666,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -685,7 +693,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -772,60 +780,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -952,7 +924,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr ""
 
@@ -1193,22 +1169,26 @@
 msgid "Accounts"
 msgstr "Akaun"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Aturan"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kenalan"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Sejarah"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 0eb83c6..c305a39 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/savoirfairelinux/ring/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Vertsnavn"
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr "autogenererer..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Brukernavn"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Passord"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Vis passord"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Talepostkassenummer"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Auto-svar på samtaler"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP aktivt"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "DTMF tone-type:"
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "Navn"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Generell"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Avansert"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Er du sikker på at du ønsker å slette konto «%s»?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Ny konto"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-klient for Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Søk kontakter eller skriv inn nummer"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Dette er din RingID.\nKopier og del den med dine venner!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "Henter RingID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr "Importer"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Send"
 
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Samtaler"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historie"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 614cdcc..2353e96 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,17 +1,17 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
-# Nathan Follens, 2016
+# Nathan Follens, 2016-2017
 # Niels van Duijkeren <nielsvanduijkeren@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 23:09+0000\n"
-"Last-Translator: Nathan Follens\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Dutch (http://www.transifex.com/savoirfairelinux/ring/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@
 msgid "_Remove server"
 msgstr "Server ve_rwijderen"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Hostnaam"
 
@@ -59,7 +59,7 @@
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Wachtwoorden komen niet overeen"
 
@@ -97,39 +97,39 @@
 msgid "auto-generating..."
 msgstr "automatisch genereren..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Wachtwoord tonen"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Voicemailnummer"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "Naamdienst-URL"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Oproepen automatisch beantwoorden"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP ingeschakeld"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Type kiestoon (DTMF):"
 
@@ -159,59 +159,59 @@
 msgid "Name"
 msgstr "Naam"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Algemeen"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Apparaten"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Beveiliging"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Weet je zeker dat je account \"%s\" wil verwijderen?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Account aanmaken"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Avatarbestand openen"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Openen"
 
@@ -319,65 +319,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-cliënt voor Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "Ring-ID wordt opgezocht"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Ongeldige Ring-gebruikersnaam: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr "Fout bij oplossen van gebruikersnaam, naamserver is misschien niet bereikbaar"
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Kon Ring-gebruikersnaam niet oplossen: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "oproep maken"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "gesprek openen"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Zoek contacten of geef nummer in"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "Dit is je Ring-gebruikersnaam.\nDeel hem met je vrienden!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Dit is je Ring-ID.\nDeel hem met je vrienden!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "Ring-ID ophalen..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "Ring-ID-QR-code"
@@ -614,7 +622,7 @@
 "previous device, choose the Ring Account to use and select \"Link another "
 "device to this account\". You will get the necessary PIN to complete this "
 "form. The PIN is only valid for 10 minutes."
-msgstr "Om dit apparaat aan een andere account te koppelen moet je eerst een PIN-code verkrijgen. Ga om de PIN-code te genereren naar de accountbeheerinstellingen van een vorig apparaat, kies de Ring-account die je wil gebruiken en selecteer \"Een ander apparaat aan deze account koppelen\". Je zal de PIN-code krijgen die je nodig hebt om dit proces te voltooien. De PIN-code is slechts 10 minuten geldig."
+msgstr "Om dit apparaat aan een andere account te koppelen moet je eerst een pincode verkrijgen. Ga om de pincode te genereren naar de accountbeheerinstellingen van een vorig apparaat, kies de Ring-account die je wil gebruiken en selecteer \"Een ander apparaat aan deze account koppelen\". Je zal de pincode krijgen die je nodig hebt om dit proces te voltooien. De pincode is slechts 10 minuten geldig."
 
 #: ui/accountcreationwizard.ui:126 ui/accountcreationwizard.ui:215
 #: ui/accountcreationwizard.ui:427
@@ -623,11 +631,11 @@
 
 #: ui/accountcreationwizard.ui:134
 msgid "Okay, I have the PIN!"
-msgstr "Oké, ik heb de PIN-code!"
+msgstr "Oké, ik heb de pincode!"
 
 #: ui/accountcreationwizard.ui:172
 msgid "Enter your pin:"
-msgstr "Voer je PIN-code in:"
+msgstr "Voer je pincode in:"
 
 #: ui/accountcreationwizard.ui:191
 msgid "Enter your password:"
@@ -660,7 +668,7 @@
 "characters long."
 msgstr "Als je dit aanvinkt zal je een unieke gebruikersnaam op het Ring-netwerk registreren. Andere personen kunnen deze gebruikersnaam gebruiken om je te bellen, ipv je 40 tekens lange Ring-ID."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Bevestig wachtwoord:"
 
@@ -687,7 +695,7 @@
 msgstr "Fout bij aanmaken/laden van account."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "Oké"
 
@@ -712,7 +720,7 @@
 "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 "Om een nieuw apparaat aan je Ring-account toe te voegen, moet je je account exporteren naar de Ring. Dit zal een PIN-code genereren die je binnen de 5 minuten op je nieuwe apparaat moet invoeren."
+msgstr "Om een nieuw apparaat aan je Ring-account toe te voegen, moet je je account exporteren naar de Ring. Dit zal een pincode genereren die je binnen de 5 minuten op je nieuwe apparaat moet invoeren."
 
 #: ui/accountdevicestab.ui:107 ui/accountimportexportview.ui:111
 msgid "Password (required):"
@@ -732,7 +740,7 @@
 
 #: ui/accountdevicestab.ui:186
 msgid "Your generated pin:"
-msgstr "Je gegenereerde PIN-code:"
+msgstr "Je gegenereerde pincode:"
 
 #: ui/accountgeneraltab.ui:42
 msgid "Account"
@@ -774,61 +782,25 @@
 msgid "Import"
 msgstr "Importeren"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Accountmigratie vereist"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "De volgende account moet gemigreerd worden naar het nieuwe Ring-accountformaat:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Om door te gaan met de migratie moet je een wachtwoord voor je account kiezen. Dit wachtwoord zal gebruikt worden om je hoofdsleutel te versleutelen. Het wachtwoord wordt vereist om nieuwe apparaten aan je Ring-account toe te voegen. Als je nog niet klaar bent om een wachtwoord te kiezen kan je Ring sluiten en de migratie later verderzetten."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Account migreren"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Account wordt gemigreerd..."
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Migreren van account mislukt. Probeer het opnieuw."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Kies je Ring-gebruikersnaam"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Vanaf nu heeft Ring een gedecentraliseerd gebruikersnaamregister. Dit betekent dat je je vrienden nu met hun gebruikersnamen kan contacteren ipv hun Ring-ID's. Het gebruikersnaamregister is gedistribueerd en alle gebruikers kunnen het raadplegen."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Registreer mijn gebruikersnaam later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -954,7 +926,11 @@
 msgid "Place call"
 msgstr "Oproep maken"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Versturen"
 
@@ -1195,22 +1171,26 @@
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Gesprekken"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Contacten"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Geschiedenis"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Contactverzoeken"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "voer gebruikersnaam hier in"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index d588e04..4c3dc4d 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/savoirfairelinux/ring/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr ""
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "Naam"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Algemeen"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Beveiliging"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Gevorderd"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr ""
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr ""
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr ""
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr ""
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Staat"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr ""
 
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr ""
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr ""
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index affe61b..2b8ec78 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,21 +8,21 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: 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=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: src/accountadvancedtab.cpp:389
 msgid "_Remove server"
 msgstr "_Usuń serwer"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Nazwa hosta"
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr "Automatyczne generowanie..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Hasło"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Pokaż hasło"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Pełnomocnik"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Numer poczty głosowej"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Automatyczne odbierz połączeńia"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP jest włączone"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Typ tonu DTMF:"
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "Imię"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Generalne"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Zabezpieczenia"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Czy jesteś pewien, że chcesz usunąć konto \"%s\" ?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nowe konto"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Włączone"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Stan"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Klient GNOME dla Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Szukaj kontakty lub wpisz numer"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "To jest twój RingID. Skopiuj i podziel go ze swoimi przyjaciółmi!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "Pobieranie RingID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr "Importuj"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Hasło:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Wyślij"
 
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "Konta"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Rozmowy"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historia"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index be6998c..aa67276 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-22 18:50+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Portuguese (http://www.transifex.com/savoirfairelinux/ring/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Nome do host"
 
@@ -59,7 +59,7 @@
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -97,39 +97,39 @@
 msgid "auto-generating..."
 msgstr "gerando..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Usuário"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Senha"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Exibir senha"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Número do correio de voz"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Chamadas respondias automaticamente"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP habilitado"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Tipo de tom DTMF:"
 
@@ -159,59 +159,59 @@
 msgid "Name"
 msgstr "Nome"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Geral"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Segurança"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Tem certeza de que deseja excluir a conta \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nova Conta"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Ativo"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Apelido"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -319,65 +319,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Cliente GNOME para Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Pesquise pelo nome ou número"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Este é seu RingID.\nCopie e avise seus amigos!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "recuperando RingID"
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -660,7 +668,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -687,7 +695,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -774,60 +782,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -954,7 +926,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Enviar"
 
@@ -1195,22 +1171,26 @@
 msgid "Accounts"
 msgstr "Contas"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Configurações"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Contatos"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Histórico"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5b7dd97..b61c16e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,9 +1,9 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
-# Cleiton Floss, 2016
+# Herbert Koenigg, 2016
 # Gabriel Moura <gabriel.all@yandex.com>, 2016
 # Gustavo H. M. Silva <gustavohmsilva@tuta.io>, 2016
 # Keven de Oliveira <keven@zenbackup.com.br>, 2015
@@ -11,14 +11,14 @@
 # Nícolas Wildner <nicolasgaucho@gmail.com>, 2015
 # Ramiro Varandas Jr <ramirovjnr@gmail.com>, 2016
 # Raul Dipeas <rauldipeas@outlook.com>, 2015
-# Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>, 2016
+# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-21 15:27+0000\n"
-"Last-Translator: Gustavo H. M. Silva <gustavohmsilva@tuta.io>\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/savoirfairelinux/ring/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,7 @@
 msgid "_Remove server"
 msgstr "_Remover servidor"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Servidor"
 
@@ -66,7 +66,7 @@
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Senhas não condizentes"
 
@@ -104,39 +104,39 @@
 msgid "auto-generating..."
 msgstr "gerando automaticamente"
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Senha"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Mostrar senha"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Número do correio de voz"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "URL do servidor"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Chamadas de Auto-Resposta"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP ativado"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Tipo de tom DTMF"
 
@@ -166,59 +166,59 @@
 msgid "Name"
 msgstr "Nome"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Geral"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Segurança"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Você tem certeza que deseja deletar a conta \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nova conta"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Apelido"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Abrir Avatar"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -326,65 +326,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- cliente GNOME para o Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "Verificando RingID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Nome de usuário inválido: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr "Erro resolvendo usuário, nome de domínio provavelmente inacessível"
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Não foi possível resolver nome de usuário Ring: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "fazer ligação"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "abrir chat"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Busque por contatos ou insira o número"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "Este é o seu usuário no Ring\nCopie-o e o compartilhe com seus amigos!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Este é o seu RingID.\nSalve e compartilhe com seus amigos!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "buscando RingID"
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "QR code do seu ID Ring"
@@ -667,7 +675,7 @@
 "characters long."
 msgstr "Ao confirmar esta opção, você irá registrar um nome de usuário único na rede Ring. Pessoas poderão usa-lo para lhe contactar ao invés de usar o seu RingID, que possui uma sequencia de 40 caracteres."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Senha (confirmar):"
 
@@ -694,7 +702,7 @@
 msgstr "Erro ao criar/carregar conta."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -781,61 +789,25 @@
 msgid "Import"
 msgstr "Importar"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Migração de conta necessária"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "A seguinte conta precisa ser migrada para o novo formato de contas do Ring:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Nome de usuário:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Para continuar a migração, você deve escolher uma senha para a sua conta. Essa senha senha utilizada para encriptar sua senha mestre. Ela será necessária para adicionar novos dispositivos à sua conta Ring. Se você não estiver pronto para escolher uma senha, deve fechar o Ring e continuar a migração depois."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Senha:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Migrar conta"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Migrando conta..."
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Falha ao migrar conta. Tente de novo."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Escolha seu nome de usuário Ring"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "A partir de agora Ring possui um registro de usuários descentralizado. Isso significa que agora você pode contactar seus amigos utilizando seus nomes de usuário ao invés de seus RingIDs. O usuário registrado é distribuído e todos os outros usuários podem consultá-lo."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Registrar meu nome de usuário mais tarde"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -961,7 +933,11 @@
 msgid "Place call"
 msgstr "Fazer ligação"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Enviar"
 
@@ -1202,22 +1178,26 @@
 msgid "Accounts"
 msgstr "Contas"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Configurações"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Contatos"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Histórico"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Solicitações de contatos"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "entre o nome de usuário aqui"
diff --git a/po/ro.po b/po/ro.po
index 54a115c..7fe4b68 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Romanian (http://www.transifex.com/savoirfairelinux/ring/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr ""
 
@@ -57,7 +57,7 @@
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -95,39 +95,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Nume de utilizator"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Parola"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -157,59 +157,59 @@
 msgid "Name"
 msgstr "Nume"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "General"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Seuritate"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Avansat"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr ""
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr ""
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr ""
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr ""
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -317,65 +317,73 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -658,7 +666,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -685,7 +693,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -772,60 +780,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -952,7 +924,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr ""
 
@@ -1193,22 +1169,26 @@
 msgid "Accounts"
 msgstr "Conturi"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Setari"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr ""
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr ""
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Solicitări de contact"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 698e8fc..ed12ac7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -11,7 +11,7 @@
 # ruwebstyle <ruwebstyle@ya.ru>, 2015
 # Viktor Filinkov <bruteforce@sigil.tk>, 2015
 # Yaroslav Molochko <onorua@gmail.com>, 2015
-# Александр <suslikkreal@gmail.com>, 2015
+# Александр Суслов <suslikkreal@gmail.com>, 2015
 # Александр Асланьян <asl174@yandex.ru>, 2015
 # Андрей Шевчук <andrei@shvchk.com>, 2016
 # Чураков Александр, 2015
@@ -19,9 +19,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-25 03:47+0000\n"
-"Last-Translator: Андрей Шевчук <andrei@shvchk.com>\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Russian (http://www.transifex.com/savoirfairelinux/ring/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,7 +33,7 @@
 msgid "_Remove server"
 msgstr "Удалить сервер"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Имя компьютера"
 
@@ -69,7 +69,7 @@
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Пароли не совпадают"
 
@@ -107,39 +107,39 @@
 msgid "auto-generating..."
 msgstr "авто-генерация..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Пароль"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Показать пароль"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Прокси"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Номер голосовой почты"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "Адрес сервиса имён"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Автоответчик"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP разрешен"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Тип DTMF"
 
@@ -169,59 +169,59 @@
 msgid "Name"
 msgstr "Имя"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Общий"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Устройства"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Безопасность"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Вы уверены что хотите удалить аккаунт \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Новый аккаунт"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Включен"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Псевдоним"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Состояние"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Открыть изображение аватара"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Открыть"
 
@@ -329,65 +329,73 @@
 msgid "- GNOME client for Ring"
 msgstr "GNOME клиент для Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "ищем RingID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Недопустимое имя Ring: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr "Ошибка нахождения имени пользователя, сервер имен возможно недоступен"
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Не удалось распознать имя Ring: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "позвонить"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "открыть чат"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Найдите контакты или введите номер"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "Это ваше имя пользователя Ring.\nСкопируйте и поделитесь им со своими друзьями!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Это ваш RingID.\nСкопируйте и поделитесь им с вашими друзьями!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "получение RingID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring — это свободная программа для связи, уважающая свободу и конфиденциальность пользователей."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "Ring ID QR код"
@@ -670,7 +678,7 @@
 "characters long."
 msgstr "Отмечая это, вы зарегистрируете уникальное имя в сети Ring. Другие пользователи смогут использовать его чтобы связаться с вами вместо RingID, который 40 символов длинной."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Пароль (подтверждение):"
 
@@ -697,7 +705,7 @@
 msgstr "Ошибка создания/загрузки аккаунта."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -784,61 +792,25 @@
 msgid "Import"
 msgstr "Импорт"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Необходим перенос аккаунта"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "Следующий аккаунт требуется преобразовать в новый формат аккаунта Ring:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Псевдоним:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Аватар:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Чтобы продолжить перенос, вам нужно выбрать пароль для вашего аккаунта. Этот пароль будет использован для шифрования вашего основного ключа. Он потребуется для добавления новых устройств к вашему аккаунту Ring. Если вы не готовы выбрать пароль, можете закрыть Ring и продолжить перенос позднее."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Перенести аккаунт"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Перенос аккаунта…"
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Не удалось перенести аккаунт. Попробуйте снова."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Выберите ваше имя пользователя Ring"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Теперь в Ring есть децентрализованный реестр имён. Это значит, что вы теперь можете связываться со своими друзьями, используя их имена вместо RingID. Реестр имён — распределённый, и к нему могут обращаться все пользователи."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Зарегистрировать имя пользователя позже"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -964,7 +936,11 @@
 msgid "Place call"
 msgstr "Сделать звонок"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Отправить"
 
@@ -1205,22 +1181,26 @@
 msgid "Accounts"
 msgstr "Аккаунты"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Настройки"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Разговоры"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Контакты"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "История"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Запросы на добавление в контакты"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "введите имя пользователя здесь"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 8e64219..72d6b1b 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/savoirfairelinux/ring/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@
 msgid "_Remove server"
 msgstr "_Удалить сервер"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Узел"
 
@@ -59,7 +59,7 @@
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -97,39 +97,39 @@
 msgid "auto-generating..."
 msgstr "Автогенерация..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Пользователь"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Пароль"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Показать"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Прокси"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Номер голосовой почты"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Автоответчик"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Тип сигнала DTMF:"
 
@@ -159,59 +159,59 @@
 msgid "Name"
 msgstr "Имя"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Основные"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Безопасность"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Вы уверены что хотите удалить учетную запись \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Новая учетная запись"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Включен"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Псевдоним"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Статус"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Открыть аватар"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Открыть"
 
@@ -319,65 +319,73 @@
 msgid "- GNOME client for Ring"
 msgstr " - GNOME клиент для Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -660,7 +668,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -687,7 +695,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -774,60 +782,24 @@
 msgid "Import"
 msgstr "Импорт"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -954,7 +926,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Отправть"
 
@@ -1195,22 +1171,26 @@
 msgid "Accounts"
 msgstr "Учетные записи"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Настройки"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Беседы"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Контакты"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Журнал"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 2703ce4..3ec1d96 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/savoirfairelinux/ring/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr ""
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP zapnuté"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "Názov"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Všeobecné"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Zariadenia"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr ""
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr ""
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr ""
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr ""
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Zapnutý"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "Ok"
 
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr ""
 
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "Účet"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr ""
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr ""
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/sq_AL.po b/po/sq_AL.po
index 0f5942c..ae046d6 100644
--- a/po/sq_AL.po
+++ b/po/sq_AL.po
@@ -1,16 +1,16 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
-# Besnik <besnik@programeshqip.org>, 2016
+# Besnik <besnik@programeshqip.org>, 2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Albanian (Albania) (http://www.transifex.com/savoirfairelinux/ring/language/sq_AL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,15 @@
 
 #: src/accountadvancedtab.cpp:389
 msgid "_Remove server"
-msgstr ""
+msgstr "_Hiqe shërbyesin"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Strehëemër"
 
 #: src/accountadvancedtab.cpp:510 ui/accountadvancedtab.ui:314
 msgid "Port"
-msgstr ""
+msgstr "Portë"
 
 #: src/accountaudiotab.cpp:175 src/accountvideotab.cpp:184
 msgid "Enabled"
@@ -51,14 +51,14 @@
 msgid ""
 "Your account was created, but we could not register your username. Try again"
 " from the settings menu."
-msgstr ""
+msgstr "Llogaria juaj u krijua, por s’regjistruam dot emrin tuaj të përdoruesit. Riprovoni prej menusë së rregullimeve."
 
 #: src/accountcreationwizard.cpp:283
 msgctxt "The default username / account alias, if none is set by the user"
 msgid "Unknown"
 msgstr "E panjohur"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Fjalëkalimet nuk përputhen"
 
@@ -72,7 +72,7 @@
 
 #: src/accountdevicestab.cpp:213
 msgid "Could not initiate export to the Ring, try again"
-msgstr ""
+msgstr "S’u fillua dot eksportimi te Ring, riprovoni"
 
 #: src/accountdevicestab.cpp:246
 msgctxt "Device Name Column"
@@ -94,47 +94,47 @@
 
 #: src/accountgeneraltab.cpp:238
 msgid "auto-generating..."
-msgstr ""
+msgstr "po vetëprodhohet…"
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Emër përdoruesi"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Krijoni llogari"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Shfaqe fjalëkalimin"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Ndërmjetës"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
-msgstr ""
+msgstr "Numër voicemail"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Vetëpërgjigju thirrjeve"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
-msgstr ""
+msgstr "Lloj toni DTMF"
 
 #: src/accountimportexportview.cpp:99
 msgid "Select account export location"
-msgstr ""
+msgstr "Përzgjidhni vend eksportimi llogarie"
 
 #: src/accountimportexportview.cpp:102 ui/accountcreationwizard.ui:82
 #: ui/accountdevicestab.ui:135 ui/accountimportexportview.ui:161
@@ -143,80 +143,80 @@
 
 #: src/accountimportexportview.cpp:104
 msgid "Select"
-msgstr ""
+msgstr "Përzgjidhe"
 
 #: src/accountimportexportview.cpp:211
 msgid "Error importing account(s)"
-msgstr ""
+msgstr "Gabim importimi llogarie(sh)"
 
 #: src/accountimportexportview.cpp:263
 msgid "Error exporting account(s)"
-msgstr ""
+msgstr "Gabim eksportimi llogarie(sh)"
 
 #: src/accountvideotab.cpp:190
 msgctxt "The name of the codec"
 msgid "Name"
 msgstr "Emër"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Të përgjithshme"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Pajisje"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Siguri"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Të mëtejshme"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
-msgstr ""
+msgstr "Jeni i sigurt se doni të fshihet llogaria \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
-msgstr ""
+msgstr "Llogari e Re"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr ""
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Gjendje"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
-msgstr ""
+msgstr "Hap Figurë Avatari"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
-msgstr ""
+msgstr "_Anuloje"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
-msgstr ""
+msgstr "_Hape"
 
 #: src/backends/edscontactbackend.cpp:193
 msgid "Unknown EDS addressbook"
-msgstr ""
+msgstr "Libër adresash EDS i panjohur"
 
 #: src/backends/edscontactbackend.cpp:213
 msgctxt "Backend type"
@@ -228,7 +228,7 @@
 msgid ""
 "Are you sure you want to delete contact \"%s\"? It will be removed from your"
 " system's addressbook."
-msgstr ""
+msgstr "Jeni i sigurt se doni të fshihet kontakti \"%s\"? Do të hiqet nga libri i adresave të sistemit tuaj."
 
 #: src/contactpopupmenu.cpp:114
 msgid "_Call"
@@ -236,19 +236,19 @@
 
 #: src/contactpopupmenu.cpp:117
 msgid "_Copy name"
-msgstr ""
+msgstr "_Kopjoji emrin"
 
 #: src/contactpopupmenu.cpp:120
 msgid "_Copy number"
-msgstr ""
+msgstr "_Kopjoji numrin"
 
 #: src/contactpopupmenu.cpp:123
 msgid "_Add to contact"
-msgstr ""
+msgstr "_Shtoje te kontakti"
 
 #: src/contactpopupmenu.cpp:126
 msgid "_Remove contact"
-msgstr ""
+msgstr "_Hiqe kontaktin"
 
 #: src/dialogs.c:53
 msgid "Working..."
@@ -260,13 +260,13 @@
 msgid ""
 "Gaston Miron - Beta 2\n"
 "built on %.25s"
-msgstr ""
+msgstr "Gaston Miron - Beta 2\nmontuar në %.25s"
 
 #: src/dialogs.c:132
 msgid ""
 "The GNOME client for Ring.\n"
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr ""
+msgstr "Klienti Ring për GNOME.\nRing është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij."
 
 #: src/editcontactview.cpp:185
 msgctxt "Phone number category"
@@ -277,7 +277,7 @@
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
-msgstr ""
+msgstr "Ky është veprim me pasoja shkatërruese. Jeni i sigurt se doni të fshihet krejt historiku juaj i fjalosjeve dhe thirrjeve?"
 
 #: src/historyview.cpp:293
 msgctxt "Call history"
@@ -287,7 +287,7 @@
 #: src/historyview.cpp:338
 msgctxt "Call history"
 msgid "Date"
-msgstr ""
+msgstr "Datë"
 
 #: src/ringnotify.cpp:148
 msgid "Incoming call"
@@ -296,17 +296,17 @@
 #: src/ringnotify.cpp:165 src/ringnotify.cpp:343
 msgctxt "notification action name"
 msgid "Show"
-msgstr ""
+msgstr "Shfaqe"
 
 #: src/ringnotify.cpp:267
 #, c-format
 msgctxt "Text message notification"
 msgid "%s says:"
-msgstr ""
+msgstr "%s thotë:"
 
 #: src/ring_client_options.c:66
 msgid "Enable debug"
-msgstr ""
+msgstr "Aktivizo diagnostikim"
 
 #: src/ring_client_options.c:68
 msgid ""
@@ -318,92 +318,100 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
-msgstr ""
+msgstr "Emër përdoruesi Ring i pavlefshëm: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
+msgstr "hape fjalosjen"
+
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
-msgstr ""
+msgstr "Përzgjidhni kontake ose jepni një numër"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
-msgstr ""
+msgstr "Ky është emri juaj i përdoruesit në Ring.\nKopjojeni dhe jepuani shokëve!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
-msgstr ""
+msgstr "Kjo është RingID-ja juaj.\nKopjojeni dhe jepuani shokëve!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr ""
+msgstr "Ring është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
-msgstr ""
+msgstr "Kod QR ID-je Ring-u"
 
 #: src/usernameregistrationbox.cpp:128
 msgid "The entered username is not available"
-msgstr ""
+msgstr "Emri i dhënë për përdorues s’është i lirë"
 
 #: src/usernameregistrationbox.cpp:129
 msgid "Username is not available"
-msgstr ""
+msgstr "Emri i përdoruesit s’është i lirë"
 
 #: src/usernameregistrationbox.cpp:138
 msgid "The entered username is not valid"
-msgstr ""
+msgstr "Emri i përdoruesit i dhënë s’është i vlefshëm"
 
 #: src/usernameregistrationbox.cpp:139
 msgid "Username is not valid"
-msgstr ""
+msgstr "Emri i përdoruesit s’është i vlefshëm"
 
 #: src/usernameregistrationbox.cpp:148
 msgid "The entered username is available"
-msgstr ""
+msgstr "Emri i përdoruesit që u dha është i mundshëm"
 
 #: src/usernameregistrationbox.cpp:149
 msgid "Username is available"
-msgstr ""
+msgstr "Emri i përdoruesit është i lirë"
 
 #: src/usernameregistrationbox.cpp:158
 msgid "Failed to perform lookup"
@@ -415,15 +423,15 @@
 
 #: src/usernameregistrationbox.cpp:248
 msgid "Looking up username availability..."
-msgstr ""
+msgstr "Po shihet nëse është i lirë emri i përdoruesit…"
 
 #: src/usernameregistrationbox.cpp:310 ui/accountcreationwizard.ui:485
 msgid "Registering username..."
-msgstr ""
+msgstr "Po regjistrohet emri i përdoruesit…"
 
 #: src/usernameregistrationbox.cpp:319
 msgid "Could not initiate name registration, try again."
-msgstr ""
+msgstr "S’u fillua dot regjistrimi i emrit, riprovoni."
 
 #: src/usernameregistrationbox.cpp:361
 msgid "Register this username on the blockchain"
@@ -444,7 +452,7 @@
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
-msgstr ""
+msgstr "Gabim Ring"
 
 #: src/native/dbuserrorhandler.cpp:57
 msgid "Trying to reconnect to the Ring daemon (dring)..."
@@ -466,27 +474,27 @@
 
 #: src/video/video_widget.cpp:549
 msgid "Show advanced information"
-msgstr ""
+msgstr "Shfaq informacion të thelluar"
 
 #: ui/accountadvancedtab.ui:81
 msgid "Registration expire timeout (seconds):"
-msgstr ""
+msgstr "Kohë skadimi regjistrimi (në sekonda):"
 
 #: ui/accountadvancedtab.ui:103
 msgid "Allow calls from unknown peers"
-msgstr ""
+msgstr "Lejo thirrje prej personash të panjohur"
 
 #: ui/accountadvancedtab.ui:117
 msgid "Allow calls from peers in your call history"
-msgstr ""
+msgstr "Lejo thirrje prej personash në historikun tuaj të thirrjeve"
 
 #: ui/accountadvancedtab.ui:131
 msgid "Allow calls from peers in your contacts list"
-msgstr ""
+msgstr "Lejo thirrje prej personash në listën tuaj të kontakteve"
 
 #: ui/accountadvancedtab.ui:149
 msgid "Registration"
-msgstr ""
+msgstr "Regjistrim"
 
 #: ui/accountadvancedtab.ui:178
 msgid "Use random port"
@@ -494,7 +502,7 @@
 
 #: ui/accountadvancedtab.ui:199
 msgid "Local port:"
-msgstr ""
+msgstr "Portë vendore:"
 
 #: ui/accountadvancedtab.ui:225
 msgid "Network Interface"
@@ -502,7 +510,7 @@
 
 #: ui/accountadvancedtab.ui:253
 msgid "Same as local parameters"
-msgstr ""
+msgstr "Njësoj si parametrat vendorë"
 
 #: ui/accountadvancedtab.ui:268
 msgid "Set published address and port:"
@@ -510,15 +518,15 @@
 
 #: ui/accountadvancedtab.ui:292
 msgid "Address"
-msgstr ""
+msgstr "Adresë"
 
 #: ui/accountadvancedtab.ui:340
 msgid "Use STUN"
-msgstr ""
+msgstr "Përdor STUN"
 
 #: ui/accountadvancedtab.ui:363 ui/accountadvancedtab.ui:412
 msgid "server URL"
-msgstr ""
+msgstr "URL shërbyesi"
 
 #: ui/accountadvancedtab.ui:389
 msgid "Use TURN"
@@ -526,11 +534,11 @@
 
 #: ui/accountadvancedtab.ui:434
 msgid "username"
-msgstr ""
+msgstr "emër përdoruesi"
 
 #: ui/accountadvancedtab.ui:455
 msgid "password"
-msgstr ""
+msgstr "fjalëkalim"
 
 #: ui/accountadvancedtab.ui:479
 msgid "realm"
@@ -552,11 +560,11 @@
 
 #: ui/accountadvancedtab.ui:618 ui/accountadvancedtab.ui:694
 msgid "Min"
-msgstr ""
+msgstr "Min."
 
 #: ui/accountadvancedtab.ui:641 ui/accountadvancedtab.ui:717
 msgid "Max"
-msgstr ""
+msgstr "Maks."
 
 #: ui/accountadvancedtab.ui:665
 msgid "Audio RTP Port Range"
@@ -634,7 +642,7 @@
 
 #: ui/accountcreationwizard.ui:223 ui/accountcreationwizard.ui:435
 msgid "Next"
-msgstr ""
+msgstr "Pasuesi"
 
 #: ui/accountcreationwizard.ui:265
 msgid "Profile"
@@ -646,7 +654,7 @@
 
 #: ui/accountcreationwizard.ui:327
 msgid "Ring Account"
-msgstr ""
+msgstr "Llogari Ring"
 
 #: ui/accountcreationwizard.ui:340
 msgid "Register public username (experimental):"
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr ""
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
-msgstr ""
+msgstr "Lyp migrim llogarie"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Fjalëkalim:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -851,11 +823,11 @@
 
 #: ui/accountsecuritytab.ui:148
 msgid "CA certificate"
-msgstr ""
+msgstr "Dëshmi AD"
 
 #: ui/accountsecuritytab.ui:185
 msgid "User certificate"
-msgstr ""
+msgstr "Dëshmi përdoruesi"
 
 #: ui/accountsecuritytab.ui:222
 msgid "Private key"
@@ -863,11 +835,11 @@
 
 #: ui/accountsecuritytab.ui:245
 msgid "Private key password"
-msgstr ""
+msgstr "Fjalëkalim kyçi privat"
 
 #: ui/accountsecuritytab.ui:292
 msgid "TLS protocol method"
-msgstr ""
+msgstr "Metodë protokolli TLS"
 
 #: ui/accountsecuritytab.ui:315
 msgid "Outgoing TLS server name"
@@ -879,23 +851,23 @@
 
 #: ui/accountsecuritytab.ui:371
 msgid "Use default ciphers"
-msgstr ""
+msgstr "Përdor shifër parazgjedhje"
 
 #: ui/accountsecuritytab.ui:387
 msgid "Use custom cipher list"
-msgstr ""
+msgstr "Përdor listë vetjake shifre"
 
 #: ui/accountsecuritytab.ui:444
 msgid "Verify incoming certificates (server side)"
-msgstr ""
+msgstr "Verifikoji dëshmitë ardhëse (më anë të shërbyesit)"
 
 #: ui/accountsecuritytab.ui:459
 msgid "Verify answer certificates (client side)"
-msgstr ""
+msgstr "Verifikoji dëshmitë ardhëse (më anë të klientit)"
 
 #: ui/accountsecuritytab.ui:474
 msgid "Require a certificate for incoming TLS connections"
-msgstr ""
+msgstr "Kërko një dëshmi për lidhje TLS ardhëse"
 
 #: ui/accountsecuritytab.ui:493
 msgid "Negotiation Encryption"
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr ""
 
@@ -976,7 +952,7 @@
 #: ui/currentcallview.ui:273 ui/currentcallview.ui:295
 #: ui/currentcallview.ui:425
 msgid "Hold"
-msgstr ""
+msgstr "Mbaje"
 
 #: ui/currentcallview.ui:291
 msgid "Toggle mute audio"
@@ -988,7 +964,7 @@
 
 #: ui/currentcallview.ui:317 ui/currentcallview.ui:416
 msgid "Mute video"
-msgstr ""
+msgstr "Mbylli videon"
 
 #: ui/currentcallview.ui:336
 msgid "Toggle record audio"
@@ -1016,7 +992,7 @@
 
 #: ui/currentcallview.ui:407
 msgid "Mute audio"
-msgstr ""
+msgstr "Mbylli zërin"
 
 #: ui/currentcallview.ui:452
 msgid "Record"
@@ -1100,7 +1076,7 @@
 
 #: ui/generalsettingsview.ui:171
 msgid "History Settings"
-msgstr ""
+msgstr "Rregullime Historiku"
 
 #: ui/generalsettingsview.ui:189
 msgid "Keep history for (days):"
@@ -1194,25 +1170,29 @@
 msgid "Accounts"
 msgstr "Llogari"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Rregullime"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
-msgstr ""
+msgstr "Biseda"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historik"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
-msgstr ""
+msgstr "jepni këtu emrin e përdoruesit"
 
 #: ui/usernameregistrationbox.ui:24
 msgid "Register"
diff --git a/po/sv.po b/po/sv.po
index 08df06c..9339f72 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-29 20:15+0000\n"
-"Last-Translator: Åke Engelbrektson\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Swedish (http://www.transifex.com/savoirfairelinux/ring/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@
 msgid "_Remove server"
 msgstr "_Ta bort server"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Värdnamn"
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Lösenorden stämmer inte"
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr "autogenererar..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Användarnamn"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Visa lösenord"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Nummer till röstbrevlåda"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "Namntjänst-URL"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Besvara samtal automatiskt"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP aktiverad"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "DTMF-tontyp:"
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "Namn"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Allmänt"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Enheter"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Säkerhet"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Vill du verkligen ta bort kontot \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Nytt konto"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Status"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Öppna avatarbild"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Öppna"
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-klient för Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "slår upp Ring-ID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Ogiltigt Ring-namn: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr "Fel vid uppslagning av användarnamn. Namnservern är möjligen onåbar."
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Kunde inte slå upp användarnamnet: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "starta samtal"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "öppna chatt"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Sök i kontakter eller ange nummer"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "Detta är ditt Ring-användarnamn.\nKopiera och dela det med dina vänner!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Detta är ditt Ring-ID.\nKopiera och dela det med dina vänner!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "hämtar Ring-ID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "Ring-ID som QR-kod"
@@ -659,7 +667,7 @@
 "characters long."
 msgstr "Genom att aktivera detta, registrerar du ett unikt användarnamn på Ring-nätverket. Folk kan använda det för att kontakta dig, istället för att använda ditt Ring-ID, som är 40 tecken långt."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Lösenord (bekräfta):"
 
@@ -686,7 +694,7 @@
 msgstr "Fel vid skapande/inläsning av konto."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -773,61 +781,25 @@
 msgid "Import"
 msgstr "Importera"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Kontomigrering krävs"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "Följande konto behöver migreras till det nya Ring-kontoformatet:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "För att gå vidare med migreringen, måste du välja ett lösenord för ditt konto. Detta lösenord kommer att användas för att kryptera din huvudnyckel. Huvudnyckeln krävs för att lägga till nya enheter till ditt Ring-konto. Om du inte är redo att välja ett lösenord, kan du stänga ner Ring och återuppta migreringen senare."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Migrera konto"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Migrerar konto..."
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Kunde inte migrera kontot. Försök igen."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Ange ditt Ring-namn"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Nu har Ring ett decentraliserat register över användarnamn. Det innebär att du kan kontakta dina vänner via deras användarnamn, istället för Ring-ID. Namnregistret är distribuerat och alla användare kan konsultera det."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Registrera mitt användarnamn senare"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr "Starta samtal"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Skicka"
 
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "Konton"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Konversationer"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Historik"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "Kontaktförfrågningar"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "Ange användarnamn här"
diff --git a/po/tr.po b/po/tr.po
index 2da1ef1..b32cbfc 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -12,9 +12,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-20 14:00+0000\n"
-"Last-Translator: Emin Tufan <etcetin@gmail.com>\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Turkish (http://www.transifex.com/savoirfairelinux/ring/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@
 msgid "_Remove server"
 msgstr "Sunucuyu _sil"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Sunucu adı"
 
@@ -62,7 +62,7 @@
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "Parolalar uyuşmuyor"
 
@@ -100,39 +100,39 @@
 msgid "auto-generating..."
 msgstr "kendiliğinden oluşturuluyor..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Parola"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Parolayı göster"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Vekil"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Sesli ileti numarası"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "Ad hizmeti adresi"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Aramaları kendiliğinden cevapla"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP etkin"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "DTMF ton türü:"
 
@@ -162,59 +162,59 @@
 msgid "Name"
 msgstr "Ad"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Genel"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "Aygıtlar"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Güvenlik"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "\"%s\" hesabını silmek istediğinizden emin misiniz?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Yeni Hesap"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Etkin"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Takma ad"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Durum"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Avatar Resmi Aç"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "_Aç"
 
@@ -322,65 +322,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Ring için GNOME istemcisi"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "RingID'ye bakılıyor"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Geçersiz Ring kullanıcı adı: %s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr "Kullanıcı adı çözümlenirken hata oluştu, muhtemelen ad sunucusuna erişilemiyor"
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "Ring kullanıcı adı ayrıştırılamıyor: %s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "ara"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "konuşma aç"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Kişileri ara veya numara gir"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "Bu senin Ring kullanıcı adın.\nKopyala ve arkadaşlarınla paylaş!"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Bu senin RingID'in.\nKopyala ve arkadaşlarınla paylaş!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "RingID alınıyor..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring; kullanıcılarının özgürlüklerine ve gizliliğine önem veren, evrensel iletişim için özgür yazılımdır."
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "OR kod Ring Kimliği"
@@ -663,7 +671,7 @@
 "characters long."
 msgstr "Bunu seçerek Ring ağı üzerinde benzersiz bir kullanıcı adı kayıt olacaksınız. İnsanlar 40 karakter uzunluğundaki Ring Kimliğiniz yerine bunu kullanarak sizinle iletişime geçebilecek."
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "Parola (Onay):"
 
@@ -690,7 +698,7 @@
 msgstr "Hesap oluşturma/yükleme hatası."
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "TAMAM"
 
@@ -777,61 +785,25 @@
 msgid "Import"
 msgstr "İçe aktar"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "Hesap taşıma gerekli"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "Aşağıdaki hesabın yeni Ring hesabı biçimine göç ettirilmesi gerekir:"
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "Takma ad:"
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "Göçü sürdürmek için, hesabınız için bir parola seçmelisiniz. Bu parola ana anahtarınızı şifrelemek için kullanılacak. Bu, yeni aygıtları Ring hesabınıza eklerken gerekecek. Eğer parola seçmek için hazır değilseniz, Ring'i kapatabilir ve göçü daha sonra sürdürebilirsiniz."
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Parola:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "Hesap göçü"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "Hesap göç ettiriliyor..."
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "Hesap göç ettirme başarısız. Yeniden deneyin."
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "Ring kullanıcı adınızı seçin"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Artık Ring'in dağıtılmış bir kullanıcı adı kütüğü var. Bu artık arkadaşlarınıza RingID'leri yerine kullanıcı adlarıyla ulaşabileceğiniz anlamına geliyor. Kullanıcı adı kütüğü aleni ve tüm kullanıcılar tarafından görülebilir."
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "Kullanıcı adımı daha sonra kaydet"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -957,7 +929,11 @@
 msgid "Place call"
 msgstr "Ara"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Gönder"
 
@@ -1198,22 +1174,26 @@
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Konuşmalar"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Geçmiş"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "İletişim istekleri"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "kullanıcı adını buraya gir"
diff --git a/po/uk.po b/po/uk.po
index 9126a3e..344f515 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -14,9 +14,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Ukrainian (http://www.transifex.com/savoirfairelinux/ring/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "Ім'я хоста"
 
@@ -64,7 +64,7 @@
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -102,39 +102,39 @@
 msgid "auto-generating..."
 msgstr "автогенеруємо..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "Ім’я"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "Пароль"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "Відобразити пароль"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Проксі"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "Номер голосової пошти"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "Автоматично відповідати на дзвінки"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP увімкнено"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "Вид DTMF:"
 
@@ -164,59 +164,59 @@
 msgid "Name"
 msgstr "Ім’я"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "Головні"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "Безпека"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "Продвинуті"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "Ви впевнені що хочете видалити цей аккаунт: \"%s\"?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "Новий Аккаунт"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "Додаткове ім’я"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "Статус"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "Відкрити зображення Аватару."
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -324,65 +324,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME клієнт для Ring"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Пошук контактів чи введіть номер"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "Це Ваш RingID.\nКопіюйте й поширюйте його серед Ваших друзів!"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "отримати RingID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -665,7 +673,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -692,7 +700,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "OK"
 
@@ -779,60 +787,24 @@
 msgid "Import"
 msgstr "Імпортувати"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -959,7 +931,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "Відправити"
 
@@ -1200,22 +1176,26 @@
 msgid "Accounts"
 msgstr "Аккаунти"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "Налаштування"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "Групові чати"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "Контакти"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "Історія"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index cd4fb7f..87005a6 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Chinese (http://www.transifex.com/savoirfairelinux/ring/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "主機名稱"
 
@@ -60,7 +60,7 @@
 msgid "Unknown"
 msgstr "未知"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr ""
 
@@ -98,39 +98,39 @@
 msgid "auto-generating..."
 msgstr "自動產生中..."
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "使用者名"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "密码"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "顯示密碼"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "代理"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "語音留言號"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "來電自動應答"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP 已啟動"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -160,59 +160,59 @@
 msgid "Name"
 msgstr "姓名"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "通用"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr ""
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "安全"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "進階"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "確定刪除 %s 帳號?"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "建新帳號"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "已啟用"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "別名"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "狀態"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr ""
 
@@ -320,65 +320,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME 版 Ring 客戶端"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "從通訊錄尋找或是輸入號碼"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "這是你的RingID\n複製並且與你的朋友們分享！"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "正在取的Ring ID..."
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -661,7 +669,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -688,7 +696,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -775,60 +783,24 @@
 msgid "Import"
 msgstr "載入"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr ""
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -955,7 +927,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "發送"
 
@@ -1196,22 +1172,26 @@
 msgid "Accounts"
 msgstr "帳號"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "設定"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "對話"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "歷史記錄"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6b6c0bc..a9460b7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,16 +1,17 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
-# LINGXIAO YANG <ling-xiao.yang@mail.mcgill.ca>, 2016
+# Ling-Xiao Yang <ling-xiao.yang@mail.mcgill.ca>, 2017
+# Ling-Xiao Yang <ling-xiao.yang@mail.mcgill.ca>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-21 22:13+0000\n"
-"Last-Translator: LINGXIAO YANG <ling-xiao.yang@mail.mcgill.ca>\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/savoirfairelinux/ring/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@
 msgid "_Remove server"
 msgstr "删除服务器(_R)"
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "主机名"
 
@@ -58,7 +59,7 @@
 msgid "Unknown"
 msgstr "未知"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "密码不匹配"
 
@@ -96,39 +97,39 @@
 msgid "auto-generating..."
 msgstr "自动生成中…"
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "用户名"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "密码"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "显示密码"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "代理"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr "语音信箱号码"
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr "名称服务器URL"
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr "自动应答来电"
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr "UPnP已启用"
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr "DTMF拨号音类型："
 
@@ -158,59 +159,59 @@
 msgid "Name"
 msgstr "姓名"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "通用"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "设备"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "安全"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "高级"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "确定删除帐户“%s”吗？"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "新帐户"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "别名"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "状态"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr "打开头像图片"
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "打开(_O)"
 
@@ -318,65 +319,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Ring的GNOME客户端"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr "正在查找RingID"
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr "Ring用户名非法：%s"
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr "用户名解析错误，或因服务器故障"
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr "无法解析Ring用户名：%s"
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "拨出"
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "发起聊天"
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "查找通讯录或输入号码"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr "这是您的Ring用户名。\n复制并发送给您的朋友！"
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "这是您的RingID。\n复制并发送给您的朋友！"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr "正在获取RingID…"
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr "Ring是自由软件，尊重用户的通讯自由与隐私。"
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr "RingID二维码"
@@ -596,15 +605,15 @@
 
 #: ui/accountcreationwizard.ui:74
 msgid "Link this device to an account"
-msgstr "将这台设备与一个帐户进行连接"
+msgstr "将此设备与一个帐户进行连接"
 
 #: ui/accountcreationwizard.ui:75
 msgid "Link this devices to a Ring account created on another device"
-msgstr "将这台设备与其他设备创建的Ring帐户进行连接"
+msgstr "将此设备与其他设备创建的Ring帐户进行连接"
 
 #: ui/accountcreationwizard.ui:103 ui/accountcreationwizard.ui:157
 msgid "Link this device to an existing account"
-msgstr "将这台设备与已有帐户进行连接"
+msgstr "将此设备与已有帐户进行连接"
 
 #: ui/accountcreationwizard.ui:118
 msgid ""
@@ -613,7 +622,7 @@
 "previous device, choose the Ring Account to use and select \"Link another "
 "device to this account\". You will get the necessary PIN to complete this "
 "form. The PIN is only valid for 10 minutes."
-msgstr "要将这台设备连接至另一帐户，您需要一个PIN。请在该帐户的原有设备上，前往“帐户管理”，选择该Ring帐户并点击“将另一台设备与该帐户进行连接”以获得PIN，再填写至该设备。您获得的PIN将在10分钟内有效。"
+msgstr "要将此设备连接至另一帐户，您需要一个PIN。请在该帐户的原有设备上，前往“帐户管理”，选择该Ring帐户并点击“将另一设备与该帐户进行连接”以获得PIN，将其填写在这里。您获得的PIN将在10分钟内有效。"
 
 #: ui/accountcreationwizard.ui:126 ui/accountcreationwizard.ui:215
 #: ui/accountcreationwizard.ui:427
@@ -659,7 +668,7 @@
 "characters long."
 msgstr "勾选这项以注册Ring网络用户名。该用户名唯一并可替代40字符的RingID。"
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr "密码（确认）："
 
@@ -686,7 +695,7 @@
 msgstr "创建或载入帐户时发生错误。"
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr "确定"
 
@@ -773,61 +782,25 @@
 msgid "Import"
 msgstr "倒入"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr "需要帐户迁移"
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr "以下帐户需要迁移至新版Ring数据格式："
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr "别名："
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
-msgstr "头像："
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
+msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr "要进行帐户迁移，您需要为该帐户设置一个密码，用于加密您的主密钥。当您连接该帐户至其他设备时，您需要输入这个密码。如果您尚未确定密码，请关闭Ring并稍后重新进行迁移。"
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "密码："
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr "迁移帐户"
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr "正在迁移帐户…"
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr "帐户迁移失败，请重试。"
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "设置您的Ring用户名"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr "Ring使用分散式的用户名存储机制，允许您在RingID之外，使用自定义的用户名寻找您的联系人。该分布式存储机制允许所有用户进行用户名查询。"
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
-msgstr "稍后再注册我的用户名"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
+msgstr ""
 
 #: ui/accountsecuritytab.ui:37
 msgid "Encrypt media streams (SRTP)"
@@ -953,7 +926,11 @@
 msgid "Place call"
 msgstr "发起通话"
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "发送"
 
@@ -1194,22 +1171,26 @@
 msgid "Accounts"
 msgstr "帐户"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "设置"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr "会话"
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "通讯录"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "历史记录"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr "联系人请求"
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr "在此处输入用户名"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7c8d2da..97b28d9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,5 +1,5 @@
 # Gettext PO translation template file for the GNOME client of the Ring project.
-# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # This file is distributed under the same license as the Ring package.
 # 
 # Translators:
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 15:13-0500\n"
-"PO-Revision-Date: 2016-12-19 20:14+0000\n"
-"Last-Translator: Stepan Salenikovich\n"
+"POT-Creation-Date: 2017-06-12 10:36-0400\n"
+"PO-Revision-Date: 2017-06-12 14:43+0000\n"
+"Last-Translator: Guillaume Roguez\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/savoirfairelinux/ring/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@
 msgid "_Remove server"
 msgstr ""
 
-#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:263
+#: src/accountadvancedtab.cpp:502 src/accountgeneraltab.cpp:267
 msgid "Hostname"
 msgstr "主機名稱"
 
@@ -58,7 +58,7 @@
 msgid "Unknown"
 msgstr "未知"
 
-#: src/accountcreationwizard.cpp:454 ui/accountmigrationview.ui:132
+#: src/accountcreationwizard.cpp:461
 msgid "Passwords don't match"
 msgstr "密碼不相符"
 
@@ -96,39 +96,39 @@
 msgid "auto-generating..."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:247 src/accountgeneraltab.cpp:273
+#: src/accountgeneraltab.cpp:251 src/accountgeneraltab.cpp:277
 msgid "Username"
 msgstr "使用者名稱"
 
-#: src/accountgeneraltab.cpp:283
+#: src/accountgeneraltab.cpp:287
 msgid "Password"
 msgstr "密碼"
 
-#: src/accountgeneraltab.cpp:296
+#: src/accountgeneraltab.cpp:300
 msgid "Show password"
 msgstr "顯示密碼"
 
-#: src/accountgeneraltab.cpp:302
+#: src/accountgeneraltab.cpp:306
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/accountgeneraltab.cpp:312
+#: src/accountgeneraltab.cpp:316
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:324
+#: src/accountgeneraltab.cpp:328
 msgid "Name service URL"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:337
+#: src/accountgeneraltab.cpp:341
 msgid "Auto-answer calls"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:345
+#: src/accountgeneraltab.cpp:349
 msgid "UPnP enabled"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:353
+#: src/accountgeneraltab.cpp:357
 msgid "DTMF tone type:"
 msgstr ""
 
@@ -158,59 +158,59 @@
 msgid "Name"
 msgstr "名稱"
 
-#: src/accountview.cpp:177
+#: src/accountview.cpp:167
 msgctxt "Account settings"
 msgid "General"
 msgstr "一般"
 
-#: src/accountview.cpp:185
+#: src/accountview.cpp:175
 msgctxt "Account settings"
 msgid "Devices"
 msgstr "裝置"
 
-#: src/accountview.cpp:191
+#: src/accountview.cpp:181
 msgctxt "Account settings"
 msgid "Security"
 msgstr "安全性"
 
-#: src/accountview.cpp:196
+#: src/accountview.cpp:186
 msgctxt "Account settings"
 msgid "Advanced"
 msgstr "進階"
 
-#: src/accountview.cpp:251
+#: src/accountview.cpp:241
 #, c-format
 msgid "Are you sure you want to delete account \"%s\"?"
 msgstr "你確定要刪除帳號 \"%s\" 嗎？"
 
-#: src/accountview.cpp:386
+#: src/accountview.cpp:368
 msgid "New Account"
 msgstr "新增帳號"
 
-#: src/accountview.cpp:538
+#: src/accountview.cpp:518
 msgctxt "Account state column"
 msgid "Enabled"
 msgstr "啟用"
 
-#: src/accountview.cpp:544
+#: src/accountview.cpp:524
 msgctxt "Account alias (name) column"
 msgid "Alias"
 msgstr "別名"
 
-#: src/accountview.cpp:552
+#: src/accountview.cpp:532
 msgctxt "Account status column"
 msgid "Status"
 msgstr "狀態"
 
-#: src/avatarmanipulation.cpp:381
+#: src/avatarmanipulation.cpp:380
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:384
+#: src/avatarmanipulation.cpp:383
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/avatarmanipulation.cpp:386
+#: src/avatarmanipulation.cpp:385
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -318,65 +318,73 @@
 msgid "- GNOME client for Ring"
 msgstr "- Ring 的 GNOME 用戶端"
 
-#: src/ringmainwindow.cpp:544
-msgid "looking up RingID"
-msgstr ""
-
-#: src/ringmainwindow.cpp:584
+#: src/ringmainwindow.cpp:613
 #, c-format
 msgid "Invalid Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:599
+#: src/ringmainwindow.cpp:628
 msgid "Error resolving username, nameserver is possibly unreachable"
 msgstr ""
 
-#: src/ringmainwindow.cpp:613
+#: src/ringmainwindow.cpp:642
 #, c-format
 msgid "Could not resolve Ring username: %s"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1036
+#: src/ringmainwindow.cpp:1150
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1038
+#: src/ringmainwindow.cpp:1152
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1211
+#: src/ringmainwindow.cpp:1232
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s..."
+msgstr ""
+
+#: src/ringmainwindow.cpp:1238
+#, c-format
+msgctxt "string format will be replaced by the account alias"
+msgid "%s (error)"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1429
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "搜尋聯絡人或輸入號碼"
 
-#: src/ringwelcomeview.cpp:69
+#: src/ringwelcomeview.cpp:75
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:77
+#: src/ringwelcomeview.cpp:83
 msgctxt "Do not translate \"RingID\""
 msgid ""
 "This is your RingID.\n"
 "Copy and share it with your friends!"
 msgstr "這是你的 RingID.\n複製並與你的朋友分享！"
 
-#: src/ringwelcomeview.cpp:84
+#: src/ringwelcomeview.cpp:90
 msgid "fetching RingID..."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:139
+#: src/ringwelcomeview.cpp:148
 msgid ""
 "Ring is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:185
+#: src/ringwelcomeview.cpp:202
 msgctxt "Do not translate \"Ring ID\""
 msgid "Ring ID QR code"
 msgstr ""
@@ -659,7 +667,7 @@
 "characters long."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:369 ui/accountmigrationview.ui:161
+#: ui/accountcreationwizard.ui:369
 msgid "Password (confirm):"
 msgstr ""
 
@@ -686,7 +694,7 @@
 msgstr ""
 
 #: ui/accountcreationwizard.ui:549 ui/accountdevicestab.ui:217
-#: ui/accountdevicestab.ui:239 ui/accountmigrationview.ui:236
+#: ui/accountdevicestab.ui:239
 msgid "OK"
 msgstr ""
 
@@ -773,60 +781,24 @@
 msgid "Import"
 msgstr "匯入"
 
-#: ui/accountmigrationview.ui:28
+#: ui/accountmigrationview.ui:14
 msgid "Account migration required"
 msgstr ""
 
-#: ui/accountmigrationview.ui:37
-msgid ""
-"The following account needs to be migrated to the new Ring account format:"
-msgstr ""
-
-#: ui/accountmigrationview.ui:52
+#: ui/accountmigrationview.ui:39
 msgid "Alias:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:98
-msgid "Avatar:"
+#: ui/accountmigrationview.ui:102
+msgid "Please enter your password:"
 msgstr ""
 
-#: ui/accountmigrationview.ui:122
-msgid ""
-"To proceed with the migration, you must choose a password for your account. "
-"This password will be used to encrypt your master key. It will be required "
-"for adding new devices to your Ring account. If you are not ready to choose "
-"a password, you may close Ring and resume the migration later."
-msgstr ""
-
-#: ui/accountmigrationview.ui:141
-msgid "Password:"
-msgstr "密碼："
-
-#: ui/accountmigrationview.ui:184
+#: ui/accountmigrationview.ui:129
 msgid "Migrate account"
 msgstr ""
 
-#: ui/accountmigrationview.ui:202
-msgid "Migrating account..."
-msgstr ""
-
-#: ui/accountmigrationview.ui:228
-msgid "Failed to migrate account. Try again."
-msgstr ""
-
-#: ui/accountmigrationview.ui:255
-msgid "Choose your Ring username"
-msgstr "選擇你的 Ring 使用者名稱"
-
-#: ui/accountmigrationview.ui:264
-msgid ""
-"As of now Ring has a decentralized username registry. This means that you "
-"can now contact your friends using their usernames instead of their RingIDs."
-" The username registry is distributed and all users are able to consult it."
-msgstr ""
-
-#: ui/accountmigrationview.ui:279
-msgid "Register my username later"
+#: ui/accountmigrationview.ui:148
+msgid "Migration failed, wrong password ?"
 msgstr ""
 
 #: ui/accountsecuritytab.ui:37
@@ -953,7 +925,11 @@
 msgid "Place call"
 msgstr ""
 
-#: ui/chatview.ui:112
+#: ui/chatview.ui:60
+msgid "Send invitation"
+msgstr ""
+
+#: ui/chatview.ui:122
 msgid "Send"
 msgstr "傳送"
 
@@ -1194,22 +1170,26 @@
 msgid "Accounts"
 msgstr "帳號"
 
-#: ui/ringmainwindow.ui:90
+#: ui/ringmainwindow.ui:102
 msgid "Settings"
 msgstr "設定"
 
-#: ui/ringmainwindow.ui:184
+#: ui/ringmainwindow.ui:206
 msgid "Conversations"
 msgstr ""
 
-#: ui/ringmainwindow.ui:203
+#: ui/ringmainwindow.ui:228
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: ui/ringmainwindow.ui:222
+#: ui/ringmainwindow.ui:250
 msgid "History"
 msgstr "記錄"
 
+#: ui/ringmainwindow.ui:272
+msgid "Contact requests"
+msgstr ""
+
 #: ui/usernameregistrationbox.ui:12
 msgid "enter username here"
 msgstr ""