diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/data/cx.ring.RingGnome.gschema.xml ring-20180816.2.e26b79f~ds1/client-gnome/data/cx.ring.RingGnome.gschema.xml
--- ring-20180712.2.f3b87a6~ds1/client-gnome/data/cx.ring.RingGnome.gschema.xml	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/data/cx.ring.RingGnome.gschema.xml	2018-08-16 15:09:41.000000000 +0000
@@ -34,6 +34,10 @@
         <default>true</default>
         <summary>Enable notifications for incoming calls.</summary>
     </key>
+    <key name="enable-pending-notifications" type="b">
+        <default>true</default>
+        <summary>Enable notifications for pending requests.</summary>
+    </key>
     <key name="enable-chat-notifications" type="b">
         <default>true</default>
         <summary>Enable notifications for new chat messages.</summary>
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/ar.po ring-20180816.2.e26b79f~ds1/client-gnome/po/ar.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/ar.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/ar.po	2018-08-16 15:09:41.000000000 +0000
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Jihed Amine Maaref <jihed-amine.maaref@savoirfairelinux.com>\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"
@@ -44,7 +44,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -133,44 +133,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "ألغِ"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -181,83 +181,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "التالي"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "خذ لمحة"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "حساب"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "اسم المستخدم"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "إحداث حسابك Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "موافق"
@@ -283,42 +283,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "إعرض الدردشة على اليمين"
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "إعرض الدردشة في الأسفل"
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "إعدادات التاريخ"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "أبقي على التاريخ ل (أيام):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(ضع صفر لتاريخ غير محدود)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "أزل كل التاريخ"
 
@@ -334,7 +338,7 @@
 msgid "Media"
 msgstr "ميديا"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "إعدادات"
 
@@ -437,7 +441,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -512,7 +516,7 @@
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
-msgstr ""
+msgstr "تشغيل ذاتي"
 
 #: ui/newaccountsettingsview.ui:1514
 msgid "Encrypt media streams (SRTP)"
@@ -572,7 +576,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "تأمين"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -632,15 +636,15 @@
 
 #: ui/newaccountsettingsview.ui:2560
 msgid "Video codecs"
-msgstr ""
+msgstr "مرمّزات الفيديو"
 
 #: ui/newaccountsettingsview.ui:2623
 msgid "Enable video"
-msgstr ""
+msgstr "فعل الفيديو"
 
 #: ui/newaccountsettingsview.ui:2650
 msgid "Audio codecs"
-msgstr ""
+msgstr "مرمّزات الصوت"
 
 #: ui/newaccountsettingsview.ui:2720
 msgid "SDP Session Negotiation (ICE Fallback)"
@@ -718,7 +722,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -726,34 +730,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "مكالمة واردة"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "إظهار"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "اقبل"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s يقول:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "أرفض"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "رفض"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -779,24 +788,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -809,15 +818,15 @@
 msgid "Contacts"
 msgstr "الاتصالات"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -827,7 +836,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "حفظ الملف"
@@ -890,11 +899,11 @@
 msgid "Voicemail number"
 msgstr "رقم البريد الصوتي"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -918,7 +927,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -930,7 +939,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -940,27 +949,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "مكالمة واردة"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1030,7 +1063,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- وسيط GNOME إلى Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1058,7 +1091,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1068,7 +1101,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "آلي"
@@ -1109,34 +1142,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/bg.po ring-20180816.2.e26b79f~ds1/client-gnome/po/bg.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/bg.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/bg.po	2018-08-16 15:09:41.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Любомир Василев\n"
 "Language-Team: Bulgarian (http://www.transifex.com/savoirfairelinux/ring/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -133,44 +133,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Създай Ring акаунт"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Свързване на това устройство с акаунт"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Свържи това устройство със съществуващ акаунт"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -181,83 +181,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Въведете парола:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Предишен"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Напред"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Профил"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Акаунт"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Потребителско име"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Потвърдете паролата"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Създаване на Вашия акаунт в Ring…"
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Регистриране на потребителското име…"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Може да отнеме известно време."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Получава твоят Ring акаунт…"
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "Добре"
@@ -283,42 +283,46 @@
 msgstr "Включване на известията за входящи повиквания."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Включване на известията за нови съобщения."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Показване на съобщенията отдясно."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Показване на съобщенията отдолу."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Настройки на историята"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Пазене на историята (в дни):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(0 означава безкрайна история)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Изчистване на цялата история"
 
@@ -334,7 +338,7 @@
 msgid "Media"
 msgstr "Звук и видео"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Настройки"
 
@@ -437,7 +441,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -718,7 +722,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -726,34 +730,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Входящо обаждане"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Приемане"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Показване"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Отказ"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s казва:"
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Отказ"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -779,24 +788,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Това действие е разрушително! Сигурни ли сте, че искате да изтриете цялата история на съобщенията и обажданията?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -809,15 +818,15 @@
 msgid "Contacts"
 msgstr "Контакти"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Грешна парола"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Мрежова грешка, опитай отново"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -827,7 +836,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Запазване на файла"
@@ -890,11 +899,11 @@
 msgid "Voicemail number"
 msgstr "Номер на гласова поща"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -918,7 +927,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Отваряне"
 
@@ -930,7 +939,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -940,27 +949,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "започване на разговор"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "отваряне на чата"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Входящо обаждане"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1030,7 +1063,7 @@
 msgid "- GNOME client for Ring"
 msgstr "— Клиент на Ring за ГНОМ"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Паролите не съвпадат"
 
@@ -1058,7 +1091,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1068,7 +1101,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Авт."
@@ -1109,34 +1142,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Извън линия"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "На линия"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/ca.po ring-20180816.2.e26b79f~ds1/client-gnome/po/ca.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/ca.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/ca.po	2018-08-16 15:09:41.000000000 +0000
@@ -12,9 +12,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Benny Beat <bennybeat@gmail.com>\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"
@@ -46,7 +46,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -135,44 +135,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Benvingut a"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Crear compte de Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Crear un compte de Ring (per usuaris nous)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Enllaça aquest dispositiu a un compte"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Enllaça aquest dispositiu a un compte de Ring creat a un altre dispositiu"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Enllaça aquest dispositiu a un compte ja existent"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -183,83 +183,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Entra el pin:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Entra la contrasenya:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Següent"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Perfil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Compte"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Generant el vostre compte de Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Registrant nom d'usuari..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Això pot trigar uns minuts."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Error creant/carregant compte"
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "D'acord"
@@ -285,42 +285,46 @@
 msgstr "Activa notificacions per trucades entrants."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Activa notificacions per missatges de xat nous"
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Mostra imatges i vídeos a la finestra de xat"
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Mostra el cat a la dreta."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Mostra el xat a la part inferior."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Preferències d'historial"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Guarda l'historial durant (dies):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(posar a 0 per a historial il·limitat)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Neteja l'historial"
 
@@ -336,7 +340,7 @@
 msgid "Media"
 msgstr "Mitjans"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Opcions"
 
@@ -433,13 +437,13 @@
 
 #: ui/newaccountsettingsview.ui:460
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -478,7 +482,7 @@
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
-msgstr ""
+msgstr "Preferències avançades"
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
@@ -514,7 +518,7 @@
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
-msgstr ""
+msgstr "Bootstrap"
 
 #: ui/newaccountsettingsview.ui:1514
 msgid "Encrypt media streams (SRTP)"
@@ -574,7 +578,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "Seguretat"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -720,7 +724,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -728,34 +732,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Error de Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Trucada entrant"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Mostra"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Accepta"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s diu:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Rebutja"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Rebutja"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -781,24 +790,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Açò és una operació destructiva. Esteu segur que voleu esborrar tot l'historial de xats i trucades?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -811,15 +820,15 @@
 msgid "Contacts"
 msgstr "Contactes"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Mala contrasenya"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Error de xarxa, proveu de nou"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "No s'ha pogut iniciar la exportació a Ring, proveu de nou"
 
@@ -829,7 +838,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -892,11 +901,11 @@
 msgid "Voicemail number"
 msgstr "Nombre de correu de veu"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -920,7 +929,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Obre"
 
@@ -932,7 +941,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -942,27 +951,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "El client de GNOME per a Ring\nEl Ring és un programari per a comunicacions universals que respecta la llibertat i privacitat dels seus usuaris"
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "fer una trucada"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "obrir un xat"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Trucada entrant"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1032,7 +1065,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Client de GNOME per a Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "No coincideixen les contrasenyes"
 
@@ -1060,7 +1093,7 @@
 msgid "Ring ID QR code"
 msgstr "Codi QR del Ring ID"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1070,7 +1103,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1111,34 +1144,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/cs_CZ.po ring-20180816.2.e26b79f~ds1/client-gnome/po/cs_CZ.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/cs_CZ.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/cs_CZ.po	2018-08-16 15:09:41.000000000 +0000
@@ -11,9 +11,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: fri\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Stepan Salenikovich\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"
@@ -45,7 +45,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -134,44 +134,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Vítejte v"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Vytvořit účet Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Vytvořit nový Ring účet (pro nové uživatele)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Připojit toto zařízení k účtu"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Propojit toto zařízení s účtem, který byl vytvořen na jiném zařízení"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Propojit zařízení s již existujícím účtem"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -182,83 +182,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Vložte svůj pin:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Vložte své heslo:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Další"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Účet"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 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:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Potvrdit heslo"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Vytváří se váš účet Ring…"
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Registruje se uživatelské jméno…"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Toto může pár minut trvat."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Získává se váš účet Ring…"
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Chyba při vytváření/nahrávání účtu."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "Budiž"
@@ -284,42 +284,46 @@
 msgstr "Povolit upozornění na příchozí hovory."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Povolit upozornění na příchozí zprávy."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Zadání čísla do pole vyhledávání jej vytočí."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Ukázat zprávy napravo."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Ukázat zprávy dole."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Nastavení historie"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Kolik dnů uchovat historii:"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(nastavte na 0 pro neomezenou historii)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Vymazat celou historii"
 
@@ -335,7 +339,7 @@
 msgid "Media"
 msgstr "Média"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Nastavení"
 
@@ -438,7 +442,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -719,7 +723,7 @@
 msgid "Set selection as image"
 msgstr "Nastavit výběr jako obrázek"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -727,34 +731,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Chyba Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Příchozí hovor"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Přijmout"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Ukázat"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Odmítnout"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s říká:"
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Odmítnout"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -780,24 +789,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Toto je destruktivní akce. Skutečně chcete odstranit veškerou svou historii zpráv a volání?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -810,15 +819,15 @@
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Nesprávné heslo"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Chyba v síti, zkuste to znovu"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Nepodařilo se začít export do Ringu, zkuste to znovu"
 
@@ -828,7 +837,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Uložit soubor"
@@ -891,11 +900,11 @@
 msgid "Voicemail number"
 msgstr "Číslo hlasové schránky"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -919,7 +928,7 @@
 msgid "Open Avatar Image"
 msgstr "Otevřít profilový obrázek"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Otevřít"
 
@@ -931,7 +940,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -941,27 +950,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Klient Ring pro GNOME.\nRing je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "zavolat"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "otevřít zprávy"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Příchozí hovor"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1031,7 +1064,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Klient GNOME pro Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Hesla se neshodují"
 
@@ -1059,7 +1092,7 @@
 msgid "Ring ID QR code"
 msgstr "Kód QR ID Ringu"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1069,7 +1102,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automaticky"
@@ -1110,34 +1143,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Nepřipojen"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Připojen"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/da_DK.po ring-20180816.2.e26b79f~ds1/client-gnome/po/da_DK.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/da_DK.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/da_DK.po	2018-08-16 15:09:41.000000000 +0000
@@ -11,9 +11,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Mikkel Kirkgaard Nielsen <memb_transifex@mikini.dk>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: scootergrisen\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"
@@ -45,7 +45,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -134,44 +134,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Velkommen til "
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Opret Ring-konto"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Opret en ny Ring-konto (til nye brugere)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Tilknyt denne enhed til en konto"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Tilknyt denne enhed til en Ring-konto oprettet på en anden enhed"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Annuller"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Tilnyt denne enhed til en eksisterende konto"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -182,83 +182,83 @@
 "from an archive."
 msgstr "Du har to muligheder for at tilknytte denne enhed til en anden konto . Du kan importere kontoen fra DHT, men før du kan det skal du generere en PIN-kode. For at gøre dette, skal du gå ind i konto-indstillinger på den enhed hvor kontoen befinder sig, vælge Ring-kontoen og trykke \"Tilknyt en anden enhed til denne konto\". Du vil nu se den PIN-kode du skal indtaste i formular nedenfor på denne enhed. Koden er kun gyldig i 10 minutter. Alternativt, kan du importere kontoen direkte fra et arkiv. "
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Indtast PIN-kode:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Eller importér en fil:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Indtast din adgangskode:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Tilbage"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Næste"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Konto"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "Ved at markere denne, får du mulighed for at registrere et unikt brugernavn på Ring-netværket. Andre brugere kan vil så kunne kontakte dig via dette, i stedet for dit RingID, som er 40 tegn langt."
 
-#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Brugernavn"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Denne adgangskode vil blive brugt til at kryptere din kontos data og til at tilknytte nye enheder til din konto."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Bekræft adgangskode"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Genererer din Ring-konto..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Registrerer brugernavn..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Dette kan tage nogle minutter."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Henter din Ring-konto..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Fejl ved oprettelse/hentning af konto."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -284,42 +284,46 @@
 msgstr "Aktiver notifikationer for indgående opkald"
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Aktiver notifikationer for nye beskeder."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Vis billeder og videoer i chat-vindue."
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Indtastning af et nummer i søge-feltet vil foretage et opkald."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Vis chat på højre side."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Vis chat i bunden."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Historik-indstillinger"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Behold historik i (dage):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(brug 0 for uendelig historik)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Slet al historik"
 
@@ -335,7 +339,7 @@
 msgid "Media"
 msgstr "Medier"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Indstillinger"
 
@@ -438,7 +442,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Eksporter konto"
 
@@ -719,7 +723,7 @@
 msgid "Set selection as image"
 msgstr "Sæt markerede som billede"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -727,34 +731,39 @@
 "Error: %s"
 msgstr "Kan ikke initialisere.\nSikr dig at Ring-daemon (dring) kører.\nFejl: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring-fejl"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Vis Ring"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Indgående opkald"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Vis"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Accepter"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s siger:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Afvis"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Afvis"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -780,24 +789,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Dette er en destruktiv handling. Er du sikker på, at du vil slette al historik for beskeder og opkald?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Annuller"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "_Gem"
 
@@ -810,15 +819,15 @@
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Forkert adgangskode"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Netværksfejl, prøv igen"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Kunne ikke starte Ring-eksport, prøv igen"
 
@@ -828,7 +837,7 @@
 msgid "Change password"
 msgstr "Skift adgangskode"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Gem fil"
@@ -891,11 +900,11 @@
 msgid "Voicemail number"
 msgstr "Telefonsvarernummer"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -919,7 +928,7 @@
 msgid "Open Avatar Image"
 msgstr "Åbn profilbillede"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Åbn"
 
@@ -931,9 +940,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "\"In varietate concordia\"\nbygget den %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -941,27 +950,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "GNOME-klienten til Ring.\nRing er fri software til universel kommunikation som respekterer sine brugeres frihed og privatliv."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "foretag opkald"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "åbn chat"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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 efter kontakt eller indtast nummer"
 
+#: src/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Indgående opkald"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1031,7 +1064,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-klient til Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Adgangskoderne er ikke ens"
 
@@ -1059,7 +1092,7 @@
 msgid "Ring ID QR code"
 msgstr "QR-kode for RingID "
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Send fil"
 
@@ -1069,7 +1102,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
@@ -1110,34 +1143,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Ingen forbindelse"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Forbundet"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/de_DE.po ring-20180816.2.e26b79f~ds1/client-gnome/po/de_DE.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/de_DE.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/de_DE.po	2018-08-16 15:09:41.000000000 +0000
@@ -11,9 +11,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Blanca Iris Almagro\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Arledrian <hvuzgr@gmail.com>\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"
@@ -45,7 +45,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -134,44 +134,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Ring-Konto erstellen"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Dieses Gerät mit einem Ring-Konto verknüpfen"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -182,83 +182,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Konto"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Benutzername"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Konto bestätigen"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "Okay"
@@ -284,42 +284,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Gesamten Verlauf löschen"
 
@@ -335,7 +339,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -438,7 +442,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -719,7 +723,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -727,34 +731,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Eingehender Anruf"
-
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr ""
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Akzeptieren"
+
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Ablehnen"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Ablehnen"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -780,24 +789,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -810,15 +819,15 @@
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Schwaches Passwort"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -828,7 +837,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -891,11 +900,11 @@
 msgid "Voicemail number"
 msgstr "Voicemail-Rufnummer"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -919,7 +928,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -931,7 +940,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -941,27 +950,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Eingehender Anruf"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1031,7 +1064,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Passwörter stimmen nicht überein"
 
@@ -1059,7 +1092,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1069,7 +1102,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1110,34 +1143,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/de.po ring-20180816.2.e26b79f~ds1/client-gnome/po/de.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/de.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/de.po	2018-08-16 15:09:41.000000000 +0000
@@ -22,9 +22,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: nautilusx\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Stefan Langenmaier <stefan.langenmaier@gmail.com>\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"
@@ -56,7 +56,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -145,44 +145,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Willkommen bei"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Ring-Konto erstellen"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Neues Ring-Konto (für neue Benutzer) erstellen"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Dieses Gerät mit einem Konto verknüpfen"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Verbinde dieses Gerät mit einem Konto, dass auf einem anderen Gerät erzeugt wurde."
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Dieses Gerät mit einem vorhandenen Konto verknüpfen"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -193,83 +193,83 @@
 "from an archive."
 msgstr "Um dieses Gerät mit einem anderen Konto zu verbinden gibt es zwei Möglichkeiten. Sie können das Konto von DHT importieren, dafür brauch es einen PIN-Code. Um den PIN-Code zu generieren, wechseln Sie zur Kontoverwaltung eines bereits vernüpften Geräts, wählen das zu verwendende Ring Konto aus und wählen \"Ein anderes Gerät mit diesem Konto verknüpfen\". Sie erhalten die erforderliche PIN. Die PIN ist nur für 10 Minuten gültig. Oder Sie können Ihr Konto direkt aus einem Archiv importieren."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Geben Sie Ihre PIN ein:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Oder eine Datei importieren:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Geben Sie Ihr Passwort ein:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Konto"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Benutzername"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Mit diesem Passwort werden Ihre Kontodaten geschützt und Sie können neue Geräte mit Ihrem Konto verknüpfen."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Passwort bestätigen"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Ihr Ring-Konto wird generiert..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Benutzername wird registriert..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Das kann ein paar Minuten dauern."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Ihr Ring-Konto wird abgerufen..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Problem das Konto zu laden/zu erzeugen."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -295,42 +295,46 @@
 msgstr "Benachrichtigungen für eingehende Anrufe aktivieren."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Benachrichtigungen für neue Chatnachrichten aktivieren."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Bilder und Videos im Chat Fenster anzeigen"
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Die Eingabe einer Nummer in der Suche startet einen neuen Anruf"
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Chat rechts anzeigen"
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Chat unten anzeigen"
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Verlaufseinstellungen"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Verlauf behalten für (Tage)"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(auf 0 setzen für unbegrenzten Verlauf)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Kompletten Verlauf leer"
 
@@ -346,7 +350,7 @@
 msgid "Media"
 msgstr "Medium"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -449,7 +453,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Konten exportieren"
 
@@ -730,7 +734,7 @@
 msgid "Set selection as image"
 msgstr "Auswahl als Bild benutzen"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -738,34 +742,39 @@
 "Error: %s"
 msgstr "Initialisierung fehlgeschlagen.\nGehen Sie sicher, dass der Ring Daemon (dring) läuft.\nFehler: %s "
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring Fehler"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Ring anzeigen"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Eingehender Anruf"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Anzeigen"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Akzeptieren"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s sagt:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Verweigern"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Ablehnen"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -791,24 +800,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Das ist eine destruktive Operation. Sind Sie sicher, dass Sie die ganze Chat- und Rufgeschichte löschen wollen?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -821,15 +830,15 @@
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Unsicheres Passwort"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Netzwerkfehler, bitte nochmal versuchen"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Konnten den Export zu Ring nicht starten, bitte erneut versuchen"
 
@@ -839,7 +848,7 @@
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Datei speichern"
@@ -902,11 +911,11 @@
 msgid "Voicemail number"
 msgstr "Nummer des Anrufbeantworters"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -930,7 +939,7 @@
 msgid "Open Avatar Image"
 msgstr "Profilbild öffnen"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Öffnen"
 
@@ -942,7 +951,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -952,27 +961,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Die GNOME-Oberfläche für Ring.\nRing ist eine Freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Anrufen"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Chat öffnen"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Eingehender Anruf"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1042,7 +1075,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-Oberfläche für Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Passwörter stimmen nicht überein"
 
@@ -1070,7 +1103,7 @@
 msgid "Ring ID QR code"
 msgstr "QR-Code Ihrer Ring-ID"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1080,7 +1113,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatisch"
@@ -1121,34 +1154,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/el.po ring-20180816.2.e26b79f~ds1/client-gnome/po/el.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/el.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/el.po	2018-08-16 15:09:41.000000000 +0000
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Lio Vasileiou <lvasileiou@outlook.com>\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"
@@ -44,7 +44,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -133,44 +133,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Δημιουργία λογαριασμού Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Δημιουργία ενός νέου λογαριασμού Ring (για νέους χρήστες)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Σύνδεση αυτής της συσκευής με ένα λογαριασμό"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Σύνδεση αυτών των συσκευών σε ένα λογαριασμό Ring που δημιουργήθηκε σε άλλη συσκευή"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Σύνδεση αυτής της συσκευής σε έναν λογαριασμό που ήδη υπάρχει"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -181,83 +181,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Εισάγετε το PIN σας:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Εισάγετε το συνθηματικό:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Προφίλ"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "Επιλέγοντας αυτό, θα καταχωρήσετε ένα μοναδικό όνομα χρήστη στο δίκτυο του Ring. Οι άνθρωποι θα μπορούν να το χρησιμοποιήσουν για να έρθουν σε επαφή μαζί σας, αντί να χρησιμοποιήσουν το RingID, που έχει μήκος 40 χαρακτήρων."
 
-#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Αυτό το συνθηματικό θα χρησιμοποιηθεί για να κρυπτογραφήσει τα δεδομένα του λογαριασμού σας και να συνδέσει νέες συσκευές στο λογαριασμό σας."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Γίνεται δημιουργία του λογαριασμού σας Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Καταχώρηση ονόματος χρήστη..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Αυτό μπορεί να διαρκέσει λίγα λεπτά."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Ανάκτηση του Ring λογαριασμού σας..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Σφάλμα δημιουργίας/φόρτωσης λογαριασμού."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -283,42 +283,46 @@
 msgstr "Ενεργοποίηση ειδοποιήσεων για εισερχόμενες κλήσεις."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Ενεργοποίηση ειδοποιήσεων για νέα μηνύματα συνομιλιών."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Η εισαγωγή αριθμού στην γραμμή αναζήτησης θα ξεκινήσει νέα κλήση."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Εμφάνιση συνομιλίας στα δεξιά."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Εμφάνιση συνομιλίας κάτω."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Ρυθμίσεις ιστορικού"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Διατήρηση ιστορικού για (ημέρες):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(ορίστε σε 0 για ιστορικό χωρίς όριο)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Καθαρισμός όλου του ιστορικού"
 
@@ -334,7 +338,7 @@
 msgid "Media"
 msgstr "Μέσα"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
@@ -431,13 +435,13 @@
 
 #: ui/newaccountsettingsview.ui:460
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -476,7 +480,7 @@
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
-msgstr ""
+msgstr "Προχωρημένες ρυθμίσεις"
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
@@ -572,7 +576,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "Ασφάλεια"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -718,7 +722,7 @@
 msgid "Set selection as image"
 msgstr "Καθορισμός επιλογής ως εικόνας"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -726,34 +730,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Σφάλμα Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Εισερχόμενη κλήση"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Προβολή"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Αποδοχή"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "Ο %s λέει:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Άρνηση"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Απόρριψη κλήσης"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -779,24 +788,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Αυτή είναι μια καταστροφική λειτουργία. Είστε σίγουροι ότι θέλετε να διαγράψετε όλες τις συζήτησης σας και το ιστορικό κλήσεων;"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "Άκυρο"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -809,15 +818,15 @@
 msgid "Contacts"
 msgstr "Επαφές"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Λανθασμένο συνθηματικό"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Σφάλμα δικτύου, δοκιμάστε ξανά"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Δεν μπορεί να κινήσει την εξαγωγή προς το Ring, προσπαθήστε ξανά"
 
@@ -827,7 +836,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Αποθήκευση αρχείου"
@@ -890,11 +899,11 @@
 msgid "Voicemail number"
 msgstr "Αριθμός Voicemail"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -918,7 +927,7 @@
 msgid "Open Avatar Image"
 msgstr "Άνοιγμα εικόνας avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "Άνοιγμα"
 
@@ -930,7 +939,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -940,27 +949,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Ο GNOME πελάτης για το Ring.\nRing είναι ελεύθερο λογισμικό για την καθολική επικοινωνία που σέβεται τις ελευθερίες και την ιδιωτική ζωή των χρηστών του."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "έναρξη κλήσης"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "άνοιγμα συνομιλίας"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Εισερχόμενη κλήση"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1030,7 +1063,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Πελάτης GNOME για το Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Τα συνθηματικά δεν ταιριάζουν"
 
@@ -1058,7 +1091,7 @@
 msgid "Ring ID QR code"
 msgstr "Κώδικας QR του Ring ID"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1068,7 +1101,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1109,34 +1142,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/eo.po ring-20180816.2.e26b79f~ds1/client-gnome/po/eo.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/eo.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/eo.po	2018-08-16 15:09:41.000000000 +0000
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Stepan Salenikovich\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"
@@ -44,7 +44,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -133,44 +133,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Krei Ring Konton"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Krei novan Ring konton (por novaj uzantoj)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Ligi ĉi tiun aparaton al Ring konto kreita je alia aparato"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Rezigni"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Ligi ĉi tiun aparaton al ekzistanta konto"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -181,83 +181,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Entajpu vian PIN-on:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Entajpu vian pasvorton:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Antaŭa"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Sekva"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profilo"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Konto"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Uzantnomo"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Konfirmu pasvorton"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Generanta vian Ring-an konton..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Registranta uzantnomon..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Tio povas daŭri iom da minutoj."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Ekstraktanta vian Ring konton..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Eraro kreante/ŝarĝante konton."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "Okej"
@@ -283,42 +283,46 @@
 msgstr "Ŝalti sciigojn por envenaj vokoj."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Ŝalti sciigojn por novaj babilmesaĝoj."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Enigi numeron en la serĉejon vokos la numeron."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Montru babilon dekstre."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Montru babilon sube."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Historiaj agordoj"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Konservi historian dum (tagoj):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(Agordu 0 por senlima historio)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Vakigi tutan historion"
 
@@ -334,7 +338,7 @@
 msgid "Media"
 msgstr "Aŭdvidaĵo"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Agordoj"
 
@@ -431,13 +435,13 @@
 
 #: ui/newaccountsettingsview.ui:460
 msgid "ID"
-msgstr ""
+msgstr "Identigaĵo"
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -512,7 +516,7 @@
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
-msgstr ""
+msgstr "Praŝarĝo"
 
 #: ui/newaccountsettingsview.ui:1514
 msgid "Encrypt media streams (SRTP)"
@@ -572,7 +576,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "Sekuro"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -632,7 +636,7 @@
 
 #: ui/newaccountsettingsview.ui:2560
 msgid "Video codecs"
-msgstr ""
+msgstr "Videokodekoj"
 
 #: ui/newaccountsettingsview.ui:2623
 msgid "Enable video"
@@ -640,7 +644,7 @@
 
 #: ui/newaccountsettingsview.ui:2650
 msgid "Audio codecs"
-msgstr ""
+msgstr "Sonkodekoj"
 
 #: ui/newaccountsettingsview.ui:2720
 msgid "SDP Session Negotiation (ICE Fallback)"
@@ -718,7 +722,7 @@
 msgid "Set selection as image"
 msgstr "Uzu elektaĵon kiel bildo"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -726,34 +730,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring Eraro"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Envena voko"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Montri"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Akcepti"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s diras:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Rifuzi"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Rifuzi"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -779,24 +788,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Tiu ĉi ago estas detrua. Ĉu vi certe volas forigi ĉiom da via babila kaj voka historio?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Rezigni"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -809,15 +818,15 @@
 msgid "Contacts"
 msgstr "Kontaktoj"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Malĝusta pasvorto"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Reteraro, reprovu poste"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Ne eblis komenci la elporton por Ring, reprovu poste"
 
@@ -827,7 +836,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Konservi Dosieron"
@@ -890,11 +899,11 @@
 msgid "Voicemail number"
 msgstr "Parolita mesaĝo"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -918,7 +927,7 @@
 msgid "Open Avatar Image"
 msgstr "Malfermi Profilbildon"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Malfermi"
 
@@ -930,7 +939,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -940,27 +949,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "La GNOME kliento por Ring.\nRing estas libera programo por universala komunikado, kiu respektas liberon kaj privatecon de siaj uzantoj."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "voki"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "malfermi babilejon"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Envena voko"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1030,7 +1063,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME kliento por Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Pasvortoj ne kongruas"
 
@@ -1058,7 +1091,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1068,7 +1101,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Aŭtomata"
@@ -1109,34 +1142,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/es_AR.po ring-20180816.2.e26b79f~ds1/client-gnome/po/es_AR.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/es_AR.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/es_AR.po	2018-08-16 15:09:41.000000000 +0000
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Gonzalo Maunas <gonzamaunas@gmail.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Juan Pablo Castillo <juampicastillovergelin@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/savoirfairelinux/ring/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -131,44 +131,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Bienvenido a"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Crear Cuenta de Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Crear una nueva cuenta de Ring (para nuevos usuarios)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Vincular este dispositivo a una cuenta"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Enlazar este dispositivo a una cuenta existente"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -179,83 +179,83 @@
 "from an archive."
 msgstr "Para enlazar este dispositivo a otra cuenta, tenés dos posibilidades. Podés importar tu cuenta desde el DHT, pero primero necesitás obtener un código IN. Para generar el código PIN, ve a los ajustes de administración de cuenta de un dispositivo previo, elige la Cuenta de Ring a usar y seleccioná \"Enlazar otro dispositivo a esta cuenta\". Obtendrás el PIN necesario para completar este formulario. El PIN sólo es válido por 10 minutos. O podés directamente importa tu cuenta desde un archivo."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Ingresá tu pin:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Ingresá tu contraseña:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Siguiente"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Perfil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Cuenta"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Confirmar contraseña"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Generando tu cuenta de Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "Ok"
@@ -281,42 +281,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Ajustes de Historial"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -332,7 +336,7 @@
 msgid "Media"
 msgstr "Medios"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -435,7 +439,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -716,7 +720,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -724,34 +728,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Llamada entrante"
-
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr ""
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Aceptar"
+
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Rechazar"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Rechazar"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -777,24 +786,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -807,15 +816,15 @@
 msgid "Contacts"
 msgstr "Contactos"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -825,7 +834,7 @@
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -888,11 +897,11 @@
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -916,7 +925,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -928,7 +937,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -938,27 +947,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Llamada entrante"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1061,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1056,7 +1089,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1066,7 +1099,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1107,34 +1140,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/es.po ring-20180816.2.e26b79f~ds1/client-gnome/po/es.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/es.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/es.po	2018-08-16 15:09:41.000000000 +0000
@@ -22,21 +22,22 @@
 # Jusore Mondos <jusore@gmail.com>, 2016
 # fgp <komakino@wanadoo.es>, 2016
 # Laura Arjona Reina <larjona@larjona.net>, 2016
+# Markel <wakutiteo@protonmail.com>, 2018
 # Miguel Angel NV <manvac@gmail.com>, 2017
 # Rodrigo I. Avila D., 2018
 # Stepan Salenikovich, 2015
 # Stepan Salenikovich, 2015
 # urkonn <urkonn@gmail.com>, 2017
 # urkonn <urkonn@gmail.com>, 2017
-# wakutiteo <wakutiteo@protonmail.com>, 2018
-# wakutiteo <wakutiteo@protonmail.com>, 2018
+# Markel <wakutiteo@protonmail.com>, 2018
+# Markel <wakutiteo@protonmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Blanca Iris Almagro\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"
@@ -66,9 +67,9 @@
 
 #: ui/accountmigrationview.ui:126
 msgid "Ring ID"
-msgstr ""
+msgstr "Identificación Ring"
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -82,11 +83,11 @@
 #: ui/newaccountsettingsview.ui:876 src/accountmigrationview.cpp:176
 #: src/newaccountsettingsview.cpp:963
 msgid "Delete account"
-msgstr ""
+msgstr "Borrar cuenta"
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
-msgstr ""
+msgstr "La migración falló, ¿contraseña incorrecta?"
 
 #: ui/currentcallview.ui:251
 msgid "End this call"
@@ -157,44 +158,44 @@
 msgid "Transfer to"
 msgstr "Transferir a"
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Bienvenido a"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Crear una cuenta Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Crear una nueva cuenta Ring (para usuarios nuevos)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Conectar este dispositivo a una cuenta"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Vincular este dispositivo con una cuenta Ring creada en otro"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
-msgstr ""
+msgstr "Avanzado..."
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Vincular este dispositivo con una cuenta existente"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -205,83 +206,83 @@
 "from an archive."
 msgstr "Para enlazar este dispositivo hacia otra cuenta, usted tiene dos posibilidades. Usted puede importar el usuario desde el DHT, pero primero, usted necesita obtener el código PIN. Para generar el código PIN, vaya a la configuración de administrador de usuario del anterior dispositivo, elija el Ring Usuario usar  y seleccione   \"Enlazar a otro dispositivo a esta cuenta \". Usted deberá obtener el PIN necesariamente para completar este formulario. El PIN es solo valido por 10 minutos. O, usted puede importarlo directamente la cuenta desde un fichero."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Escribe tu PIN:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "o importar a un fichero:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Escribe tu contraseña:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Siguiente"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Perfil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Cuenta"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
-msgstr ""
+msgstr "Registrar nombre de usuario"
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "La contraseña se utilizará para cifrar los datos de tu cuenta y para conectar nuevos dispositivos a tu cuenta."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Confirmar contraseña"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Generando tu cuenta Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Registrando nombre de usuario..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Esto puede llevar unos minutos."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Recuperando tu cuenta de Ring..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Error creando o cargando la cuenta."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -307,42 +308,46 @@
 msgstr "Habilitar notificación de llamada entrante."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Habilitar notificación de mensajes de chat"
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Mostrar imágenes y videos en la ventana de conversación"
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Teclear un número en el cuadro de búsqueda hará una llamada."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "Carpeta de descargas:"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Mostrar chat a la derecha"
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Mostrar chat abajo"
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Configuración del Historial"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Guardar historial por (días):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(0 para historial ilimitado)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Limpiar todo el historial"
 
@@ -358,7 +363,7 @@
 msgid "Media"
 msgstr "Medios"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Configuración"
 
@@ -455,23 +460,23 @@
 
 #: ui/newaccountsettingsview.ui:460
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
-msgstr ""
+msgstr "Haga clic para cambiar la contraseña"
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Exportar la cuenta"
 
 #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:908
 msgid "Enable account"
-msgstr ""
+msgstr "Habilitar cuenta"
 
 #: ui/newaccountsettingsview.ui:697
 msgid "SIP server"
-msgstr ""
+msgstr "Servidor SIP"
 
 #: ui/newaccountsettingsview.ui:781
 msgid "password"
@@ -484,7 +489,7 @@
 
 #: ui/newaccountsettingsview.ui:848
 msgid "Voicemail"
-msgstr ""
+msgstr "Mensaje de voz"
 
 #: ui/newaccountsettingsview.ui:959
 msgid "Known devices linked to this Ring account"
@@ -492,39 +497,39 @@
 
 #: ui/newaccountsettingsview.ui:967
 msgid "Link another device"
-msgstr ""
+msgstr "Vincular otro dispositivo"
 
 #: ui/newaccountsettingsview.ui:1032
 msgid "Banned contacts"
-msgstr ""
+msgstr "Contactos bloqueados"
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
-msgstr ""
+msgstr "Ajustes avanzados"
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
-msgstr ""
+msgstr "Ajustes generales"
 
 #: ui/newaccountsettingsview.ui:1146
 msgid "Call settings"
-msgstr ""
+msgstr "Ajustes de llamada"
 
 #: ui/newaccountsettingsview.ui:1184
 msgid "Allow call from untrusted peers"
-msgstr ""
+msgstr "Permitir llamadas de pares no confiables"
 
 #: ui/newaccountsettingsview.ui:1219
 msgid "Auto answer calls"
-msgstr ""
+msgstr "Respuesta automática de llamadas"
 
 #: ui/newaccountsettingsview.ui:1255
 msgid "Custom ringtone"
-msgstr ""
+msgstr "Tono de llamada personalizado"
 
 #: ui/newaccountsettingsview.ui:1299
 msgid "Name server"
-msgstr ""
+msgstr "Nombre del servidor"
 
 #: ui/newaccountsettingsview.ui:1336 ui/newaccountsettingsview.ui:2489
 msgid "Address"
@@ -532,11 +537,11 @@
 
 #: ui/newaccountsettingsview.ui:1370
 msgid "OpenDHT configuration"
-msgstr ""
+msgstr "Configuración de OpenDHT"
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
-msgstr ""
+msgstr "Cargador de inicio"
 
 #: ui/newaccountsettingsview.ui:1514
 msgid "Encrypt media streams (SRTP)"
@@ -596,11 +601,11 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "Seguridad"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
-msgstr ""
+msgstr "Conectividad"
 
 #: ui/newaccountsettingsview.ui:2065
 msgid "Registration expire timeout (seconds)"
@@ -608,11 +613,11 @@
 
 #: ui/newaccountsettingsview.ui:2102
 msgid "Network interface"
-msgstr ""
+msgstr "Interfaz de red"
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
-msgstr ""
+msgstr "UPnP"
 
 #: ui/newaccountsettingsview.ui:2173
 msgid "Use TURN"
@@ -644,11 +649,11 @@
 
 #: ui/newaccountsettingsview.ui:2416
 msgid "Published address"
-msgstr ""
+msgstr "Dirección publicada"
 
 #: ui/newaccountsettingsview.ui:2453
 msgid "Use custom address and port"
-msgstr ""
+msgstr "Usar dirección y puerto personalizados"
 
 #: ui/newaccountsettingsview.ui:2524
 msgid "Port"
@@ -656,15 +661,15 @@
 
 #: ui/newaccountsettingsview.ui:2560
 msgid "Video codecs"
-msgstr ""
+msgstr "Códecs de video "
 
 #: ui/newaccountsettingsview.ui:2623
 msgid "Enable video"
-msgstr ""
+msgstr "Habilitar Video"
 
 #: ui/newaccountsettingsview.ui:2650
 msgid "Audio codecs"
-msgstr ""
+msgstr "Códecs de audio"
 
 #: ui/newaccountsettingsview.ui:2720
 msgid "SDP Session Negotiation (ICE Fallback)"
@@ -692,7 +697,7 @@
 
 #: ui/usernameregistrationbox.ui:28
 msgid "register username"
-msgstr ""
+msgstr "registrar nombre de usuario"
 
 #: ui/chatview.ui:19 ui/chatview.ui:22
 msgid "Hide chat view"
@@ -742,7 +747,7 @@
 msgid "Set selection as image"
 msgstr "Establecer la selección como imagen"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -750,34 +755,39 @@
 "Error: %s"
 msgstr "Incapaz de inicializar.\nAsegurese que el daemon de Ring (dring) esté activo.\nError: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Error de Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Abrir Ring"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Salir"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Llamada entrante"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Mostrar"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Aceptar"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s dice:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "No aceptar"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Rechazar"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -801,26 +811,26 @@
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress..."
-msgstr ""
+msgstr "Registro en curso..."
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Esta es una operación irreversible. ¿Estás seguro de eliminar todo el historial de chat y llamadas?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "Elegir la carpeta de descargas"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -833,15 +843,15 @@
 msgid "Contacts"
 msgstr "Contactos"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Contraseña errónea"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Error en la red, inténtalo de nuevo"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "No se ha podido exportar en Ring, inténtalo de nuevo"
 
@@ -851,7 +861,7 @@
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Guardar fichero"
@@ -914,11 +924,11 @@
 msgid "Voicemail number"
 msgstr "Número de Mensaje de Voz"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr "Error: ¡Contraseña incorrecta!"
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr "Error: ¡dispositivo desconocido!"
 
@@ -942,7 +952,7 @@
 msgid "Open Avatar Image"
 msgstr "Abrir imagen de avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -954,9 +964,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "\"In varietate concordia\"\nconstruido en %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -964,27 +974,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "El cliente Ring de GNOME.\nRing es software libre de comunicaciones que respeta las libertades y la privacidad de sus usuarios."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
-msgstr ""
+msgstr "Añadir cuenta..."
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "llamar"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Abrir chat"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Llamada entrante"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1054,7 +1088,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Cliente Gnome para Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Las contraseñas no coinciden"
 
@@ -1082,7 +1116,7 @@
 msgid "Ring ID QR code"
 msgstr "Código QR identificador Ring"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Enviar archivo"
 
@@ -1092,26 +1126,26 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
 #: src/newaccountsettingsview.cpp:679
 msgid "Edit name"
-msgstr ""
+msgstr "Editar nombre"
 
 #: src/newaccountsettingsview.cpp:774
 msgid "Unban"
-msgstr ""
+msgstr "Desbloquear"
 
 #: src/newaccountsettingsview.cpp:810
 msgid "New password and its confirmation are different!"
-msgstr ""
+msgstr "¡La nueva contraseña y su confirmación es diferente!"
 
 #: src/newaccountsettingsview.cpp:821
 msgid "Incorrect password!"
-msgstr ""
+msgstr "¡Contraseña incorrecta!"
 
 #: src/newaccountsettingsview.cpp:858
 msgid "Note: this will change the password only on this device."
@@ -1127,40 +1161,40 @@
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Account exported!"
-msgstr ""
+msgstr "¡Cuenta exportada!"
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
-msgstr ""
+msgstr "Error desconocido"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
-msgstr ""
+msgstr "Inicializando…"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
-msgstr ""
+msgstr "Desconectado"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
-msgstr ""
+msgstr "Conectando..."
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
-msgstr ""
+msgstr "En línea"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
-msgstr ""
+msgstr "Estado desconocido"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
-msgstr ""
+msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
-msgstr ""
+msgstr "sin contraseña establecida"
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/eu.po ring-20180816.2.e26b79f~ds1/client-gnome/po/eu.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/eu.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/eu.po	2018-08-16 15:09:41.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Basque (http://www.transifex.com/savoirfairelinux/ring/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -131,44 +131,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Estekatu gailua kontu batekin"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -179,83 +179,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Kontua"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -281,42 +281,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -332,7 +336,7 @@
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr ""
 
@@ -435,7 +439,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -474,7 +478,7 @@
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
-msgstr ""
+msgstr "Ezarpen aurreratuak"
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
@@ -716,7 +720,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -724,33 +728,38 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
@@ -777,24 +786,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -807,15 +816,15 @@
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -825,7 +834,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -888,11 +897,11 @@
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -916,7 +925,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -928,7 +937,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -938,27 +947,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1061,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1056,7 +1089,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1066,7 +1099,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1107,34 +1140,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/fa_IR.po ring-20180816.2.e26b79f~ds1/client-gnome/po/fa_IR.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/fa_IR.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/fa_IR.po	2018-08-16 15:09:41.000000000 +0000
@@ -12,9 +12,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-08-07 19:50+0000\n"
+"Last-Translator: Amir Taherizadeh\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"
@@ -46,7 +46,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -135,44 +135,44 @@
 msgid "Transfer to"
 msgstr "انتقال به"
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "ساخت حساب رینگ"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "پیوند این افزاره به یک حساب"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "لغو"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -183,83 +183,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "پین خود را وارد کنید:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "پیشین"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "بعدی"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "نمایه"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "حساب کاربری"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "نام کاربری"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "تأیید گذرواژه"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "در حال ثبت نام کاربری..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "خب"
@@ -285,42 +285,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "تنظیمات تاریخچه"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -336,13 +340,13 @@
 msgid "Media"
 msgstr "رسانه"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "تنظیمات"
 
 #: ui/ringmainwindow.ui:265 ui/ringmainwindow.ui:272
 msgid "Conversations"
-msgstr ""
+msgstr " گفتگو"
 
 #: ui/ringmainwindow.ui:298 ui/ringmainwindow.ui:305
 msgid "Contact requests"
@@ -439,7 +443,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "برون‌ریزی حساب"
 
@@ -706,7 +710,7 @@
 
 #: ui/avatarmanipulation.ui:92 ui/avatarmanipulation.ui:125
 msgid "Take photo"
-msgstr ""
+msgstr "عکس  بگیرید!"
 
 #: ui/avatarmanipulation.ui:102
 msgid "Choose image from file"
@@ -720,7 +724,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -728,34 +732,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "خطای رینگ"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "خروج"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "تماس ورودی"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "قبول"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "نمایش"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "رد"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s می‌گوید:"
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "رد کردن"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -781,24 +790,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "این یک عملیات مخرب است. آیا مطمئن هستید که می‌خواهید تمام گفت‌وگو‌ها و تاریخ‌چه تماس‌تان را پاک کنید؟"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_لغو"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -811,15 +820,15 @@
 msgid "Contacts"
 msgstr "مخاطبین"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "گذرواژهٔ بد"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "خطای شبکه، دوباره تلاش کنید"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -829,7 +838,7 @@
 msgid "Change password"
 msgstr "تغییر رمز عبور"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -892,11 +901,11 @@
 msgid "Voicemail number"
 msgstr "شماره پست صوتی"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -920,7 +929,7 @@
 msgid "Open Avatar Image"
 msgstr "گشودن تصویر آواتار"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_گشودن"
 
@@ -932,7 +941,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -942,27 +951,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "نسخه گنوم برای رینگ.\nرینگ یک نرم‌افزار ارتباطات عمومی است که به آزادی‌ها و حریم شخصی کاربرانش احترام می‌گذارد."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "گشودن گپ"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "تماس ورودی"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1032,7 +1065,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- نرم‌افزار Ring تحت GNOME"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "گذرواژه‌ها یکسان نیستند"
 
@@ -1060,7 +1093,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1070,7 +1103,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1111,34 +1144,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
-msgstr ""
+msgstr "خطای ناشناخته"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "‌خط"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "برخط"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/fi.po ring-20180816.2.e26b79f~ds1/client-gnome/po/fi.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/fi.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/fi.po	2018-08-16 15:09:41.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Kolmis <pekka.hapuli@gmail.com>\n"
 "Language-Team: Finnish (http://www.transifex.com/savoirfairelinux/ring/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -131,44 +131,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Peru"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -179,83 +179,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Seuraava"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profiili"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Tunnus"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Varmista salasana"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -281,42 +281,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Näytä keskustelu oikealla."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Näytä keskustelu alhaalla."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Historian asetukset"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Pidä historia tallessa (päivää):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(aseta 0 rajoittamattomalle historialle)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Tyhjennä koko historia"
 
@@ -332,7 +336,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Asetukset"
 
@@ -435,7 +439,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -716,7 +720,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -724,34 +728,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Saapuva puhelu"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Näytä"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Hyväksy"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s sanoo:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Kieltäydy"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Kieltäydy"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -777,24 +786,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -807,15 +816,15 @@
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -825,7 +834,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Tallenna tiedosto"
@@ -888,11 +897,11 @@
 msgid "Voicemail number"
 msgstr "Vastaajan numero"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -916,7 +925,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -928,7 +937,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -938,27 +947,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Saapuva puhelu"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1061,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME asiakasohjelma Ringille"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Salasanat eivät täsmää"
 
@@ -1056,7 +1089,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1066,7 +1099,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automaattinen"
@@ -1107,34 +1140,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/fr_CA.po ring-20180816.2.e26b79f~ds1/client-gnome/po/fr_CA.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/fr_CA.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/fr_CA.po	2018-08-16 15:09:41.000000000 +0000
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Adrien Béraud <adrien.beraud@savoirfairelinux.com>, 2017
-# Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>, 2015,2017
+# Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>, 2015,2017-2018
 # Julie LeBrun <julie.lebrun@savoirfairelinux.com>, 2017
 # Julien Legault <julienlegault96@gmail.com>, 2017
 # Olivier Naud-Dulude <olivier.naud-dulude@hotmail.com>, 2017
@@ -12,9 +12,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Julie LeBrun <julie.lebrun@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-08-07 02:15+0000\n"
+"Last-Translator: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>\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"
@@ -46,7 +46,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -135,44 +135,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Créer un compte Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Lier cet appareil à un compte"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Associer cet appareil avec un compte existant"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -183,83 +183,83 @@
 "from an archive."
 msgstr "Pour associer cet appareil à un compte Ring déjà existant sur un autre appareil, vous avez deux possibilités:\nVous pouvez importer votre compte via le réseau Ring. Pour cela vous devez obtenir un NIP du premier appareil. Aller dans la gestion du compte du premier appareil et choisissez \"Associer un autre appareil à ce compte\". Vous obtiendrez alors un NIP qui sera valide 10 minutes sur le réseau.\nVous pouvez également importer votre compte en important une archive de compte Ring."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
-msgstr "Entrer votre NIP:"
+msgstr "Entrer votre NIP :"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Ou importer une archive de compte Ring :"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
-msgstr "Entrer votre mot de passe:"
+msgstr "Entrer votre mot de passe :"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Précédent"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Suivant"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Compte"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
-msgstr "confirmer le mot de passe"
+msgstr "Confirmer le mot de passe"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
-msgstr "Génération de votre compte Ring ..."
+msgstr "Création de votre compte Ring ..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Enregistrement du nom d'utilisateur ..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Cette opération peut prendre plusieurs minutes."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Je retrouve votre compte Ring ..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -285,42 +285,46 @@
 msgstr "Activer les notifications pour les appels entrants."
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Paramètres de l'historique"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Effacer tout l'historique"
 
@@ -336,7 +340,7 @@
 msgid "Media"
 msgstr "Média"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Réglages"
 
@@ -358,7 +362,7 @@
 
 #: ui/mediasettingsview.ui:52
 msgid "Ringtone device:"
-msgstr "Sonnerie de l'appareil:"
+msgstr "Sonnerie de l'appareil :"
 
 #: ui/mediasettingsview.ui:64
 msgid "Output device:"
@@ -386,7 +390,7 @@
 
 #: ui/mediasettingsview.ui:186
 msgid "Frame rate:"
-msgstr "Images par seconde:"
+msgstr "Images par seconde :"
 
 #: ui/mediasettingsview.ui:244
 msgid "Hardware Acceleration"
@@ -429,7 +433,7 @@
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
-msgstr "Votre nip généré"
+msgstr "Votre NIP généré :"
 
 #: ui/newaccountsettingsview.ui:460
 msgid "ID"
@@ -439,7 +443,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -720,7 +724,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -728,34 +732,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Erreur Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Appel entrant"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Afficher"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Accepter"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr ""
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Refuser"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Refuser"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -781,24 +790,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Êtes-vous certain de vouloir supprimer tout l'historique de votre clavardage et de vos appels?  Cette opération est destructrice."
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -811,15 +820,15 @@
 msgid "Contacts"
 msgstr "Contacts"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Mauvais mot de passe"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Erreur réseau, réessayez"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Ne peut pas initier l'exportation sur le Ring"
 
@@ -829,7 +838,7 @@
 msgid "Change password"
 msgstr "Changer mot de passe"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Enregistrer le fichier"
@@ -892,11 +901,11 @@
 msgid "Voicemail number"
 msgstr "Numéro de boîte vocale"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -920,7 +929,7 @@
 msgid "Open Avatar Image"
 msgstr "Ouvrir l'image de l'avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -932,7 +941,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -942,27 +951,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Ring pour GNOME\nRing est un logiciel libre de communication universel qui respecte la liberté et la vie privée de ses utilisateurs."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Appeler"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Ouvrir le clavardage"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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 des contacts ou entrer le numéro"
 
+#: src/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Appel entrant"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1032,7 +1065,7 @@
 msgid "- GNOME client for Ring"
 msgstr "Ring pour GNOME"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Les mots de passes en sont pas identiques"
 
@@ -1040,7 +1073,7 @@
 msgid ""
 "This is your Ring username.\n"
 "Copy and share it with your friends!"
-msgstr "Ceci est votre nom d'utilisateur Ring.\nCopiez-le et partagez-le avec vos amis!"
+msgstr "Ceci est votre nom d'utilisateur Ring.\nCopiez-le et partagez-le avec vos amis !"
 
 #: src/ringwelcomeview.cpp:93
 msgctxt "Do not translate \"RingID\""
@@ -1060,7 +1093,7 @@
 msgid "Ring ID QR code"
 msgstr "Code QR de votre identifiant Ring"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1070,7 +1103,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
@@ -1111,34 +1144,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "En ligne"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/fr_FR.po ring-20180816.2.e26b79f~ds1/client-gnome/po/fr_FR.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/fr_FR.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/fr_FR.po	2018-08-16 15:09:41.000000000 +0000
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: YASMINA BAHLOUL <yasmina.bahloul@savoirfairelinux.com>\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"
@@ -41,7 +41,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -130,44 +130,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -178,83 +178,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "compte"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "nom d'utilisateur"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -280,42 +280,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -331,7 +335,7 @@
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr ""
 
@@ -434,7 +438,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -569,7 +573,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "securité"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -715,7 +719,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -723,34 +727,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr ""
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Refuser"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Refuser"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -776,24 +785,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -806,15 +815,15 @@
 msgid "Contacts"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -824,7 +833,7 @@
 msgid "Change password"
 msgstr "changer le mot de passe"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -887,11 +896,11 @@
 msgid "Voicemail number"
 msgstr "boite vocale "
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -915,7 +924,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -927,7 +936,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -937,27 +946,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1027,7 +1060,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1055,7 +1088,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1065,7 +1098,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1106,34 +1139,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/fr.po ring-20180816.2.e26b79f~ds1/client-gnome/po/fr.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/fr.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/fr.po	2018-08-16 15:09:41.000000000 +0000
@@ -25,9 +25,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Laura Galita <laura.galita@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 19:38+0000\n"
+"Last-Translator: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>\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"
@@ -49,7 +49,7 @@
 
 #: ui/accountmigrationview.ui:31
 msgid "This account is malformed, please enter your password"
-msgstr ""
+msgstr "Ce compte est inconsistant, veuillez entrer votre mot de passe"
 
 #: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:620
 msgid "Alias"
@@ -59,7 +59,7 @@
 msgid "Ring ID"
 msgstr "Identifiant Ring"
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -77,7 +77,7 @@
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
-msgstr ""
+msgstr "La migration a échoué, mot de passe erroné ?"
 
 #: ui/currentcallview.ui:251
 msgid "End this call"
@@ -148,44 +148,44 @@
 msgid "Transfer to"
 msgstr "Transférer à "
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Bienvenue sur"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Créer un compte Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Créer un nouveau compte Ring (pour les nouveaux utilisateurs)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Lier cet appareil à un compte"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Lier ces appareils à un compte Ring créé sur un autre appareil"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
-msgstr ""
+msgstr "Avancé..."
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
-msgstr ""
+msgstr "Ajouter un nouveau compte SIP"
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Lier cet appareil à un compte existant"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -196,83 +196,83 @@
 "from an archive."
 msgstr "Pour associer cet appareil à un compte Ring déjà existant sur un autre appareil, vous avez deux possibilités:\nVous pouvez importer votre compte via le réseau Ring. Pour cela vous devez obtenir un NIP du premier appareil. Aller dans la gestion du compte du premier appareil et choisissez \"Associer un autre appareil à ce compte\". Vous obtiendrez alors un NIP qui sera valide 10 minutes sur le réseau.\nVous pouvez également importer votre compte en important une archive de compte Ring."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Entrez votre NIP :"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Ou importer une archive : "
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Entrez votre mot de passe :"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Précédent"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Suivant"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Compte"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
-msgstr ""
+msgstr "Enregistrer le nom d'utilisateur"
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "En cochant cette case, vous enregistrez un nom d'utilisateur unique sur le réseau Ring. Les personnes peuvent l'utiliser pour vous contacter au lieu d'utiliser votre RingID de 40 caractères."
 
-#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Ce mot de passe sera utilisé pour crypter vos données et pour connecter vos nouveaux appareils à votre compte."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Génération de votre compte Ring…"
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Enregistrement du nom d'utilisateur…"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Cela peut prendre quelques minutes."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Récuperation de votre compte Ring…"
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Erreur lors de la création ou du chargement du compte."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -298,42 +298,46 @@
 msgstr "Activer les notifications d'appel entrant"
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr "Activer les notifications pour les invitations"
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Activer les notifications de nouveaux messages"
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Afficher les images et vidéos dans le fenêtre de clavardage."
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Pour appeler, entrer le numéro de téléphone dans la zone de recherche."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "Dossier de téléchargement :"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Afficher les discussions texte à droite"
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Afficher les discussions texte en bas"
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Paramètres de l’historique"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Garder l’historique pendant (jours) :"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(mettre à 0 pour garder indéfiniment)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Effacer tout l’historique"
 
@@ -349,7 +353,7 @@
 msgid "Media"
 msgstr "Médias"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -450,19 +454,19 @@
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
-msgstr ""
+msgstr "Cliquer ici pour changer le mot de passe"
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Exporter compte"
 
 #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:908
 msgid "Enable account"
-msgstr ""
+msgstr "Activer le compte"
 
 #: ui/newaccountsettingsview.ui:697
 msgid "SIP server"
-msgstr ""
+msgstr "Adresse du serveur SIP"
 
 #: ui/newaccountsettingsview.ui:781
 msgid "password"
@@ -475,7 +479,7 @@
 
 #: ui/newaccountsettingsview.ui:848
 msgid "Voicemail"
-msgstr ""
+msgstr "Boîte vocale"
 
 #: ui/newaccountsettingsview.ui:959
 msgid "Known devices linked to this Ring account"
@@ -483,11 +487,11 @@
 
 #: ui/newaccountsettingsview.ui:967
 msgid "Link another device"
-msgstr ""
+msgstr "Associer un nouvel appareil"
 
 #: ui/newaccountsettingsview.ui:1032
 msgid "Banned contacts"
-msgstr ""
+msgstr "Contacts bannis"
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
@@ -495,27 +499,27 @@
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
-msgstr ""
+msgstr "Paramètres généraux"
 
 #: ui/newaccountsettingsview.ui:1146
 msgid "Call settings"
-msgstr ""
+msgstr "Paramètres d'appel"
 
 #: ui/newaccountsettingsview.ui:1184
 msgid "Allow call from untrusted peers"
-msgstr ""
+msgstr "Autoriser les appels de correspondants non vérifiés"
 
 #: ui/newaccountsettingsview.ui:1219
 msgid "Auto answer calls"
-msgstr ""
+msgstr "Répondre automatiquement aux appels"
 
 #: ui/newaccountsettingsview.ui:1255
 msgid "Custom ringtone"
-msgstr ""
+msgstr "Sonnerie personnalisée"
 
 #: ui/newaccountsettingsview.ui:1299
 msgid "Name server"
-msgstr ""
+msgstr "serveur de nom"
 
 #: ui/newaccountsettingsview.ui:1336 ui/newaccountsettingsview.ui:2489
 msgid "Address"
@@ -523,7 +527,7 @@
 
 #: ui/newaccountsettingsview.ui:1370
 msgid "OpenDHT configuration"
-msgstr ""
+msgstr "Configuration d'OpenDHT"
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
@@ -535,7 +539,7 @@
 
 #: ui/newaccountsettingsview.ui:1549
 msgid "Enable SDES for key exchange protocol"
-msgstr ""
+msgstr "Activer SDES pour le protocole d'échange de clé"
 
 #: ui/newaccountsettingsview.ui:1585
 msgid "Fallback on RTP on encryption failure"
@@ -591,15 +595,15 @@
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
-msgstr ""
+msgstr "Connectivité"
 
 #: ui/newaccountsettingsview.ui:2065
 msgid "Registration expire timeout (seconds)"
-msgstr ""
+msgstr "Délai d'enregistrement maximum (secondes)"
 
 #: ui/newaccountsettingsview.ui:2102
 msgid "Network interface"
-msgstr ""
+msgstr "Interface réseau"
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
@@ -611,19 +615,19 @@
 
 #: ui/newaccountsettingsview.ui:2208
 msgid "(TURN) address"
-msgstr ""
+msgstr "Adresse du serveur TURN"
 
 #: ui/newaccountsettingsview.ui:2243
 msgid "(TURN) username"
-msgstr ""
+msgstr "Nom d'utilisateur TURN"
 
 #: ui/newaccountsettingsview.ui:2277
 msgid "(TURN) password"
-msgstr ""
+msgstr "Mot de passe TURN"
 
 #: ui/newaccountsettingsview.ui:2314
 msgid "(TURN) realm"
-msgstr ""
+msgstr "Domaine TURN"
 
 #: ui/newaccountsettingsview.ui:2348
 msgid "Use STUN"
@@ -631,15 +635,15 @@
 
 #: ui/newaccountsettingsview.ui:2383
 msgid "(STUN) address"
-msgstr ""
+msgstr "Adresse STUN"
 
 #: ui/newaccountsettingsview.ui:2416
 msgid "Published address"
-msgstr ""
+msgstr "Adresse publiée"
 
 #: ui/newaccountsettingsview.ui:2453
 msgid "Use custom address and port"
-msgstr ""
+msgstr "Utiliser une adresse et un port personnalisés"
 
 #: ui/newaccountsettingsview.ui:2524
 msgid "Port"
@@ -663,27 +667,27 @@
 
 #: ui/newaccountsettingsview.ui:2732
 msgid "Only used during SDP negotiation in case ICE is not supported."
-msgstr ""
+msgstr "Ces paramètres sont uniquement utilisés durant la négociation de la session SDP au cas où ICE ne serait pas supporté."
 
 #: ui/newaccountsettingsview.ui:2766
 msgid "Audio RTP Min port"
-msgstr ""
+msgstr "Port audio RTP minimum"
 
 #: ui/newaccountsettingsview.ui:2801
 msgid "Audio RTP Max port"
-msgstr ""
+msgstr "Port audio RTP maximum"
 
 #: ui/newaccountsettingsview.ui:2836
 msgid "Video RTP Min port"
-msgstr ""
+msgstr "Port vidéo RTP minimum"
 
 #: ui/newaccountsettingsview.ui:2871
 msgid "Video RTP Max port"
-msgstr ""
+msgstr "Port vidéo RTP maximum"
 
 #: ui/usernameregistrationbox.ui:28
 msgid "register username"
-msgstr ""
+msgstr "Enregistrer un nom d'utilisateur"
 
 #: ui/chatview.ui:19 ui/chatview.ui:22
 msgid "Hide chat view"
@@ -733,7 +737,7 @@
 msgid "Set selection as image"
 msgstr "Utiliser la sélection comme image de profil"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -741,38 +745,43 @@
 "Error: %s"
 msgstr "Impossible de démarrer\nVérifier que le serveur Ring  fonctionne\nErreur: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Erreur Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Afficher Ring"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Appel entrant"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr "Ouvrir la conversation"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Afficher"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Accepter"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s a dit :"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Refuser"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Décliner"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
-msgstr ""
+msgstr "Enregistrer un nom d'utilisateur sur le serveur de nom"
 
 #: src/usernameregistrationbox.cpp:173
 msgid "Username already taken"
@@ -784,34 +793,34 @@
 
 #: src/usernameregistrationbox.cpp:194
 msgid "Lookup unavailable, check your network connection"
-msgstr ""
+msgstr "La recherche est indisponible, vérifier votre connexion réseau"
 
 #: src/usernameregistrationbox.cpp:274
 msgid "Performing lookup..."
-msgstr ""
+msgstr "Recherche en cours ..."
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress..."
-msgstr ""
+msgstr "Enregistrement en cours ..."
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Cette opération est irréversible. Êtes-vous sûr de vouloir effacer toutes vos conversations ainsi que votre historique d'appel ?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "Choisissez le dossier de téléchargement"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "_Sauvegarder"
 
@@ -824,15 +833,15 @@
 msgid "Contacts"
 msgstr "Contacts"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Mot de passe incorrect"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Erreur réseau, veuillez réessayer."
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Impossible de lancer l'exportation vers Ring, réessayez"
 
@@ -842,7 +851,7 @@
 msgid "Change password"
 msgstr "changer le mot de passe"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Sauvegarder"
@@ -905,11 +914,11 @@
 msgid "Voicemail number"
 msgstr "Numéro de boîte vocale"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr "Erreur :  mot de passe incorrect"
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr "Erreur : appareil inconnu"
 
@@ -933,7 +942,7 @@
 msgid "Open Avatar Image"
 msgstr "Ouvrir l’image de profil"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -945,9 +954,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "\"In varietate concordia\"\nle %.25s"
+msgstr "\"Live Free or Die\"\ncompilé le %.25s"
 
 #: src/dialogs.c:137
 msgid ""
@@ -955,27 +964,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Ring pour GNOME.\nRing est un logiciel libre de communication universel  respectant les libertés et la vie privée de ses utilisateurs."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
-msgstr ""
+msgstr "Ajouter un compte ..."
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Appeler"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Ouvrir la discussion"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr "Quitter la page des réglages"
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr "vous appelle"
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Appel entrant"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr "Nouvelle demande de "
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr "Invitation"
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr "Nouveau message"
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1045,7 +1078,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Ring pour GNOME"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Les mots de passes ne correspondent pas"
 
@@ -1073,7 +1106,7 @@
 msgid "Ring ID QR code"
 msgstr "Code QR Identifiant Ring"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Envoyez un fichier"
 
@@ -1081,28 +1114,28 @@
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
-msgstr ""
+msgstr "Attention ! Cette opération supprimera votre compte de l'appareil.\nVous pourriez perdre définitivement le nom d'enregistrement !"
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
 #: src/newaccountsettingsview.cpp:679
 msgid "Edit name"
-msgstr ""
+msgstr "Modifier le nom"
 
 #: src/newaccountsettingsview.cpp:774
 msgid "Unban"
-msgstr ""
+msgstr "Ré-autoriser"
 
 #: src/newaccountsettingsview.cpp:810
 msgid "New password and its confirmation are different!"
-msgstr ""
+msgstr "Les deux mots de passe sont différents !"
 
 #: src/newaccountsettingsview.cpp:821
 msgid "Incorrect password!"
-msgstr ""
+msgstr "Mot de passe incorrect !"
 
 #: src/newaccountsettingsview.cpp:858
 msgid "Note: this will change the password only on this device."
@@ -1118,40 +1151,40 @@
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Account exported!"
-msgstr ""
+msgstr "Le compte a été exporté."
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Export account failure."
-msgstr ""
+msgstr "Échec de l'export de compte."
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
-msgstr ""
+msgstr "Initialisation ..."
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
-msgstr ""
+msgstr "En cours de connexion ..."
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "En ligne"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
-msgstr ""
+msgstr "État inconnu"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
-msgstr ""
+msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
-msgstr ""
+msgstr "Pas de mot de passe"
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/he.po ring-20180816.2.e26b79f~ds1/client-gnome/po/he.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/he.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/he.po	2018-08-16 15:09:41.000000000 +0000
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Alexandre Lision\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"
@@ -43,7 +43,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -132,44 +132,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -180,83 +180,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "קדימה"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "פרופיל"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "חשבון"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "שם משתמש"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "כעת מפיק חשבון Ring שלך..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -282,42 +282,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "הגדרות היסטוריה"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "שמור היסטוריה למשך (ימים):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "טהר היסטוריה"
 
@@ -333,7 +337,7 @@
 msgid "Media"
 msgstr "מדיה"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "הגדרות"
 
@@ -436,7 +440,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -717,7 +721,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -725,34 +729,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "קריאה נכנסת"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "קבל"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s אמר(ה):"
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -778,24 +787,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -808,15 +817,15 @@
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "סיסמה רעה"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -826,7 +835,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -889,11 +898,11 @@
 msgid "Voicemail number"
 msgstr "מספר תא קולי"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -917,7 +926,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_פתח"
 
@@ -929,7 +938,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -939,27 +948,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "קריאה נכנסת"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1029,7 +1062,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- לקוח GNOME עבור Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "סיסמאות לא תואמות"
 
@@ -1057,7 +1090,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1067,7 +1100,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1108,34 +1141,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/hi_IN.po ring-20180816.2.e26b79f~ds1/client-gnome/po/hi_IN.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/hi_IN.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/hi_IN.po	2018-08-16 15:09:41.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Hindi (India) (http://www.transifex.com/savoirfairelinux/ring/language/hi_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -130,44 +130,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -178,83 +178,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "खाता"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -280,42 +280,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -331,7 +335,7 @@
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr ""
 
@@ -434,7 +438,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -715,7 +719,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -723,33 +727,38 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
@@ -776,24 +785,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -806,15 +815,15 @@
 msgid "Contacts"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -824,7 +833,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -887,11 +896,11 @@
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -915,7 +924,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -927,7 +936,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -937,27 +946,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1027,7 +1060,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1055,7 +1088,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1065,7 +1098,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1106,34 +1139,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/hr.po ring-20180816.2.e26b79f~ds1/client-gnome/po/hr.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/hr.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/hr.po	2018-08-16 15:09:41.000000000 +0000
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Anton Umolac <umolac@hotmail.com>\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"
@@ -42,7 +42,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -131,44 +131,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Poništi"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -179,83 +179,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Slijedeće"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Račun"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Potvrdi lozinku"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "U redu"
@@ -281,42 +281,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Postavke povijesti"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Zadrži povijest (dana):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(postavi na 0 za neograničenu povijest)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Očisti svu povijest"
 
@@ -332,7 +336,7 @@
 msgid "Media"
 msgstr "Medij"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Postavke"
 
@@ -435,7 +439,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -716,7 +720,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -724,34 +728,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Dolazni poziv"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Pokaži"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Prihvati"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s kaže:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Odbij"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Odbij"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -777,24 +786,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -807,15 +816,15 @@
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -825,7 +834,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Spremi datoteku"
@@ -888,11 +897,11 @@
 msgid "Voicemail number"
 msgstr "Broj govorne pošte"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -916,7 +925,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -928,7 +937,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -938,27 +947,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Dolazni poziv"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1061,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME klijent za Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1056,7 +1089,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1066,7 +1099,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1107,34 +1140,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/hu.po ring-20180816.2.e26b79f~ds1/client-gnome/po/hu.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/hu.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/hu.po	2018-08-16 15:09:41.000000000 +0000
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Balázs Meskó <meskobalazs@gmail.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-08-10 10:17+0000\n"
+"Last-Translator: . . <ovari123@zoho.com>\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"
@@ -34,7 +34,7 @@
 
 #: ui/accountmigrationview.ui:31
 msgid "This account is malformed, please enter your password"
-msgstr ""
+msgstr "Ez a fiók meghibásodott, kérjük, adja meg a jelszavát"
 
 #: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:620
 msgid "Alias"
@@ -42,9 +42,9 @@
 
 #: ui/accountmigrationview.ui:126
 msgid "Ring ID"
-msgstr ""
+msgstr "Ring azonosító"
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -58,11 +58,11 @@
 #: ui/newaccountsettingsview.ui:876 src/accountmigrationview.cpp:176
 #: src/newaccountsettingsview.cpp:963
 msgid "Delete account"
-msgstr ""
+msgstr "Fiók törlése"
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
-msgstr ""
+msgstr "Migráció sikertelen, rossz jelszó?"
 
 #: ui/currentcallview.ui:251
 msgid "End this call"
@@ -133,44 +133,44 @@
 msgid "Transfer to"
 msgstr "Átirányítás"
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Üdvözli a"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Ring fiók létrehozása"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Új Ring fiók létrehozása (új felhasználóknak)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Ezen eszköz fiókhoz kapcsolása"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Ezen eszköz, egy másik eszközön létrehozott Ring fiókhoz kapcsolása"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Mégse"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
-msgstr ""
+msgstr "További beállítások…"
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
-msgstr ""
+msgstr "Új SIP fiók hozzáadása"
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Ezen eszköz egy létező fiókhoz kapcsolása"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -181,83 +181,83 @@
 "from an archive."
 msgstr "Az eszköz másik fiókhoz kapcsolásához kettő lehetőség van .Importálhatja fiókját a DHT-ből, de először PIN-kódra van szüksége. A PIN-kód előállításához menjen egy korábbi eszköz fiókkezelési beállításába, válassza ki a használandó Ring fiókot, és válassza a „Másik eszköz hozzákapcsolása ehhez a fiókhoz” lehetőséget. Meg fogja kapni az űrlap kitöltéséhez szükséges PIN-kódot. A PIN-kód csak 10 percig érvényes. Vagy közvetlenül importálhatja fiókját egy archívumból."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Írja be a PIN-kódját:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Vagy egy fájl importálása:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Írja be a jelszót:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Vissza"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Következő"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Fiók"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
-msgstr ""
+msgstr "Regisztráljon felhasználónevet"
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "Ezt bejelölve, regisztrál egy egyedi felhasználónevet a Ring hálózaton. Az emberek ezt a Ring azonosítója (amely 40 karakter hosszú) helyett használhatják, hogy elérjék Önt."
 
-#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Ez a jelszó a fiókadatainak titkosítására lesz használva, és arra, hogy más eszközöket kapcsoljon a fiókjához."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Jelszó megerősítése"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "A Ring fiókja létrehozása…"
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Felhasználónév regisztrálása…"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Ez néhány percet is igénybe vehet."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "A Ring fiókja lekérése…"
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Hiba a fiók létrehozása/betöltése során."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -283,42 +283,46 @@
 msgstr "Értesítések engedélyezése a bejövő hívásokhoz."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr "A függőben lévő kérelmekre vonatkozó értesítések engedélyezése."
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Értesítések engedélyezése az új csevegési üzenetekhez."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Képek és videók megjelenítése a csevegőablakban."
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "A keresőmezőbe írt szám új hívást fog indítani."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "Letöltés mappa:"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Csevegés mutatása a jobb oldalon."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Csevegés mutatása alul."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Előzmények beállításai"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Előzmények megtartása ennyi napig:"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(állítsa 0-ra a korlátlan előzményekért)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Az összes előzmény törlése"
 
@@ -334,7 +338,7 @@
 msgid "Media"
 msgstr "Média"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Beállítások"
 
@@ -435,19 +439,19 @@
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
-msgstr ""
+msgstr "Kattintson a jelszó módosításához"
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Felhasználó fiók exportálása"
 
 #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:908
 msgid "Enable account"
-msgstr ""
+msgstr "Fiók engedélyezése"
 
 #: ui/newaccountsettingsview.ui:697
 msgid "SIP server"
-msgstr ""
+msgstr "SIP szerver"
 
 #: ui/newaccountsettingsview.ui:781
 msgid "password"
@@ -460,7 +464,7 @@
 
 #: ui/newaccountsettingsview.ui:848
 msgid "Voicemail"
-msgstr ""
+msgstr "Hangposta"
 
 #: ui/newaccountsettingsview.ui:959
 msgid "Known devices linked to this Ring account"
@@ -468,11 +472,11 @@
 
 #: ui/newaccountsettingsview.ui:967
 msgid "Link another device"
-msgstr ""
+msgstr "Csatlakoztasson másik eszközt"
 
 #: ui/newaccountsettingsview.ui:1032
 msgid "Banned contacts"
-msgstr ""
+msgstr "Letiltott partnerek"
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
@@ -480,27 +484,27 @@
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
-msgstr ""
+msgstr "Általános beállítások"
 
 #: ui/newaccountsettingsview.ui:1146
 msgid "Call settings"
-msgstr ""
+msgstr "Hívás beállítások"
 
 #: ui/newaccountsettingsview.ui:1184
 msgid "Allow call from untrusted peers"
-msgstr ""
+msgstr "Hívás engedélyezése nem megbízható személyektől"
 
 #: ui/newaccountsettingsview.ui:1219
 msgid "Auto answer calls"
-msgstr ""
+msgstr "Hívások automatikus fogadása"
 
 #: ui/newaccountsettingsview.ui:1255
 msgid "Custom ringtone"
-msgstr ""
+msgstr "Egyéni csengőhang"
 
 #: ui/newaccountsettingsview.ui:1299
 msgid "Name server"
-msgstr ""
+msgstr "Névszerver"
 
 #: ui/newaccountsettingsview.ui:1336 ui/newaccountsettingsview.ui:2489
 msgid "Address"
@@ -508,7 +512,7 @@
 
 #: ui/newaccountsettingsview.ui:1370
 msgid "OpenDHT configuration"
-msgstr ""
+msgstr "OpenDHT konfiguráció"
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
@@ -520,7 +524,7 @@
 
 #: ui/newaccountsettingsview.ui:1549
 msgid "Enable SDES for key exchange protocol"
-msgstr ""
+msgstr "Engedélyezze a SDES kulcscsere protokollt"
 
 #: ui/newaccountsettingsview.ui:1585
 msgid "Fallback on RTP on encryption failure"
@@ -576,19 +580,19 @@
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
-msgstr ""
+msgstr "Kapcsolódás"
 
 #: ui/newaccountsettingsview.ui:2065
 msgid "Registration expire timeout (seconds)"
-msgstr ""
+msgstr "Regisztráció érvényességének lejárta (másodpercekben)"
 
 #: ui/newaccountsettingsview.ui:2102
 msgid "Network interface"
-msgstr ""
+msgstr "Hálózati felület"
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
-msgstr ""
+msgstr "UPnP"
 
 #: ui/newaccountsettingsview.ui:2173
 msgid "Use TURN"
@@ -596,19 +600,19 @@
 
 #: ui/newaccountsettingsview.ui:2208
 msgid "(TURN) address"
-msgstr ""
+msgstr "(TURN) cím"
 
 #: ui/newaccountsettingsview.ui:2243
 msgid "(TURN) username"
-msgstr ""
+msgstr "(TURN) felhasználónév"
 
 #: ui/newaccountsettingsview.ui:2277
 msgid "(TURN) password"
-msgstr ""
+msgstr "(TURN) jelszó"
 
 #: ui/newaccountsettingsview.ui:2314
 msgid "(TURN) realm"
-msgstr ""
+msgstr "(TURN) birodalom"
 
 #: ui/newaccountsettingsview.ui:2348
 msgid "Use STUN"
@@ -616,15 +620,15 @@
 
 #: ui/newaccountsettingsview.ui:2383
 msgid "(STUN) address"
-msgstr ""
+msgstr "(STUN) cím"
 
 #: ui/newaccountsettingsview.ui:2416
 msgid "Published address"
-msgstr ""
+msgstr "Nyilvános cím"
 
 #: ui/newaccountsettingsview.ui:2453
 msgid "Use custom address and port"
-msgstr ""
+msgstr "Használjon egyéni címet és portot"
 
 #: ui/newaccountsettingsview.ui:2524
 msgid "Port"
@@ -636,7 +640,7 @@
 
 #: ui/newaccountsettingsview.ui:2623
 msgid "Enable video"
-msgstr ""
+msgstr "Videó engedélyezése"
 
 #: ui/newaccountsettingsview.ui:2650
 msgid "Audio codecs"
@@ -648,27 +652,27 @@
 
 #: ui/newaccountsettingsview.ui:2732
 msgid "Only used during SDP negotiation in case ICE is not supported."
-msgstr ""
+msgstr "Csak az SDP-tárgyalások során használatos ha az ICE nem támogatott."
 
 #: ui/newaccountsettingsview.ui:2766
 msgid "Audio RTP Min port"
-msgstr ""
+msgstr "Hang RTP min port"
 
 #: ui/newaccountsettingsview.ui:2801
 msgid "Audio RTP Max port"
-msgstr ""
+msgstr "Hang RTP max port"
 
 #: ui/newaccountsettingsview.ui:2836
 msgid "Video RTP Min port"
-msgstr ""
+msgstr "Videó RTP min port"
 
 #: ui/newaccountsettingsview.ui:2871
 msgid "Video RTP Max port"
-msgstr ""
+msgstr "Videó RTP max port"
 
 #: ui/usernameregistrationbox.ui:28
 msgid "register username"
-msgstr ""
+msgstr "regisztráljon felhasználónevet"
 
 #: ui/chatview.ui:19 ui/chatview.ui:22
 msgid "Hide chat view"
@@ -718,7 +722,7 @@
 msgid "Set selection as image"
 msgstr "Kijelölés beállítása képként"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -726,38 +730,43 @@
 "Error: %s"
 msgstr "Képtelen elkezdeni\nGyőződjön meg róla, hogy a Ring daemon (dring) fut.\nHiba: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring hiba"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "A Ring megnyitása"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Bejövő hívás"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr "Beszélgetés megnyitása"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Megjelenítés"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Elfogadás"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s üzenete:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Elutasítás"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Elutasítás"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
-msgstr ""
+msgstr "Regisztrálja ezt a felhasználónevet a névszerveren"
 
 #: src/usernameregistrationbox.cpp:173
 msgid "Username already taken"
@@ -769,34 +778,34 @@
 
 #: src/usernameregistrationbox.cpp:194
 msgid "Lookup unavailable, check your network connection"
-msgstr ""
+msgstr "A keresése nem érhető el, ellenőrizze a hálózati kapcsolatot"
 
 #: src/usernameregistrationbox.cpp:274
 msgid "Performing lookup..."
-msgstr ""
+msgstr "Keresés végrehajtása…"
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress..."
-msgstr ""
+msgstr "Regisztráció folyamatban…"
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Ez egy destruktív művelet. Biztosan törli az összes csevegést és híváselőzményt?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "Letöltési mappa kiválasztása"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "_Mentés"
 
@@ -809,15 +818,15 @@
 msgid "Contacts"
 msgstr "Partnerek"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Hibás jelszó"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Hálózati hiba, próbálja újra"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "A Ring export elindítása nem sikerült, próbálja újra"
 
@@ -827,7 +836,7 @@
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Fájl mentése"
@@ -890,11 +899,11 @@
 msgid "Voicemail number"
 msgstr "Hangpostaszám"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr "Hiba: hibás jelszó!"
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr "Hiba: ismeretlen eszköz!"
 
@@ -918,7 +927,7 @@
 msgid "Open Avatar Image"
 msgstr "Avatar megnyitása"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Megnyitás"
 
@@ -930,9 +939,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "„Egység a sokféleségben”\nkódtár verziója: %.25s"
+msgstr "„Élj szabadon vagy halj meg”\nkódtár verziója: %.25s"
 
 #: src/dialogs.c:137
 msgid ""
@@ -940,27 +949,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "A GNOME kliens a Ringhez.\nA Ring egy szabad szoftver az univerzális kommunikációhoz, amely tiszteletben tartja a felhasználók szabadságát és magánszféráját."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
-msgstr ""
+msgstr "Fiók hozzáadása…"
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Hívás kezdeményezése"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Csevegés megnyitása"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr "A beállítási oldal elhagyása"
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr " hív!"
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Bejövő hívás"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr "Új kérés"
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr "Megbízható kérelem"
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr "Új üzenet"
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1030,7 +1063,7 @@
 msgid "- GNOME client for Ring"
 msgstr "– GNOME kliens a Ring-hez"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "A jelszavak nem egyeznek"
 
@@ -1058,7 +1091,7 @@
 msgid "Ring ID QR code"
 msgstr "Ring azonosító QR-kód"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Fájl küldése"
 
@@ -1066,28 +1099,28 @@
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
-msgstr ""
+msgstr "Figyelmeztetés! Ez a művelet eltávolítja ezt a fiókot az eszközön!\nMegjegyzés: ez a művelet nem vonható vissza. A regisztrált neved is elveszhet!"
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatikus"
 
 #: src/newaccountsettingsview.cpp:679
 msgid "Edit name"
-msgstr ""
+msgstr "Név szerkesztése"
 
 #: src/newaccountsettingsview.cpp:774
 msgid "Unban"
-msgstr ""
+msgstr "Letiltás visszavonása"
 
 #: src/newaccountsettingsview.cpp:810
 msgid "New password and its confirmation are different!"
-msgstr ""
+msgstr "Az új jelszó és a megerősítése különböző!"
 
 #: src/newaccountsettingsview.cpp:821
 msgid "Incorrect password!"
-msgstr ""
+msgstr "Hibás jelszó!"
 
 #: src/newaccountsettingsview.cpp:858
 msgid "Note: this will change the password only on this device."
@@ -1103,40 +1136,40 @@
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Account exported!"
-msgstr ""
+msgstr "A fiókot exportálták!"
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Export account failure."
-msgstr ""
+msgstr "Fiók exportálási hiba."
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
-msgstr ""
+msgstr "Szignál…"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Nem elérhető"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
-msgstr ""
+msgstr "Kapcsolódás…"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Elérhető"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
-msgstr ""
+msgstr "Ismeretlen állapot"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
-msgstr ""
+msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
-msgstr ""
+msgstr "nincs jelszó beállítva"
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/id.po ring-20180816.2.e26b79f~ds1/client-gnome/po/id.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/id.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/id.po	2018-08-16 15:09:41.000000000 +0000
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Fitra Aditya <fitra@g.pl>\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"
@@ -41,7 +41,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -130,44 +130,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -178,83 +178,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Selanjutnya"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Akun"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -280,42 +280,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -331,7 +335,7 @@
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr ""
 
@@ -434,7 +438,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -715,7 +719,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -723,34 +727,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr ""
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Terima"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr ""
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Tolak"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Tolak"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -776,24 +785,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -806,15 +815,15 @@
 msgid "Contacts"
 msgstr "Kontak"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -824,7 +833,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -887,11 +896,11 @@
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -915,7 +924,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -927,7 +936,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -937,27 +946,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1027,7 +1060,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1055,7 +1088,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1065,7 +1098,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1106,34 +1139,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/it_IT.po ring-20180816.2.e26b79f~ds1/client-gnome/po/it_IT.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/it_IT.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/it_IT.po	2018-08-16 15:09:41.000000000 +0000
@@ -11,9 +11,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Max Lecomte <xineyos@gmail.com>\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"
@@ -45,7 +45,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -134,44 +134,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Crea Account Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Crea un nuovo account Ring (per nuovi utenti)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Collega questo dispositivo ad un account"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Collega questo dispositivo ad un account RIng creato su un altro dispositivo"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Collega questo dispositivo ad un account esistente"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -182,83 +182,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Inserire il pin:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Inserire la password:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Precedente"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Prossimo"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profilo"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Utente"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Utente"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Questa password verrà utilizzata per crittografare i tuoi dati dell'account e per collegare i nuovi dispositivi al tuo account."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Conferma password"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Generazione del tuo account Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Registro nome utente..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Questa operazione potrebbe richiedere alcuni minuti."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Acquisisco il tuo account Ring..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Errore di creazione/caricamento account."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -284,42 +284,46 @@
 msgstr "Abilita le notifiche per le chiamate in entrata."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Abilita le notifiche per i nuovi messaggi della chat."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "L'immissione di un numero nel campo di ricerca effettuerà una chiamata"
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Mostra chat sulla destra."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Mostra la chat in basso."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Impostazioni Cronologia"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Mantieni la cronologia per (giorni):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(imposta 0 per cronologia illimitata)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Pulisci la cronologia"
 
@@ -335,7 +339,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Opzioni"
 
@@ -432,13 +436,13 @@
 
 #: ui/newaccountsettingsview.ui:460
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -477,7 +481,7 @@
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
-msgstr ""
+msgstr "Impostazioni avanzate"
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
@@ -513,7 +517,7 @@
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
-msgstr ""
+msgstr "Avvio"
 
 #: ui/newaccountsettingsview.ui:1514
 msgid "Encrypt media streams (SRTP)"
@@ -573,7 +577,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "Sicurezza"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -589,7 +593,7 @@
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
-msgstr ""
+msgstr "UPnP"
 
 #: ui/newaccountsettingsview.ui:2173
 msgid "Use TURN"
@@ -633,7 +637,7 @@
 
 #: ui/newaccountsettingsview.ui:2560
 msgid "Video codecs"
-msgstr ""
+msgstr "Codec video"
 
 #: ui/newaccountsettingsview.ui:2623
 msgid "Enable video"
@@ -641,7 +645,7 @@
 
 #: ui/newaccountsettingsview.ui:2650
 msgid "Audio codecs"
-msgstr ""
+msgstr "Codec audio"
 
 #: ui/newaccountsettingsview.ui:2720
 msgid "SDP Session Negotiation (ICE Fallback)"
@@ -719,7 +723,7 @@
 msgid "Set selection as image"
 msgstr "Imposta l'immagine selezionata"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -727,34 +731,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Errore di Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Chiamata in ingresso"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Mostra"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Accetta"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s dice:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Rifiuto"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Rifiuta"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -780,24 +789,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Questa è un'operazione distruttiva. Sei sicuro di voler eliminare tutte le tue chat e cronologia chiamate?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -810,15 +819,15 @@
 msgid "Contacts"
 msgstr "Contatti"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Password scarsa"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Errore di rete, riprova"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Non è stato possibile iniziare l'esportazione a Ring, riprova"
 
@@ -828,7 +837,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Salva File"
@@ -891,11 +900,11 @@
 msgid "Voicemail number"
 msgstr "Numero voicemail"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -919,7 +928,7 @@
 msgid "Open Avatar Image"
 msgstr "Apri immagine dell'Avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Apri"
 
@@ -931,7 +940,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -941,27 +950,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Il client GNOME per Ring.\nRing è software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "chiama"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "apri chat"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Chiamata in ingresso"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1031,7 +1064,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Client GNOME per Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Le password non coincidono"
 
@@ -1059,7 +1092,7 @@
 msgid "Ring ID QR code"
 msgstr "Codice QR del Ring ID"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1069,7 +1102,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
@@ -1110,34 +1143,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
-msgstr ""
+msgstr "Disconnesso"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
-msgstr ""
+msgstr "In linea"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/it.po ring-20180816.2.e26b79f~ds1/client-gnome/po/it.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/it.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/it.po	2018-08-16 15:09:41.000000000 +0000
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: michelangelo.marchesi2 <michelangelo.marchesi@gmail.com>\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"
@@ -43,7 +43,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -132,44 +132,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Cancella"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -180,83 +180,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Seguente"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profilo"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Profilo"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Nome utente"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Confermare password"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Generazione del account Ring in corso…"
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -282,42 +282,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Mostrare la chat a destra."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Mostrare la chat in basso."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Impostazioni storico"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Tenere lo storico per (giorni):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(digitare 0 per uno storico senza limiti)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Cancellare tutto lo storico"
 
@@ -333,7 +337,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Impostazioni"
 
@@ -436,7 +440,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -475,7 +479,7 @@
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
-msgstr ""
+msgstr "Impostazioni avanzate"
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
@@ -511,7 +515,7 @@
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
-msgstr ""
+msgstr "Innesco"
 
 #: ui/newaccountsettingsview.ui:1514
 msgid "Encrypt media streams (SRTP)"
@@ -571,7 +575,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "Sicurezza"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -717,7 +721,7 @@
 msgid "Set selection as image"
 msgstr "Impostare la selezione come immagine"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -725,34 +729,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Errore di Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Chiamata in arrivo"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Mostra"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Accettare"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s dice:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Rifiuta"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Rifiuta"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -778,24 +787,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "A_bbandonare"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -808,15 +817,15 @@
 msgid "Contacts"
 msgstr "Contatti"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -826,7 +835,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -889,11 +898,11 @@
 msgid "Voicemail number"
 msgstr "Numero di segreteria telefonica"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -917,7 +926,7 @@
 msgid "Open Avatar Image"
 msgstr "Aprire l'immagine di avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Aprire"
 
@@ -929,7 +938,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -939,27 +948,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Chiamata in arrivo"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1029,7 +1062,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Cliente GNOME per Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Le password no corrispondono"
 
@@ -1057,7 +1090,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1067,7 +1100,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1108,34 +1141,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/ja.po ring-20180816.2.e26b79f~ds1/client-gnome/po/ja.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/ja.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/ja.po	2018-08-16 15:09:41.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Naofumi <naofum@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/savoirfairelinux/ring/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -132,44 +132,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "この端末をアカウントへリンク"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -180,83 +180,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "次へ"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "プロフィール"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "アカウント"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "パスワードの再入力"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -282,42 +282,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "履歴の設定"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "履歴をすべて削除"
 
@@ -333,7 +337,7 @@
 msgid "Media"
 msgstr "メディア"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "設定"
 
@@ -436,7 +440,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -717,7 +721,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -725,34 +729,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring エラー"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "着信"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "受け入れ"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "表示"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "拒否"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s さん曰く:"
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "辞退"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -778,24 +787,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "この操作は取り消すことができません。本当にあなたのすべてのチャットと通話の履歴を削除しますか？"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -808,15 +817,15 @@
 msgid "Contacts"
 msgstr "連絡先"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "パスワードが正しくありません"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "ネットワークエラーが発生しました。もう一度試してください。"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Ring への書き出しを開始できません。もう一度試してください。"
 
@@ -826,7 +835,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -889,11 +898,11 @@
 msgid "Voicemail number"
 msgstr "ボイスメール番号"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -917,7 +926,7 @@
 msgid "Open Avatar Image"
 msgstr "アバター画像を開く"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "開く(_O)"
 
@@ -929,7 +938,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -939,27 +948,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "通話を開始"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "チャットを開く"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "着信"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1029,7 +1062,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Ring 用の GNOME クライアント"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "パスワードが一致しません"
 
@@ -1057,7 +1090,7 @@
 msgid "Ring ID QR code"
 msgstr "Ring ID QRコード"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1067,7 +1100,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1108,34 +1141,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "オンライン"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/ko_KR.po ring-20180816.2.e26b79f~ds1/client-gnome/po/ko_KR.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/ko_KR.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/ko_KR.po	2018-08-16 15:09:41.000000000 +0000
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: JAE HO LEE <spectrick@gmail.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Alexandre Lision\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/savoirfairelinux/ring/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +41,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -130,44 +130,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "이 장치를 계정에 연결하기"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "취소"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -178,83 +178,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "이전"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "다음"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "프로필"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "계정"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "사용자명"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "암호 확인"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Ring 계정 생성 중..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -280,42 +280,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "이력 설정"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -331,7 +335,7 @@
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "설정"
 
@@ -434,7 +438,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -715,7 +719,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -723,33 +727,38 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "수락"
+
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
@@ -776,24 +785,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -806,15 +815,15 @@
 msgid "Contacts"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -824,7 +833,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "파일 저장"
@@ -887,11 +896,11 @@
 msgid "Voicemail number"
 msgstr "음성메일 번호"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -915,7 +924,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -927,7 +936,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -937,27 +946,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1027,7 +1060,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1055,7 +1088,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1065,7 +1098,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "자동"
@@ -1106,34 +1139,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/lt.po ring-20180816.2.e26b79f~ds1/client-gnome/po/lt.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/lt.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/lt.po	2018-08-16 15:09:41.000000000 +0000
@@ -5,13 +5,13 @@
 # Translators:
 # Guillaume Roguez, 2015
 # Mantas Kriaučiūnas <mantas@akl.lt>, 2015
-# Moo, 2015-2017
+# Moo, 2015-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 22:30+0000\n"
 "Last-Translator: Moo\n"
 "Language-Team: Lithuanian (http://www.transifex.com/savoirfairelinux/ring/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@
 msgid "Ring ID"
 msgstr "Ring ID"
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -62,7 +62,7 @@
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
-msgstr ""
+msgstr "Perkėlimas nepavyko, neteisingas slaptažodis?"
 
 #: ui/currentcallview.ui:251
 msgid "End this call"
@@ -133,44 +133,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Sveiki atvykę į"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Susikurti Ring paskyrą"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Sukurti naują Ring paskyrą (naujiems naudotojams)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Susieti šį įrenginį su paskyra"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Susieti šį įrenginį su kitame įrenginyje sukurta Ring paskyra"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Atsisakyti"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
-msgstr ""
+msgstr "Išplėstiniai..."
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
-msgstr ""
+msgstr "Pridėti naują SIP paskyrą"
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Susieti šį įrenginį su esama paskyra"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -181,83 +181,83 @@
 "from an archive."
 msgstr "Norėdami susieti šį įrenginį su kita paskyra, jūs turite dvi galimybes. Galite importuoti savo paskyrą iš DHT, bet iš pradžių, turėsite gauti PIN kodą. Norėdami sukurti PIN kodą, pereikite ankstesniame įrenginyje į paskyros tvarkymo nustatymą, pasirinkite norimą naudoti Ring paskyrą 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ų. Arba galite tiesiogiai importuoti savo paskyrą iš archyvo."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Įveskite savo pin:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Arba importuokite failą:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Įveskite savo slaptažodį:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Ankstesnis"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Kitas"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profilis"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Paskyra"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
-msgstr ""
+msgstr "Registruoti naudotojo vardą"
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Naudotojo vardas"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Šis slaptažodis bus naudojamas jūsų paskyros duomenų šifravimui ir, norint susieti naują įrenginį su jūsų paskyra."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Patvirtinkite slaptažodį"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Kuriama jūsų Ring paskyra..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Registruojamas naudotojo vardas..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Tai gali užtrukti kelias minutes."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Gaunama jūsų Ring paskyra..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Klaida, kuriant/įkeliant paskyrą."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "Gerai"
@@ -283,42 +283,46 @@
 msgstr "Įjungti pranešimus gaunamiesiems skambučiams."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Įjungti pranešimus naujoms pokalbio žinutėms."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Rodyti pokalbių lange paveikslus ir vaizdo įrašus."
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Įvedus numerį į paieškos įrašą, bus pradedama skambinti."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
-msgstr ""
+msgstr "Atsiuntimų aplankas:"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Rodyti pokalbį dešinėje."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Rodyti pokalbį apačioje."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Istorijos nustatymai"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Laikyti istoriją (dienų):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(nustatykite 0 neribotai istorijai)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Išvalyti visą istoriją"
 
@@ -334,7 +338,7 @@
 msgid "Media"
 msgstr "Medija"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Nustatymai"
 
@@ -435,19 +439,19 @@
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
-msgstr ""
+msgstr "Spustelėkite, norėdami pakeisti slaptažodį"
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Eksportuoti paskyrą"
 
 #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:908
 msgid "Enable account"
-msgstr ""
+msgstr "Įjungti paskyrą"
 
 #: ui/newaccountsettingsview.ui:697
 msgid "SIP server"
-msgstr ""
+msgstr "SIP serveris"
 
 #: ui/newaccountsettingsview.ui:781
 msgid "password"
@@ -460,7 +464,7 @@
 
 #: ui/newaccountsettingsview.ui:848
 msgid "Voicemail"
-msgstr ""
+msgstr "Balso paštas"
 
 #: ui/newaccountsettingsview.ui:959
 msgid "Known devices linked to this Ring account"
@@ -468,11 +472,11 @@
 
 #: ui/newaccountsettingsview.ui:967
 msgid "Link another device"
-msgstr ""
+msgstr "Susieti kitą įrenginį"
 
 #: ui/newaccountsettingsview.ui:1032
 msgid "Banned contacts"
-msgstr ""
+msgstr "Užblokuoti kontaktai"
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
@@ -480,11 +484,11 @@
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
-msgstr ""
+msgstr "Bendri nustatymai"
 
 #: ui/newaccountsettingsview.ui:1146
 msgid "Call settings"
-msgstr ""
+msgstr "Skambučio nustatymai"
 
 #: ui/newaccountsettingsview.ui:1184
 msgid "Allow call from untrusted peers"
@@ -492,7 +496,7 @@
 
 #: ui/newaccountsettingsview.ui:1219
 msgid "Auto answer calls"
-msgstr ""
+msgstr "Automatiškai atsiliepti į skambučius"
 
 #: ui/newaccountsettingsview.ui:1255
 msgid "Custom ringtone"
@@ -500,7 +504,7 @@
 
 #: ui/newaccountsettingsview.ui:1299
 msgid "Name server"
-msgstr ""
+msgstr "Vardų serveris"
 
 #: ui/newaccountsettingsview.ui:1336 ui/newaccountsettingsview.ui:2489
 msgid "Address"
@@ -508,7 +512,7 @@
 
 #: ui/newaccountsettingsview.ui:1370
 msgid "OpenDHT configuration"
-msgstr ""
+msgstr "OpenDHT konfigūracija"
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
@@ -576,7 +580,7 @@
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
-msgstr ""
+msgstr "Jungiamumas"
 
 #: ui/newaccountsettingsview.ui:2065
 msgid "Registration expire timeout (seconds)"
@@ -584,7 +588,7 @@
 
 #: ui/newaccountsettingsview.ui:2102
 msgid "Network interface"
-msgstr ""
+msgstr "Tinklo sąsaja"
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
@@ -596,15 +600,15 @@
 
 #: ui/newaccountsettingsview.ui:2208
 msgid "(TURN) address"
-msgstr ""
+msgstr "(TURN) adresas"
 
 #: ui/newaccountsettingsview.ui:2243
 msgid "(TURN) username"
-msgstr ""
+msgstr "(TURN) naudotojo vardas"
 
 #: ui/newaccountsettingsview.ui:2277
 msgid "(TURN) password"
-msgstr ""
+msgstr "(TURN) slaptažodis"
 
 #: ui/newaccountsettingsview.ui:2314
 msgid "(TURN) realm"
@@ -616,11 +620,11 @@
 
 #: ui/newaccountsettingsview.ui:2383
 msgid "(STUN) address"
-msgstr ""
+msgstr "(STUN) adresas"
 
 #: ui/newaccountsettingsview.ui:2416
 msgid "Published address"
-msgstr ""
+msgstr "Paskelbtas adresas"
 
 #: ui/newaccountsettingsview.ui:2453
 msgid "Use custom address and port"
@@ -718,46 +722,51 @@
 msgid "Set selection as image"
 msgstr "Nustatyti pažymėtą sritį kaip paveikslą"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
 "Make sure the Ring daemon (dring) is running.\n"
 "Error: %s"
-msgstr ""
+msgstr "Nepavyko inicijuoti.\nĮsitikinkite, kad Ring tarnyba (dring) yra paleista.\nKlaida: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring klaida"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
-msgstr ""
+msgstr "Rodyti Ring"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
+msgstr "Išeiti"
+
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Gaunamasis skambutis"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Priimti"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Rodyti"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Atmesti"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s sako:"
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Atmesti"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
-msgstr ""
+msgstr "Registruoti šį naudotojo vardą vardų serveryje"
 
 #: src/usernameregistrationbox.cpp:173
 msgid "Username already taken"
@@ -777,28 +786,28 @@
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress..."
-msgstr ""
+msgstr "Vyksta registracija..."
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Tai yra naikinamasis veiksmas. Ar tikrai norite ištrinti visą savo pokalbių ir skambučių istoriją?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
-msgstr ""
+msgstr "Į_rašyti"
 
 #: src/backends/edscontactbackend.cpp:193
 msgid "Unknown EDS addressbook"
@@ -809,15 +818,15 @@
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Blogas slaptažodis"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Tinklo klaida, bandykite dar kartą"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Nepavyko inicijuoti eksportavimą į Ring, pabandykite dar kartą"
 
@@ -827,7 +836,7 @@
 msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Įrašyti failą"
@@ -840,7 +849,7 @@
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
-msgstr ""
+msgstr "Įspėjimas! Šis veiksmas panaikins įrenginį!\nPastaba: šio veiksmo neįmanoma bus atšaukti."
 
 #: src/accountgeneraltab.cpp:479 src/newaccountsettingsview.cpp:621
 msgid "Enter password to revoke device"
@@ -868,7 +877,7 @@
 
 #: src/accountgeneraltab.cpp:582 src/newaccountsettingsview.cpp:701
 msgid "Error when revoking device"
-msgstr ""
+msgstr "Klaida, panaikinant įrenginį"
 
 #: src/accountgeneraltab.cpp:631
 msgid "Type"
@@ -890,17 +899,17 @@
 msgid "Voicemail number"
 msgstr "Balso pašto numeris"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
-msgstr ""
+msgstr "Klaida: neteisingas slaptažodis!"
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
-msgstr ""
+msgstr "Klaida: nežinomas įrenginys!"
 
 #: src/video/video_widget.cpp:566
 msgid "Share _screen area"
-msgstr ""
+msgstr "Bendrinti _ekrano sritį"
 
 #: src/video/video_widget.cpp:577
 msgid "Share _monitor"
@@ -918,7 +927,7 @@
 msgid "Open Avatar Image"
 msgstr "Atverti avataro paveikslą"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "A_tverti"
 
@@ -930,7 +939,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -940,27 +949,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "GNOME klientas, skirtas Ring.\nRing yra visuotiniam susisiekimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
-msgstr ""
+msgstr "Pridėti paskyrą..."
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "skambinti"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "atverti pokalbį"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Gaunamasis skambutis"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -998,7 +1031,7 @@
 
 #: src/conversationpopupmenu.cpp:237
 msgid "C_lear history"
-msgstr ""
+msgstr "Išva_lyti istoriją"
 
 #: src/conversationpopupmenu.cpp:240
 msgid "_Remove conversation"
@@ -1006,11 +1039,11 @@
 
 #: src/conversationpopupmenu.cpp:245
 msgid "_Block contact"
-msgstr ""
+msgstr "Už_blokuoti kontaktą"
 
 #: src/conversationpopupmenu.cpp:249
 msgid "_Unblock contact"
-msgstr ""
+msgstr "_Atblokuoti kontaktą"
 
 #: src/conversationpopupmenu.cpp:255
 msgid "_Copy name"
@@ -1030,7 +1063,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME kliento programa, skirta Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Slaptažodžiai nesutampa"
 
@@ -1058,9 +1091,9 @@
 msgid "Ring ID QR code"
 msgstr "Ring ID QR kodas"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
-msgstr ""
+msgstr "Siųsti failą"
 
 #: src/accountmigrationview.cpp:175 src/newaccountsettingsview.cpp:962
 msgid ""
@@ -1068,7 +1101,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatinė"
@@ -1083,11 +1116,11 @@
 
 #: src/newaccountsettingsview.cpp:810
 msgid "New password and its confirmation are different!"
-msgstr ""
+msgstr "Naujas slaptažodis ir jo patvirtinimas nesutampa!"
 
 #: src/newaccountsettingsview.cpp:821
 msgid "Incorrect password!"
-msgstr ""
+msgstr "Neteisingas slaptažodis!"
 
 #: src/newaccountsettingsview.cpp:858
 msgid "Note: this will change the password only on this device."
@@ -1103,40 +1136,40 @@
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Account exported!"
-msgstr ""
+msgstr "Paskyra eksportuota!"
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Export account failure."
-msgstr ""
+msgstr "Paskyros eksportavimas nepavyko."
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Nežinoma klaida"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
-msgstr ""
+msgstr "Inicijuojama..."
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
-msgstr ""
+msgstr "Atsijungęs"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
-msgstr ""
+msgstr "Jungiamasi..."
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
-msgstr ""
+msgstr "Prisijungęs"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
-msgstr ""
+msgstr "Nežinoma būsena"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
-msgstr ""
+msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
-msgstr ""
+msgstr "slaptažodis nėra nustatytas"
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/ms.po ring-20180816.2.e26b79f~ds1/client-gnome/po/ms.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/ms.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/ms.po	2018-08-16 15:09:41.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: wig\n"
 "Language-Team: Malay (http://www.transifex.com/savoirfairelinux/ring/language/ms/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -130,44 +130,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Sambungkan perangkat ini dengan akaun"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Batal"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -178,83 +178,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Akaun"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Nama pengguna"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Sahkan kata laluan"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -280,42 +280,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -331,7 +335,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Aturan"
 
@@ -434,7 +438,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -715,7 +719,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -723,35 +727,40 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Panggilan masuk"
-
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Terima"
+
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
 msgstr ""
 
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Bantah panggilan"
+
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
 msgstr ""
@@ -776,24 +785,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -806,15 +815,15 @@
 msgid "Contacts"
 msgstr "Kenalan"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -824,7 +833,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -887,11 +896,11 @@
 msgid "Voicemail number"
 msgstr "Nombor peti suara"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -915,7 +924,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -927,7 +936,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -937,27 +946,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Panggilan masuk"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1027,7 +1060,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1055,7 +1088,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1065,7 +1098,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1106,34 +1139,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/nb.po ring-20180816.2.e26b79f~ds1/client-gnome/po/nb.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/nb.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/nb.po	2018-08-16 15:09:41.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/savoirfairelinux/ring/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -132,44 +132,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Velkommen til"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Opprett Ring-konto"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Opprett en ny Ring-konto (for nye brukere)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Lenk denne enheten til en konto"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Lenk denne enheten til en Ring-konto opprettet på en annen enhet"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Lenk denne enheten til en eksisterende konto"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -180,83 +180,83 @@
 "from an archive."
 msgstr "For å lenke denne enheten til en annen konto har du to muligheter. Du kan importere kontoen fra DHT, men først hente en PIN-kode. For å generere PIN-koden, gå til kontobehandlingsinnstillingne fra en tidligere enhet, velg Ring-kontoen du vil bruke og finn \"Lenk en annen enhet til denne kontoen\". Du vil få nødvendig PIN for å fullføre skjemaet. PIN-koden er bare gyldig i 10 minutter."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Skriv inn din PIN:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Eller importer fil:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Skriv inn ditt passord:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Neste"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Konto"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "Ved uthuking av dette, vil du registrere et unikt brukernavn på Ring-nettverket. Folk kan bruke det for å komme i kontakt med deg istedenfor å bruke din 40 tegn lange RingID."
 
-#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Dette passordet vil brukes til å kryptere din kontodata og lenke nye enheter til din konto."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Lager din Ring-konto…"
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Registrerer brukernavn…"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Dette kan ta noen minutter."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Henter inn din Ring-konto…"
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Feil ved oppretting/innlasting av konto."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -282,42 +282,46 @@
 msgstr "Skru på varsler for innkommende anrop."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Skru på varsler for nye sludremeldinger."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Vis bilder og videoer i sludrevindu."
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Inntasting av nummer i søkefeltet vil utføre ny samtale."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "Nedlastingsmappe:"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Vis sludring til høyre."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Vis sludring nederst."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Historikkinnstillinger"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Behold historikk i (dager):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(sett til 0 for ubegrenset historikk)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Nullstill all historikk"
 
@@ -333,7 +337,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Innstillinger"
 
@@ -436,7 +440,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Eksporter konto"
 
@@ -717,7 +721,7 @@
 msgid "Set selection as image"
 msgstr "Bruk utvalg som bilde"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -725,34 +729,39 @@
 "Error: %s"
 msgstr "Kunne ikke starte.\nForsikre deg om at Ring-nissen (dring) kjører.\nFeil: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Feil med ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Vis Ring"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Innkommende samtale"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Vis"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Aksepter"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s sier:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Avslå"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Avslå"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -778,24 +787,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Dette er en ødeleggende operasjon. Er du sikker på at du vil slette all din sludre- og samtale-historikk?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "Velg nedlastingsmappe"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -808,15 +817,15 @@
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Dårlig passord"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Nettverksfeil, prøv på nytt"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Kunne ikke igangsette eksportering til Ring, prøv igjen"
 
@@ -826,7 +835,7 @@
 msgid "Change password"
 msgstr "Endre passord"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Lagre fil"
@@ -889,11 +898,11 @@
 msgid "Voicemail number"
 msgstr "Talepostkassenummer"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -917,7 +926,7 @@
 msgid "Open Avatar Image"
 msgstr "Åpne avatarbilde"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Åpne"
 
@@ -929,9 +938,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "\"In varietate concordia\"\nbygd den %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -939,27 +948,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "GNOME-klienten for Ring.\nRing er fri programvare for universell kommunikasjon som respekterer privatlivets fred for dets brukere."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "utfør samtale"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "åpne sludring"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Innkommende samtale"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1029,7 +1062,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-klient for Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Passordene er ikke like"
 
@@ -1057,7 +1090,7 @@
 msgid "Ring ID QR code"
 msgstr "QR-kode for RingID"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Send fil"
 
@@ -1067,7 +1100,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
@@ -1108,34 +1141,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Tilkoblet"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/nl_BE.po ring-20180816.2.e26b79f~ds1/client-gnome/po/nl_BE.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/nl_BE.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/nl_BE.po	2018-08-16 15:09:41.000000000 +0000
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/savoirfairelinux/ring/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -57,7 +57,7 @@
 #: ui/newaccountsettingsview.ui:876 src/accountmigrationview.cpp:176
 #: src/newaccountsettingsview.cpp:963
 msgid "Delete account"
-msgstr ""
+msgstr "Account verwijderen"
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
@@ -132,44 +132,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Welkom bij"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Ring-account aanmaken"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Ne Ring-account aanmaken (voor nieuwe gebruikers)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Dit apparaat aan nen account koppelen"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Dit apparaat koppelen aan ne Ring-account aangemaakt op een ander apparaat"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Dit apparaat aan nen bestaanden account koppelen"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -180,83 +180,83 @@
 "from an archive."
 msgstr "Voor dit apparaat aan nen anderen account te koppelen hebd ge twee mogelijkheden. Ge kund uwen account importeren uit den DHT, maar eerst moet g’een pincode verkrijgen. Ga’ voor de pincode te genereren naar d’accountbeheerinstellingen van een vorig apparaat, kiesd de Ring-account die ge wild gebruiken en selecteerd ‘Een ander apparaat aan dezen account koppelen’. Ge ga’ de pincode krijgen die ge nodig hebd voor dit proces te voltooien. De pincode is slechts 10 minuten geldig. Ge kund uwen account ook rechtstreeks uit een archiefbestand importeren."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Voerd uw pincode in:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Of importeerd een bestand:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Voerd uw paswoord in:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Vorige"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Volgende"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profiel"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Account"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "Als ge dit aanvinkt ga’ ge nen unieke gebruikersnaam op het Ring-netwerk registreren. Andere personen kunnen deze gebruikersnaam gebruiken voor u te bellen, ipv uwe 40 tekens lange Ring-ID."
 
-#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Dit paswoord word gebruikt voor uw accountgegevens te versleutelen en nieuwe apparaten aan uwen account te koppelen."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Bevestigd paswoord"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Uwe Ring-account word aangemaakt…"
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Gebruikersnaam word geregistreerd…"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Dit kan enkele minuten duren."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Uwe Ring-account word opg’haald…"
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Fout bij aanmaken/laden van account."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "Oké"
@@ -282,42 +282,46 @@
 msgstr "Meldingen inschakelen voor inkomende oproepen."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Meldingen inschakelen voor nieuwe berichten."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Afbeeldingen en video’s in babbelvenster tonen."
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Een nummer in de zoekregel invoeren zal ne nieuwen oproep plaatsen."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "Downloadmap:"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Gesprek rechts weergeven."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Gesprek onderaan weergeven."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Geschiedenisinstellingen"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Geschiedenis bewaren voor (dagen):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(kiesd 0 voor onbeperkte geschiedenis)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Geschiedenis wissen"
 
@@ -333,7 +337,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -430,13 +434,13 @@
 
 #: ui/newaccountsettingsview.ui:460
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Account exporteren"
 
@@ -475,7 +479,7 @@
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
-msgstr ""
+msgstr "G’avanceerde instellingen"
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
@@ -511,7 +515,7 @@
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
-msgstr ""
+msgstr "Bootstrap"
 
 #: ui/newaccountsettingsview.ui:1514
 msgid "Encrypt media streams (SRTP)"
@@ -571,7 +575,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "Beveiliging"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -587,7 +591,7 @@
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
-msgstr ""
+msgstr "UPnP"
 
 #: ui/newaccountsettingsview.ui:2173
 msgid "Use TURN"
@@ -631,7 +635,7 @@
 
 #: ui/newaccountsettingsview.ui:2560
 msgid "Video codecs"
-msgstr ""
+msgstr "Videocodecs"
 
 #: ui/newaccountsettingsview.ui:2623
 msgid "Enable video"
@@ -639,7 +643,7 @@
 
 #: ui/newaccountsettingsview.ui:2650
 msgid "Audio codecs"
-msgstr ""
+msgstr "Audiocodecs"
 
 #: ui/newaccountsettingsview.ui:2720
 msgid "SDP Session Negotiation (ICE Fallback)"
@@ -717,7 +721,7 @@
 msgid "Set selection as image"
 msgstr "Selectie instellen als afbeelding"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -725,34 +729,39 @@
 "Error: %s"
 msgstr "Kan nie initialiseren.\nZorgd da’ de Ring-daemon (dring) word uitgevoerd.\nFout: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring-fout"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Ring tonen"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Inkomende oproep"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Tonen"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Aanvaarden"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s schrijfd:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Afwijzen"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Weigeren"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -778,24 +787,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Dit is een destructieve bewerking. Zijde zeker da’ g’uw volledige gespreks- en oproepgeschiedenis wild wissen?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "Kiesd downloadmap"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "Op_slaan"
 
@@ -808,15 +817,15 @@
 msgid "Contacts"
 msgstr "Contacten"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Slecht paswoord"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Netwerkfout, probeerd het opnieuw"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Kon export naar de Ring nie initialiseren, probeerd het opnieuw"
 
@@ -826,7 +835,7 @@
 msgid "Change password"
 msgstr "Paswoord wijzigen"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Bestand opslaan"
@@ -889,11 +898,11 @@
 msgid "Voicemail number"
 msgstr "Voicemailnummer"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -917,7 +926,7 @@
 msgid "Open Avatar Image"
 msgstr "Avatarbestand openen"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Openen"
 
@@ -929,9 +938,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "‘In varietate concordia’\ngebouwd op %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -939,27 +948,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Den GNOME-cliënt voor Ring.\nRing is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigd."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "oproep plaatsen"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "gesprek openen"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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 "Zoekt contacten of voerd een nummer in"
 
+#: src/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Inkomende oproep"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1029,7 +1062,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-cliënt voor Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Paswoorden komen nie overeen"
 
@@ -1057,7 +1090,7 @@
 msgid "Ring ID QR code"
 msgstr "Ring-ID-QR-code"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Bestand versturen"
 
@@ -1067,7 +1100,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
@@ -1108,34 +1141,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
-msgstr ""
+msgstr "Onbekende fout"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
-msgstr ""
+msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
-msgstr ""
+msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/nl_NL.po ring-20180816.2.e26b79f~ds1/client-gnome/po/nl_NL.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/nl_NL.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/nl_NL.po	2018-08-16 15:09:41.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/savoirfairelinux/ring/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -131,44 +131,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -179,83 +179,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -281,42 +281,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -332,7 +336,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -435,7 +439,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -570,7 +574,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "Beveiliging"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -716,7 +720,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -724,33 +728,38 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
@@ -777,24 +786,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -807,15 +816,15 @@
 msgid "Contacts"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -825,7 +834,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -888,11 +897,11 @@
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -916,7 +925,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -928,7 +937,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -938,27 +947,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1061,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1056,7 +1089,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1066,7 +1099,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1107,34 +1140,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/nl.po ring-20180816.2.e26b79f~ds1/client-gnome/po/nl.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/nl.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/nl.po	2018-08-16 15:09:41.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Niels van Duijkeren <nielsvanduijkeren@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/savoirfairelinux/ring/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -133,44 +133,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Welkom bij"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Ring-account aanmaken"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Een Ring-account aanmaken (voor nieuwe gebruikers)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Dit apparaat aan een account koppelen"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Dit apparaat koppelen aan een Ring-account aangemaakt op een ander apparaat"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Dit apparaat aan een bestaande account koppelen"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -181,83 +181,83 @@
 "from an archive."
 msgstr "Om dit apparaat aan een andere account te koppelen heb je twee mogelijkheden. Je kan je account importeren uit de DHT, maar eerst moet je 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. Je kan je account ook rechtstreeks uit een archiefbestand importeren."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Voer je pincode in:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Of importeer een bestand:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Voer je wachtwoord in:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Vorige"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Volgende"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profiel"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Account"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Dit wachtwoord wordt gebruikt om je accountgegevens te versleutelen en nieuwe apparaten aan je account te koppelen."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Bevestig wachtwoord"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Je Ring-account wordt aangemaakt…"
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Gebruikersnaam wordt geregistreerd…"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Dit kan enkele minuten duren."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Je Ring-account wordt opgehaald…"
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Fout bij aanmaken/laden van account."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "Oké"
@@ -283,42 +283,46 @@
 msgstr "Meldingen inschakelen voor inkomende oproepen."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Meldingen inschakelen voor nieuwe berichten."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Afbeeldingen en video's in chatvenster tonen."
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Een nummer in de zoekregel invoeren zal een nieuwe oproep plaatsen."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "Downloadmap:"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Gesprek rechts weergeven."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Gesprek onderaan weergeven."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Geschiedenisinstellingen"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Geschiedenis bewaren voor (dagen):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(kies 0 voor onbeperkte geschiedenis)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Geschiedenis wissen"
 
@@ -334,7 +338,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -437,7 +441,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Account exporteren"
 
@@ -718,7 +722,7 @@
 msgid "Set selection as image"
 msgstr "Selectie instellen als afbeelding"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -726,34 +730,39 @@
 "Error: %s"
 msgstr "Kan niet initialiseren.\nZorg dat de Ring-daemon (dring) wordt uitgevoerd.\nFout: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring-fout"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Ring tonen"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Inkomende oproep"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Aanvaarden"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Tonen"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Afwijzen"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s schrijft:"
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Weigeren"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -779,24 +788,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Dit is een destructieve bewerking. Weet je zeker dat je je volledige gespreks- en oproepgeschiedenis wil wissen?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "Kies downloadmap"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "Op_slaan"
 
@@ -809,15 +818,15 @@
 msgid "Contacts"
 msgstr "Contacten"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Slecht wachtwoord"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Netwerkfout, probeer het opnieuw"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Kon export naar de Ring niet initialiseren, probeer het opnieuw"
 
@@ -827,7 +836,7 @@
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Bestand opslaan"
@@ -890,11 +899,11 @@
 msgid "Voicemail number"
 msgstr "Voicemailnummer"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -918,7 +927,7 @@
 msgid "Open Avatar Image"
 msgstr "Avatarbestand openen"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Openen"
 
@@ -930,9 +939,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "‘In varietate concordia’\ngebouwd op %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -940,27 +949,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "De GNOME-cliënt voor Ring.\nRing is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "oproep plaatsen"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "gesprek openen"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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 voer een nummer in"
 
+#: src/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Inkomende oproep"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1030,7 +1063,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-cliënt voor Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Wachtwoorden komen niet overeen"
 
@@ -1058,7 +1091,7 @@
 msgid "Ring ID QR code"
 msgstr "Ring-ID-QR-code"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Bestand versturen"
 
@@ -1068,7 +1101,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
@@ -1109,34 +1142,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/pl.po ring-20180816.2.e26b79f~ds1/client-gnome/po/pl.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/pl.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/pl.po	2018-08-16 15:09:41.000000000 +0000
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adam Smith <grzybowawspulnota@cock.li>, 2018
 # Caspar Cedro <casparcedro96@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Karol Bieńkowski <karlossss1996@gmail.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-08-02 14:57+0000\n"
+"Last-Translator: Adam Smith <grzybowawspulnota@cock.li>\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"
@@ -28,7 +29,7 @@
 
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
-msgstr ""
+msgstr "Wymagana migracja konta"
 
 #: ui/accountmigrationview.ui:31
 msgid "This account is malformed, please enter your password"
@@ -42,7 +43,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -72,7 +73,7 @@
 
 #: ui/currentcallview.ui:275
 msgid "Toggle transfer"
-msgstr ""
+msgstr "Włącz/wyłącz transfer"
 
 #: ui/currentcallview.ui:294
 msgid "Toggle hold"
@@ -97,7 +98,7 @@
 
 #: ui/currentcallview.ui:369
 msgid "Toggle recording"
-msgstr ""
+msgstr "Włącz/wyłącz nagrywanie"
 
 #: ui/currentcallview.ui:372 ui/currentcallview.ui:501
 msgid "Record"
@@ -105,11 +106,11 @@
 
 #: ui/currentcallview.ui:393
 msgid "Adjust outgoing video quality"
-msgstr ""
+msgstr "Dostosuj jakość wychodzącego obrazu"
 
 #: ui/currentcallview.ui:398 ui/currentcallview.ui:492
 msgid "Video quality"
-msgstr ""
+msgstr "Jakość obrazu"
 
 #: ui/currentcallview.ui:417
 msgid "Toggle show chat"
@@ -131,44 +132,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
-msgstr ""
+msgstr "Witaj!"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Połącz to urządzenie z kontem"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -179,83 +180,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Następne"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Konto"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Potwierdź hasło"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Generowanie twojego konta Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -281,42 +282,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Pokaż czat po prawej stronie."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Pokaż czat na dole."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Ustawienia Historii"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Przechowaj historię do (dni):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(Ustaw na 0 dla nieograniczonej historii)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Usuń całą historię"
 
@@ -332,7 +337,7 @@
 msgid "Media"
 msgstr "Multimedia"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Ustawienia"
 
@@ -435,7 +440,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Wyeksportuj konto"
 
@@ -716,7 +721,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -724,34 +729,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Połączenie przychodzące"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Pokaż"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Akceptuj"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s mowi:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Odmów"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Odrzuć"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -777,24 +787,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -807,15 +817,15 @@
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -825,7 +835,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Zapisz plik"
@@ -888,11 +898,11 @@
 msgid "Voicemail number"
 msgstr "Numer poczty głosowej"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -916,7 +926,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -928,7 +938,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -938,27 +948,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Połączenie przychodzące"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1062,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Klient GNOME dla Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1056,7 +1090,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1066,7 +1100,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatycznie"
@@ -1107,34 +1141,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/pt_BR.po ring-20180816.2.e26b79f~ds1/client-gnome/po/pt_BR.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/pt_BR.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/pt_BR.po	2018-08-16 15:09:41.000000000 +0000
@@ -7,6 +7,7 @@
 # Gabriel Moura <gabriel.all@yandex.com>, 2016
 # Gustavo H. M. Silva <gustavohmsilva@tuta.io>, 2016
 # Gustavo H. M. Silva <gustavohmsilva@tuta.io>, 2017
+# 58488fdf1f53566f81eaccfc864e95ce, 2018
 # Keven de Oliveira <keven@zenbackup.com.br>, 2015
 # Marcus Vinicius Lemes de Oliveira <mlemes@live.com>, 2016
 # Nícolas Wildner <nicolasgaucho@gmail.com>, 2015
@@ -19,9 +20,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-08-04 17:08+0000\n"
+"Last-Translator: The Cat\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"
@@ -43,7 +44,7 @@
 
 #: ui/accountmigrationview.ui:31
 msgid "This account is malformed, please enter your password"
-msgstr ""
+msgstr "Esta conta está incorreta, digite sua senha"
 
 #: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:620
 msgid "Alias"
@@ -51,9 +52,9 @@
 
 #: ui/accountmigrationview.ui:126
 msgid "Ring ID"
-msgstr ""
+msgstr "ID Ring"
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -71,7 +72,7 @@
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
-msgstr ""
+msgstr "Falha na migração. Senha incorreta?"
 
 #: ui/currentcallview.ui:251
 msgid "End this call"
@@ -142,44 +143,44 @@
 msgid "Transfer to"
 msgstr "Transferir para"
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Bem-vindo à"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Criar conta Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Criar nova conta Ring (para novos usuários)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Associar este dispositivo a uma conta"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Associar estes dispositivos à uma conta Ring criada em outro dispositivo."
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
-msgstr ""
+msgstr "Avançado..."
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
-msgstr ""
+msgstr "Adicionar uma nova conta SIP"
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Associar este dispositivo à uma conta existente"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -190,83 +191,83 @@
 "from an archive."
 msgstr "Para conectar estes dispositivo a outra conta, você tem duas opções. Você pode importar sua conta do DHT, mas primeiro, você precisará obter um código PIN. Para gerar um código PIN, vá no gerenciamento de configurações da conta do seu outro dispositivo, escolha a conta Ring que deseja usar e selecione \"Conectar outro dispositivo nesta conta\" e você irá receber o PIN necessário para completar este formulário. O PIN é válido por apenas 10 minutos. Ou, você pode importar sua conta diretamente a partir de um backup."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Entre o seu PIN:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Ou importe de arquivo:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Entre sua senha:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Próximo"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Perfil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Conta"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
-msgstr ""
+msgstr "Registrar nome de usuário"
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Esta senha irá ser usada para encriptar os dados da sua conta e para ligar novos dispositivos a esta conta."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Confirmar senha"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Criando sua conta Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Registrando nome de usuário..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Isso pode levar alguns minutos."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Recuperando sua conta Ring..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Erro ao criar/carregar conta."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -292,42 +293,46 @@
 msgstr "Habilitar notificações para chamadas recebidas."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr "Ativar notificações para solicitações pendentes."
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Habilitar notificações para novas mensagens no chat."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Exibir imagens e vídeos na janela do chat."
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Entrar um numero na busca iniciará uma nova chamada."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "Pasta de downloads:"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Mostre o bate-papo na direita"
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Mostre o bate-papo na parte inferior."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Configurações de histórico"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Manter histórico por (dias):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(configure 0 para histórico ilimitado)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Limpar histórico"
 
@@ -343,7 +348,7 @@
 msgid "Media"
 msgstr "Mídia"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Configurações"
 
@@ -444,19 +449,19 @@
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
-msgstr ""
+msgstr "Clique para mudar a senha"
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Exportar conta"
 
 #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:908
 msgid "Enable account"
-msgstr ""
+msgstr "Ativar conta"
 
 #: ui/newaccountsettingsview.ui:697
 msgid "SIP server"
-msgstr ""
+msgstr "Servidor SIP"
 
 #: ui/newaccountsettingsview.ui:781
 msgid "password"
@@ -469,7 +474,7 @@
 
 #: ui/newaccountsettingsview.ui:848
 msgid "Voicemail"
-msgstr ""
+msgstr "Correio de voz"
 
 #: ui/newaccountsettingsview.ui:959
 msgid "Known devices linked to this Ring account"
@@ -477,11 +482,11 @@
 
 #: ui/newaccountsettingsview.ui:967
 msgid "Link another device"
-msgstr ""
+msgstr "Associar outro dispositivo"
 
 #: ui/newaccountsettingsview.ui:1032
 msgid "Banned contacts"
-msgstr ""
+msgstr "Contatos banidos"
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
@@ -489,27 +494,27 @@
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
-msgstr ""
+msgstr "Configurações gerais"
 
 #: ui/newaccountsettingsview.ui:1146
 msgid "Call settings"
-msgstr ""
+msgstr "Configurações de chamada"
 
 #: ui/newaccountsettingsview.ui:1184
 msgid "Allow call from untrusted peers"
-msgstr ""
+msgstr "Permitir chamadas de usuários desconhecidos"
 
 #: ui/newaccountsettingsview.ui:1219
 msgid "Auto answer calls"
-msgstr ""
+msgstr "Atender chamadas automaticamente"
 
 #: ui/newaccountsettingsview.ui:1255
 msgid "Custom ringtone"
-msgstr ""
+msgstr "Toque padrão"
 
 #: ui/newaccountsettingsview.ui:1299
 msgid "Name server"
-msgstr ""
+msgstr "Nome do servidor"
 
 #: ui/newaccountsettingsview.ui:1336 ui/newaccountsettingsview.ui:2489
 msgid "Address"
@@ -517,7 +522,7 @@
 
 #: ui/newaccountsettingsview.ui:1370
 msgid "OpenDHT configuration"
-msgstr ""
+msgstr "Configuração do OpenDHT"
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
@@ -529,7 +534,7 @@
 
 #: ui/newaccountsettingsview.ui:1549
 msgid "Enable SDES for key exchange protocol"
-msgstr ""
+msgstr "Ativar SDES para protocolo de troca de chaves"
 
 #: ui/newaccountsettingsview.ui:1585
 msgid "Fallback on RTP on encryption failure"
@@ -585,15 +590,15 @@
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
-msgstr ""
+msgstr "Conectividade"
 
 #: ui/newaccountsettingsview.ui:2065
 msgid "Registration expire timeout (seconds)"
-msgstr ""
+msgstr "Tempo de expiração de registro (segundos)"
 
 #: ui/newaccountsettingsview.ui:2102
 msgid "Network interface"
-msgstr ""
+msgstr "Interface de Rede"
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
@@ -605,19 +610,19 @@
 
 #: ui/newaccountsettingsview.ui:2208
 msgid "(TURN) address"
-msgstr ""
+msgstr "Endereço (TURN)"
 
 #: ui/newaccountsettingsview.ui:2243
 msgid "(TURN) username"
-msgstr ""
+msgstr "Nome de usuário (TURN)"
 
 #: ui/newaccountsettingsview.ui:2277
 msgid "(TURN) password"
-msgstr ""
+msgstr "Senha (TURN)"
 
 #: ui/newaccountsettingsview.ui:2314
 msgid "(TURN) realm"
-msgstr ""
+msgstr "Domínio (TURN)"
 
 #: ui/newaccountsettingsview.ui:2348
 msgid "Use STUN"
@@ -625,15 +630,15 @@
 
 #: ui/newaccountsettingsview.ui:2383
 msgid "(STUN) address"
-msgstr ""
+msgstr "Endereço (STUN)"
 
 #: ui/newaccountsettingsview.ui:2416
 msgid "Published address"
-msgstr ""
+msgstr "Endereço publicado"
 
 #: ui/newaccountsettingsview.ui:2453
 msgid "Use custom address and port"
-msgstr ""
+msgstr "Use endereço e porta personalizados"
 
 #: ui/newaccountsettingsview.ui:2524
 msgid "Port"
@@ -657,27 +662,27 @@
 
 #: ui/newaccountsettingsview.ui:2732
 msgid "Only used during SDP negotiation in case ICE is not supported."
-msgstr ""
+msgstr "Apenas utilizadas durante uma negociação de sessão SDP, caso ICE não seja suportado."
 
 #: ui/newaccountsettingsview.ui:2766
 msgid "Audio RTP Min port"
-msgstr ""
+msgstr "Porta mínima de áudio RTP"
 
 #: ui/newaccountsettingsview.ui:2801
 msgid "Audio RTP Max port"
-msgstr ""
+msgstr "Porta máxima de áudio RTP"
 
 #: ui/newaccountsettingsview.ui:2836
 msgid "Video RTP Min port"
-msgstr ""
+msgstr "Porta mínima de vídeo RTP"
 
 #: ui/newaccountsettingsview.ui:2871
 msgid "Video RTP Max port"
-msgstr ""
+msgstr "Porta máxima de vídeo RTP"
 
 #: ui/usernameregistrationbox.ui:28
 msgid "register username"
-msgstr ""
+msgstr "Registrar nome de usuário"
 
 #: ui/chatview.ui:19 ui/chatview.ui:22
 msgid "Hide chat view"
@@ -727,7 +732,7 @@
 msgid "Set selection as image"
 msgstr "Configurar seleção como imagem"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -735,38 +740,43 @@
 "Error: %s"
 msgstr "Não foi possível iniciar.\nCertifique-se que o processo Ring (dring) está sendo executado.\nErro: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Erro do Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Exibir Ring"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Sair"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Chamada recebida"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr "Conversa em curso"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Exibir"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Aceitar"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s diz:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Recusar"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Rejeitar"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
-msgstr ""
+msgstr "Registrar esse nome de usuário no servidor de nomes"
 
 #: src/usernameregistrationbox.cpp:173
 msgid "Username already taken"
@@ -778,34 +788,34 @@
 
 #: src/usernameregistrationbox.cpp:194
 msgid "Lookup unavailable, check your network connection"
-msgstr ""
+msgstr "Pesquisa indisponível, verifique sua conexão de rede"
 
 #: src/usernameregistrationbox.cpp:274
 msgid "Performing lookup..."
-msgstr ""
+msgstr "Realizando pesquisa..."
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress..."
-msgstr ""
+msgstr "Registro em andamento..."
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Esta é uma operação destrutiva. Você tem certeza que quer apagar todo o seu histórico de conversas e ligações?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "Escolha a pasta de arquivos baixados"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "_Salvar"
 
@@ -818,15 +828,15 @@
 msgid "Contacts"
 msgstr "Contatos"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Senha incorreta"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Erro de rede, tente novamente"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Não foi possível iniciar exportação para o Ring, tente novamente"
 
@@ -836,7 +846,7 @@
 msgid "Change password"
 msgstr "Mudar senha"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Salvar arquivo"
@@ -899,11 +909,11 @@
 msgid "Voicemail number"
 msgstr "Número do correio de voz"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr "Erro: senha incorreta!"
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr "Erro: dispositivo desconhecido!"
 
@@ -927,7 +937,7 @@
 msgid "Open Avatar Image"
 msgstr "Abrir Avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -939,9 +949,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "\"In varietate concordia\"\ndesenvolvido em %.25s"
+msgstr "\"Viva Livre ou Morra\"\ndesenvolvido em %.25s"
 
 #: src/dialogs.c:137
 msgid ""
@@ -949,27 +959,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "O cliente GNOME para GNU Ring.\nGNU Ring é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
-msgstr ""
+msgstr "Adicionar conta..."
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "fazer ligação"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "abrir chat"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr "Deixar a página de configurações"
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr "está chamando você!"
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Chamada recebida"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr "Nova requisição de"
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr "Confiar na requisição"
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr "Nova mensagem"
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1039,7 +1073,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- cliente GNOME para o Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Senhas não condizentes"
 
@@ -1067,7 +1101,7 @@
 msgid "Ring ID QR code"
 msgstr "QR code do seu ID Ring"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Enviar arquivo"
 
@@ -1075,28 +1109,28 @@
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
-msgstr ""
+msgstr "Atenção! Esta ação irá remover esta conta deste dispositivo!\nNota: esta ação não pode ser desfeita. Além disso, seu nome registrado pode ser perdido!"
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automático"
 
 #: src/newaccountsettingsview.cpp:679
 msgid "Edit name"
-msgstr ""
+msgstr "Editar nome"
 
 #: src/newaccountsettingsview.cpp:774
 msgid "Unban"
-msgstr ""
+msgstr "Cancelar banimento"
 
 #: src/newaccountsettingsview.cpp:810
 msgid "New password and its confirmation are different!"
-msgstr ""
+msgstr "A nova senha e a sua confirmação não coincidem!"
 
 #: src/newaccountsettingsview.cpp:821
 msgid "Incorrect password!"
-msgstr ""
+msgstr "Senha incorreta!"
 
 #: src/newaccountsettingsview.cpp:858
 msgid "Note: this will change the password only on this device."
@@ -1112,40 +1146,40 @@
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Account exported!"
-msgstr ""
+msgstr "Conta exportada!"
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Export account failure."
-msgstr ""
+msgstr "Falha ao exportar a conta."
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
-msgstr ""
+msgstr "Iniciando..."
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
-msgstr ""
+msgstr "Conectando..."
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
-msgstr ""
+msgstr "Status desconhecido"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
-msgstr ""
+msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
-msgstr ""
+msgstr "Nenhuma senha definida"
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/pt.po ring-20180816.2.e26b79f~ds1/client-gnome/po/pt.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/pt.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/pt.po	2018-08-16 15:09:41.000000000 +0000
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Cornélio Petersen Júnior <corneliopj@gmail.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Ricardo Cardante <inactive+rcardante@transifex.com>\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"
@@ -43,7 +43,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -132,44 +132,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -180,83 +180,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Próximo"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Usuário"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Gerando sua conta Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -282,42 +282,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Exibir a conversa à direita."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Exibir a conversa embaixo."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Manter histórico por (dias):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(0 indica ilimitado)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Limpar histórico"
 
@@ -333,7 +337,7 @@
 msgid "Media"
 msgstr "Mídia"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Configurações"
 
@@ -436,7 +440,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -717,7 +721,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -725,34 +729,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Chamada entrante"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s disse:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Recusar"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -778,24 +787,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -808,15 +817,15 @@
 msgid "Contacts"
 msgstr "Contatos"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -826,7 +835,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -889,11 +898,11 @@
 msgid "Voicemail number"
 msgstr "Número do correio de voz"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -917,7 +926,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -929,7 +938,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -939,27 +948,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Chamada entrante"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1029,7 +1062,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Cliente GNOME para Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1057,7 +1090,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1067,7 +1100,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1108,34 +1141,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/ring-client-gnome.pot ring-20180816.2.e26b79f~ds1/client-gnome/po/ring-client-gnome.pot
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/ring-client-gnome.pot	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/ring-client-gnome.pot	2018-08-16 15:09:41.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,7 +41,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -130,44 +130,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -178,83 +178,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -280,42 +280,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -331,7 +335,7 @@
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr ""
 
@@ -434,7 +438,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -715,7 +719,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -723,33 +727,38 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
@@ -776,24 +785,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your "
 "chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -806,15 +815,15 @@
 msgid "Contacts"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -824,7 +833,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -887,11 +896,11 @@
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -915,7 +924,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -927,7 +936,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -938,27 +947,51 @@
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1061,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1056,7 +1089,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1066,7 +1099,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1107,34 +1140,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/ro.po ring-20180816.2.e26b79f~ds1/client-gnome/po/ro.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/ro.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/ro.po	2018-08-16 15:09:41.000000000 +0000
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Urmanschi Mihail <urmanschi.mihail@gmail.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Vitalie Lisnic <lisnic.v@gmail.com>\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"
@@ -41,7 +41,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -130,44 +130,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -178,83 +178,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Nume de utilizator"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Confirmă parola"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -280,42 +280,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr ""
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr ""
 
@@ -331,7 +335,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Setari"
 
@@ -434,7 +438,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -715,7 +719,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -723,35 +727,40 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Apel de intrare"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
 msgstr ""
 
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Refuză"
+
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
 msgstr ""
@@ -776,24 +785,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -806,15 +815,15 @@
 msgid "Contacts"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -824,7 +833,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -887,11 +896,11 @@
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -915,7 +924,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -927,7 +936,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -937,27 +946,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Apel de intrare"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1027,7 +1060,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1055,7 +1088,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1065,7 +1098,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1106,34 +1139,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/ru.po ring-20180816.2.e26b79f~ds1/client-gnome/po/ru.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/ru.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/ru.po	2018-08-16 15:09:41.000000000 +0000
@@ -9,7 +9,7 @@
 # Konstantin, 2016
 # Marat Gubaidullin <marat.gubaidullin@savoirfairelinux.com>, 2015
 # Natalia <sonaux@gmail.com>, 2015
-# ruwebstyle <ruwebstyle@ya.ru>, 2015
+# ruwebstyle, 2015
 # Viktor Filinkov <bruteforce@sigil.tk>, 2015
 # Vladimir Stoiakin, 2018
 # Yaroslav Molochko <onorua@gmail.com>, 2015
@@ -22,9 +22,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Андрей Шевчук <andrei@shvchk.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-08-09 16:01+0000\n"
+"Last-Translator: Vladimir Stoiakin\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"
@@ -46,7 +46,7 @@
 
 #: ui/accountmigrationview.ui:31
 msgid "This account is malformed, please enter your password"
-msgstr ""
+msgstr "Данный аккаунт имеет некорректный формат. Пожалуйста, введите ваш пароль"
 
 #: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:620
 msgid "Alias"
@@ -54,9 +54,9 @@
 
 #: ui/accountmigrationview.ui:126
 msgid "Ring ID"
-msgstr ""
+msgstr "RingID"
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -74,7 +74,7 @@
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
-msgstr ""
+msgstr "Ошибка переноса, неверный пароль?"
 
 #: ui/currentcallview.ui:251
 msgid "End this call"
@@ -145,44 +145,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Добро пожаловать в"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Создать аккаунт Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Создать новый аккаунт Ring (для новых пользователей)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Привязать это устройство к аккаунту"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Привязать это устройство к аккаунту Ring, созданному на другом устройстве"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
-msgstr ""
+msgstr "Дополнительно…"
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
-msgstr ""
+msgstr "Создать новый аккаунт SIP"
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Привязать это устройство к существующему аккаунту"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -193,83 +193,83 @@
 "from an archive."
 msgstr "Чтобы привязать это устройство к другому аккаунту, у вас есть две возможности. Первая состоит в том, чтобы передать данные вашего аккаунта через DHT. Для этого необходим PIN-код, получить который можно в настройках управления акккаунтом предыдущего устройства. Выберите необходимый аккаунт и нажмите \"Привязать другое устройство к этому аккаунту\". Полученный PIN-код будет действителен в течение 10 минут. Либо, вы можете импортировать ваш аккаунт напрямую из архива."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Введите ваш PIN:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Или импортируйте из файла:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Введите ваш пароль:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Назад"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Далее"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Профиль"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Аккаунт"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
-msgstr ""
+msgstr "Зарегистрировать имя пользователя"
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "Отмечая это, вы зарегистрируете уникальное имя в сети Ring. Другие пользователи смогут использовать его для связи с вами вместо RingID, который 40 символов длиной."
 
-#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Этот пароль будет использован для шифрования данных вашего аккаунта и для привязки новых устройств к вашему аккаунту."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Создание вашего аккаунта Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Регистрация имени пользователя…"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Это может занять несколько минут."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Загрузка вашего аккаунта Ring…"
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Ошибка создания/загрузки аккаунта."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -295,42 +295,46 @@
 msgstr "Включить уведомления о входящих звонках."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Включить уведомления о новых сообщениях чата."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Показывать изображения и видео в окне чата."
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Осуществлять звонок при вводе номера в области поиска."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "Папка для загрузок:"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Показать чат справа."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Показать чат снизу."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Настройки истории"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Хранить историю (дней):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(Поставьте 0 для неограниченного хранения)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Очистить историю"
 
@@ -340,13 +344,13 @@
 
 #: ui/ringmainwindow.ui:78
 msgid "General"
-msgstr "Общий"
+msgstr "Общие"
 
 #: ui/ringmainwindow.ui:93
 msgid "Media"
 msgstr "Медиа"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Настройки"
 
@@ -372,7 +376,7 @@
 
 #: ui/mediasettingsview.ui:64
 msgid "Output device:"
-msgstr "Устройство воспроизведения: "
+msgstr "Устройство для воспроизведения: "
 
 #: ui/mediasettingsview.ui:76
 msgid "Input device:"
@@ -447,19 +451,19 @@
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
-msgstr ""
+msgstr "Нажмите для изменения пароля"
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Экспортировать аккаунт"
 
 #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:908
 msgid "Enable account"
-msgstr ""
+msgstr "Включить аккаунт"
 
 #: ui/newaccountsettingsview.ui:697
 msgid "SIP server"
-msgstr ""
+msgstr "сервер SIP"
 
 #: ui/newaccountsettingsview.ui:781
 msgid "password"
@@ -472,7 +476,7 @@
 
 #: ui/newaccountsettingsview.ui:848
 msgid "Voicemail"
-msgstr ""
+msgstr "Голосовая почта"
 
 #: ui/newaccountsettingsview.ui:959
 msgid "Known devices linked to this Ring account"
@@ -480,11 +484,11 @@
 
 #: ui/newaccountsettingsview.ui:967
 msgid "Link another device"
-msgstr ""
+msgstr "Привязать другое устройство"
 
 #: ui/newaccountsettingsview.ui:1032
 msgid "Banned contacts"
-msgstr ""
+msgstr "Заблокированные контакты"
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
@@ -492,27 +496,27 @@
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
-msgstr ""
+msgstr "Основные настройки"
 
 #: ui/newaccountsettingsview.ui:1146
 msgid "Call settings"
-msgstr ""
+msgstr "Настройки вызовов"
 
 #: ui/newaccountsettingsview.ui:1184
 msgid "Allow call from untrusted peers"
-msgstr ""
+msgstr "Разрешить вызовы от недоверенных участников"
 
 #: ui/newaccountsettingsview.ui:1219
 msgid "Auto answer calls"
-msgstr ""
+msgstr "Автоматически принимать входящие вызовы"
 
 #: ui/newaccountsettingsview.ui:1255
 msgid "Custom ringtone"
-msgstr ""
+msgstr "Мелодия звонка"
 
 #: ui/newaccountsettingsview.ui:1299
 msgid "Name server"
-msgstr ""
+msgstr "Сервер имён"
 
 #: ui/newaccountsettingsview.ui:1336 ui/newaccountsettingsview.ui:2489
 msgid "Address"
@@ -520,7 +524,7 @@
 
 #: ui/newaccountsettingsview.ui:1370
 msgid "OpenDHT configuration"
-msgstr ""
+msgstr "Конфигурация OpenDHT"
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
@@ -532,7 +536,7 @@
 
 #: ui/newaccountsettingsview.ui:1549
 msgid "Enable SDES for key exchange protocol"
-msgstr ""
+msgstr "Разрешить SDES в протоколе обмена ключами"
 
 #: ui/newaccountsettingsview.ui:1585
 msgid "Fallback on RTP on encryption failure"
@@ -548,7 +552,7 @@
 
 #: ui/newaccountsettingsview.ui:1691
 msgid "User certificate"
-msgstr "Пользовательский сертификат"
+msgstr "Сертификат пользователя"
 
 #: ui/newaccountsettingsview.ui:1727
 msgid "Private key"
@@ -564,7 +568,7 @@
 
 #: ui/newaccountsettingsview.ui:1837
 msgid "Outgoing TLS server name"
-msgstr "Имя исходящего сервера TLS"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:1872
 msgid "Negotiation timeout (seconds)"
@@ -588,15 +592,15 @@
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
-msgstr ""
+msgstr "Связь"
 
 #: ui/newaccountsettingsview.ui:2065
 msgid "Registration expire timeout (seconds)"
-msgstr ""
+msgstr "Ожидание завершения регистрации (секунды)"
 
 #: ui/newaccountsettingsview.ui:2102
 msgid "Network interface"
-msgstr ""
+msgstr "Сетевой интерфейс"
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
@@ -608,19 +612,19 @@
 
 #: ui/newaccountsettingsview.ui:2208
 msgid "(TURN) address"
-msgstr ""
+msgstr "(TURN) адрес"
 
 #: ui/newaccountsettingsview.ui:2243
 msgid "(TURN) username"
-msgstr ""
+msgstr "(TURN) имя пользователя"
 
 #: ui/newaccountsettingsview.ui:2277
 msgid "(TURN) password"
-msgstr ""
+msgstr "(TURN) пароль"
 
 #: ui/newaccountsettingsview.ui:2314
 msgid "(TURN) realm"
-msgstr ""
+msgstr "(TURN) область"
 
 #: ui/newaccountsettingsview.ui:2348
 msgid "Use STUN"
@@ -628,15 +632,15 @@
 
 #: ui/newaccountsettingsview.ui:2383
 msgid "(STUN) address"
-msgstr ""
+msgstr "(STUN) адрес"
 
 #: ui/newaccountsettingsview.ui:2416
 msgid "Published address"
-msgstr ""
+msgstr "Публикуемый адрес"
 
 #: ui/newaccountsettingsview.ui:2453
 msgid "Use custom address and port"
-msgstr ""
+msgstr "Использовать указанные адрес и порт"
 
 #: ui/newaccountsettingsview.ui:2524
 msgid "Port"
@@ -660,27 +664,27 @@
 
 #: ui/newaccountsettingsview.ui:2732
 msgid "Only used during SDP negotiation in case ICE is not supported."
-msgstr ""
+msgstr "Используется только в сессии SDP в случае, если ICE не поддерживается."
 
 #: ui/newaccountsettingsview.ui:2766
 msgid "Audio RTP Min port"
-msgstr ""
+msgstr "Минимальный порт RTP для звука"
 
 #: ui/newaccountsettingsview.ui:2801
 msgid "Audio RTP Max port"
-msgstr ""
+msgstr "Максимальный порт RTP для звука"
 
 #: ui/newaccountsettingsview.ui:2836
 msgid "Video RTP Min port"
-msgstr ""
+msgstr "Минимальный порт RTP для видео"
 
 #: ui/newaccountsettingsview.ui:2871
 msgid "Video RTP Max port"
-msgstr ""
+msgstr "Максимальный порт RTP для видео"
 
 #: ui/usernameregistrationbox.ui:28
 msgid "register username"
-msgstr ""
+msgstr "Зарегистрировать имя пользователя"
 
 #: ui/chatview.ui:19 ui/chatview.ui:22
 msgid "Hide chat view"
@@ -730,46 +734,51 @@
 msgid "Set selection as image"
 msgstr "Установить выбранное в качестве изображения"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
 "Make sure the Ring daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Ошибка инициализации.\nУбедитесь, что демон Ring (dring) запущен.\nОшибка: %s"
+msgstr "Инициализация не выполнена.\nУбедитесь, что демон Ring (dring) запущен.\nОшибка: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ошибка Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Показать Ring"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Выход"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Входящий звонок"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Принять"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Показать"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Отказать"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s сказал:"
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Отклонить"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
-msgstr ""
+msgstr "Зарегистрировать это имя на сервере имён"
 
 #: src/usernameregistrationbox.cpp:173
 msgid "Username already taken"
@@ -781,34 +790,34 @@
 
 #: src/usernameregistrationbox.cpp:194
 msgid "Lookup unavailable, check your network connection"
-msgstr ""
+msgstr "Проверка занятости недоступна, проверьте сетевое соединение"
 
 #: src/usernameregistrationbox.cpp:274
 msgid "Performing lookup..."
-msgstr ""
+msgstr "Проверяется занятость…"
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress..."
-msgstr ""
+msgstr "Идёт регистрация…"
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Это разрушительная операция. Вы уверены, что хотите удалить всю вашу историю чатов и звонков?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "Выберите папку для загрузок"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "_Сохранить"
 
@@ -821,15 +830,15 @@
 msgid "Contacts"
 msgstr "Контакты"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Недопустимый пароль"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Ошибка сети, попробуйте снова"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Не удалось инициировать экспорт в Ring, попробуйте снова"
 
@@ -839,7 +848,7 @@
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Сохранить файл"
@@ -852,7 +861,7 @@
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
-msgstr ""
+msgstr "Предупреждение! Это действие отзовёт устройство!\nЗамечание: это действие невозможно отменить."
 
 #: src/accountgeneraltab.cpp:479 src/newaccountsettingsview.cpp:621
 msgid "Enter password to revoke device"
@@ -872,11 +881,11 @@
 
 #: src/accountgeneraltab.cpp:561
 msgid "Save name"
-msgstr ""
+msgstr "Сохранить имя"
 
 #: src/accountgeneraltab.cpp:561 src/newaccountsettingsview.cpp:679
 msgid "Revoke device"
-msgstr "Отозвать доступ устройства"
+msgstr "Отозвать устройство"
 
 #: src/accountgeneraltab.cpp:582 src/newaccountsettingsview.cpp:701
 msgid "Error when revoking device"
@@ -902,11 +911,11 @@
 msgid "Voicemail number"
 msgstr "Номер голосовой почты"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr "Ошибка: неверный пароль!"
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr "Ошибка: неизвестное устройство!"
 
@@ -930,7 +939,7 @@
 msgid "Open Avatar Image"
 msgstr "Открыть изображение аватара"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Открыть"
 
@@ -942,9 +951,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "\"In varietate concordia\"\nсобрано %.25s"
+msgstr "\"Live Free or Die\"\nсобрано %.25s"
 
 #: src/dialogs.c:137
 msgid ""
@@ -952,27 +961,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Клиент GNOME для Ring.\nRing — это свободная программа для связи, уважающая свободу и конфиденциальность пользователей."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
-msgstr ""
+msgstr "Добавить аккаунт…"
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "позвонить"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "открыть чат"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr "Выйти из настроек"
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr "звони́т вам!"
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Входящий звонок"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr "Новое сообщение"
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1040,9 +1073,9 @@
 
 #: src/ring_client_options.c:85
 msgid "- GNOME client for Ring"
-msgstr "GNOME клиент для Ring"
+msgstr "- клиент GNOME для Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Пароли не совпадают"
 
@@ -1070,7 +1103,7 @@
 msgid "Ring ID QR code"
 msgstr "Ring ID QR код"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Отправить файл"
 
@@ -1078,28 +1111,28 @@
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
-msgstr ""
+msgstr "Предупреждение! Это действие удалит данный аккаунт на данном устройстве!\nЗамечание: это действие невозможно отменить. Также вы можете потерять зарегистрированное имя!"
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Авто"
 
 #: src/newaccountsettingsview.cpp:679
 msgid "Edit name"
-msgstr ""
+msgstr "Редактировать имя"
 
 #: src/newaccountsettingsview.cpp:774
 msgid "Unban"
-msgstr ""
+msgstr "Разблокировать"
 
 #: src/newaccountsettingsview.cpp:810
 msgid "New password and its confirmation are different!"
-msgstr ""
+msgstr "Новый пароль и его подтверждение не совпадают!"
 
 #: src/newaccountsettingsview.cpp:821
 msgid "Incorrect password!"
-msgstr ""
+msgstr "Неверный пароль!"
 
 #: src/newaccountsettingsview.cpp:858
 msgid "Note: this will change the password only on this device."
@@ -1115,40 +1148,40 @@
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Account exported!"
-msgstr ""
+msgstr "Аккаунт экспортирован!"
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Export account failure."
-msgstr ""
+msgstr "Экспорт аккаунта не выполнен."
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
-msgstr ""
+msgstr "Инициализация…"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Не в сети"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
-msgstr ""
+msgstr "Соединение…"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "В сети"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
-msgstr ""
+msgstr "Неизвестный статус"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
-msgstr ""
+msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
-msgstr ""
+msgstr "пароль не установлен"
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/ru_RU.po ring-20180816.2.e26b79f~ds1/client-gnome/po/ru_RU.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/ru_RU.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/ru_RU.po	2018-08-16 15:09:41.000000000 +0000
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Still Swamp <still.swamp@gmail.com>, 2016
+# Vladimir Stoiakin, 2018
 # Pavel Klimenko <dzy4yzd@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Still Swamp <still.swamp@gmail.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-08-03 17:44+0000\n"
+"Last-Translator: Vladimir Stoiakin\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"
@@ -21,7 +22,7 @@
 
 #: ui/ringgearsmenu.ui:13
 msgid "_About"
-msgstr "_О продукте"
+msgstr "_О программе"
 
 #: ui/ringgearsmenu.ui:19
 msgid "_Quit"
@@ -43,7 +44,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -77,7 +78,7 @@
 
 #: ui/currentcallview.ui:294
 msgid "Toggle hold"
-msgstr "Переключение удержания"
+msgstr ""
 
 #: ui/currentcallview.ui:298 ui/currentcallview.ui:323
 #: ui/currentcallview.ui:465
@@ -86,11 +87,11 @@
 
 #: ui/currentcallview.ui:319
 msgid "Toggle mute audio"
-msgstr "Выключатель звука"
+msgstr ""
 
 #: ui/currentcallview.ui:344
 msgid "Toggle mute video"
-msgstr "Выключатель видео"
+msgstr ""
 
 #: ui/currentcallview.ui:348 ui/currentcallview.ui:456
 msgid "Mute video"
@@ -132,44 +133,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -180,83 +181,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Далее"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Профиль"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Учётная запись"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
-msgstr "Пользователь"
+msgstr "Имя пользователя"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
-msgstr "Подтвердите пароль"
+msgstr "Подтверждение пароля"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
-msgstr "Создать вашу учетную запись Ring"
+msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -282,42 +283,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
-msgstr "Чат справа."
+msgstr "Показывать чат справа."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
-msgstr "Чат внизу."
+msgstr "Показывать чат внизу."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
-msgstr "История настроек"
+msgstr "Настройки истории"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
-msgstr "Длительность хранения истории в днях:"
+msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(укажите 0 для неограниченного хранения)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Очистить историю"
 
@@ -333,13 +338,13 @@
 msgid "Media"
 msgstr "Медиа"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Настройки"
 
 #: ui/ringmainwindow.ui:265 ui/ringmainwindow.ui:272
 msgid "Conversations"
-msgstr "Беседы"
+msgstr "Разговоры"
 
 #: ui/ringmainwindow.ui:298 ui/ringmainwindow.ui:305
 msgid "Contact requests"
@@ -347,23 +352,23 @@
 
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
-msgstr "Звуковые настройки"
+msgstr "Настройки звука"
 
 #: ui/mediasettingsview.ui:40
 msgid "Audio manager:"
-msgstr "Управление звуком:"
+msgstr ""
 
 #: ui/mediasettingsview.ui:52
 msgid "Ringtone device:"
-msgstr "Устройство рингтона:"
+msgstr ""
 
 #: ui/mediasettingsview.ui:64
 msgid "Output device:"
-msgstr "Устройство вывода:"
+msgstr ""
 
 #: ui/mediasettingsview.ui:76
 msgid "Input device:"
-msgstr "Устройство ввода:"
+msgstr ""
 
 #: ui/mediasettingsview.ui:134
 msgid "Camera Settings"
@@ -383,7 +388,7 @@
 
 #: ui/mediasettingsview.ui:186
 msgid "Frame rate:"
-msgstr "Кадры:"
+msgstr "Частота кадров:"
 
 #: ui/mediasettingsview.ui:244
 msgid "Hardware Acceleration"
@@ -436,7 +441,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -531,7 +536,7 @@
 
 #: ui/newaccountsettingsview.ui:1655
 msgid "CA certificate"
-msgstr "CA сертификат"
+msgstr "Сертификат удостоверяющего центра"
 
 #: ui/newaccountsettingsview.ui:1691
 msgid "User certificate"
@@ -703,21 +708,21 @@
 
 #: ui/avatarmanipulation.ui:92 ui/avatarmanipulation.ui:125
 msgid "Take photo"
-msgstr "Фотографировать"
+msgstr ""
 
 #: ui/avatarmanipulation.ui:102
 msgid "Choose image from file"
-msgstr "Выбрать изображение из файлов"
+msgstr ""
 
 #: ui/avatarmanipulation.ui:135 ui/avatarmanipulation.ui:168
 msgid "Return"
-msgstr "Возврат"
+msgstr "Вернуться"
 
 #: ui/avatarmanipulation.ui:158
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -725,34 +730,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Входящий вызов"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Показать"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Принять"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s говорит:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Отклонить"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -778,45 +788,45 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
-msgstr "_Отменить"
+msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
 #: src/backends/edscontactbackend.cpp:193
 msgid "Unknown EDS addressbook"
-msgstr "Неизвестно ЭЦП адресной книги"
+msgstr ""
 
 #: src/backends/edscontactbackend.cpp:213
 msgctxt "Backend type"
 msgid "Contacts"
 msgstr "Контакты"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -826,7 +836,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Сохранить файл"
@@ -875,25 +885,25 @@
 
 #: src/accountgeneraltab.cpp:657
 msgid "auto-generating..."
-msgstr "Автогенерация..."
+msgstr "автогенерация..."
 
 #: src/accountgeneraltab.cpp:687
 msgid "Hostname"
-msgstr "Узел"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:720
 msgid "Show password"
-msgstr "Показать"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:736
 msgid "Voicemail number"
 msgstr "Номер голосовой почты"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -915,21 +925,21 @@
 
 #: src/avatarmanipulation.cpp:403
 msgid "Open Avatar Image"
-msgstr "Открыть аватар"
+msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Открыть"
 
 #: src/dialogs.c:53
 msgid "Working..."
-msgstr "Работаем..."
+msgstr ""
 
 #: src/dialogs.c:84
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -939,27 +949,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Входящий вызов"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1027,9 +1061,9 @@
 
 #: src/ring_client_options.c:85
 msgid "- GNOME client for Ring"
-msgstr " - GNOME клиент для Ring"
+msgstr " - клиент GNOME для Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1057,7 +1091,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1067,7 +1101,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Автоматически"
@@ -1108,34 +1142,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/sk_SK.po ring-20180816.2.e26b79f~ds1/client-gnome/po/sk_SK.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/sk_SK.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/sk_SK.po	2018-08-16 15:09:41.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/savoirfairelinux/ring/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -131,44 +131,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Zruš"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -179,83 +179,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Ďalej"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Účet"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "Ok"
@@ -281,42 +281,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Nastavenia historie"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr ""
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Vymaž celú historiu"
 
@@ -332,7 +336,7 @@
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Nastavenie"
 
@@ -435,7 +439,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -716,7 +720,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -724,33 +728,38 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
 msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
 msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
@@ -777,24 +786,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -807,15 +816,15 @@
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -825,7 +834,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr ""
@@ -888,11 +897,11 @@
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -916,7 +925,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -928,7 +937,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -938,27 +947,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1061,7 @@
 msgid "- GNOME client for Ring"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1056,7 +1089,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1066,7 +1099,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1107,34 +1140,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/sl.po ring-20180816.2.e26b79f~ds1/client-gnome/po/sl.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/sl.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/sl.po	2018-08-16 15:09:41.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Goran Kavrecic <goran.kavrecic@indea.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/savoirfairelinux/ring/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -131,44 +131,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Dobrodošli v"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Ustvari Ring račun"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Ustvari nov Ring račun (za nove uporabnike)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Poveži to napravo k računu"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Poveži to napravo k Ring računu ustvarjenem na drugi napravi"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Poveži to napravo k obstoječemu računu"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -179,83 +179,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Vnesi svoj PIN:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Vnesi svoje geslo:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Nazaj"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Naprej"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Račun"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Uporabnik"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Potrdi geslo"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Ustvarjam tvoj Ring račun..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Prijavljam uporabniško ime"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "To lahko traja nekaj minut."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Prevzemam tvoj Ring račun..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Napaka pri ustvarjanju/branju računa"
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -281,42 +281,46 @@
 msgstr "Omogoči obvestila ob dohodnem klicu"
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr ""
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr ""
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Nastavitve zgodovine"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Ohrani zgodovino za (dni)"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(Vpiši 0 za neomejeno zgodovino)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Počisti vso zgodovino"
 
@@ -332,7 +336,7 @@
 msgid "Media"
 msgstr "Mediji"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Nastavitve"
 
@@ -435,7 +439,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -716,7 +720,7 @@
 msgid "Set selection as image"
 msgstr "Določi izbrano za sliko"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -724,34 +728,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring napaka"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Dohodni klic"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Sprejmi"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Prikaži"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Zavrni"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s pravi:"
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Zavrni"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -777,24 +786,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -807,15 +816,15 @@
 msgid "Contacts"
 msgstr "Stiki"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Neveljavno geslo"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Napaka mreže. Prosim poskusi ponovno."
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -825,7 +834,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Shrani datoteko"
@@ -888,11 +897,11 @@
 msgid "Voicemail number"
 msgstr "Številka glasovnega predala"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -916,7 +925,7 @@
 msgid "Open Avatar Image"
 msgstr "Odpri avatar sliko"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Odpri"
 
@@ -928,7 +937,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -938,27 +947,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "GNOME klient za Ring.\nRing je zastonj programska oprema za univerzalno komunikacijo, ki spoštuje svoboščine in zasebnost uporabnikov."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "izvedi klic"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "odpri pogovor"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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 "Poišči stik ali vnesi številko"
 
+#: src/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Dohodni klic"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1061,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME klient za Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Gesli nista enaki"
 
@@ -1056,7 +1089,7 @@
 msgid "Ring ID QR code"
 msgstr "Ring ID QR koda"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1066,7 +1099,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Samodejno"
@@ -1107,34 +1140,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Odjavljen"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Povezan"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/sq_AL.po ring-20180816.2.e26b79f~ds1/client-gnome/po/sq_AL.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/sq_AL.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/sq_AL.po	2018-08-16 15:09:41.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-08-06 11:29+0000\n"
 "Last-Translator: Besnik <besnik@programeshqip.org>\n"
 "Language-Team: Albanian (Albania) (http://www.transifex.com/savoirfairelinux/ring/language/sq_AL/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@
 
 #: ui/accountmigrationview.ui:31
 msgid "This account is malformed, please enter your password"
-msgstr ""
+msgstr "Kjo llogari është e keqformuar, ju lutemi, jepni fjalëkalimin tuaj"
 
 #: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:620
 msgid "Alias"
@@ -40,9 +40,9 @@
 
 #: ui/accountmigrationview.ui:126
 msgid "Ring ID"
-msgstr ""
+msgstr "ID Ring-u"
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -60,7 +60,7 @@
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
-msgstr ""
+msgstr "Migrimi dështoi, fjalëkalim i gabuar?"
 
 #: ui/currentcallview.ui:251
 msgid "End this call"
@@ -131,44 +131,44 @@
 msgid "Transfer to"
 msgstr "Shpërngule te"
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Mirë se vini te"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Krijoni Llogari Ring"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Krijoni një llogari të ri Ring (për përdorues të rinj)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Lidheni këtë pajisje me një llogari"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Lidheni këtë pajisje me një llogari Ring të krijuar te pajisja tjetër"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Anuloje"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
-msgstr ""
+msgstr "Të mëtejshme…"
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
-msgstr ""
+msgstr "Shtoni një llogari SIP të re"
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Lidheni këtë pajisje me një llogari ekzistuese"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -179,83 +179,83 @@
 "from an archive."
 msgstr "Për të lidhur këtë pajisje me një llogari tjetër, keni dy mundësi. Mund të importoni llogarinë tuaj nga DHT, por së pari, lypset të merrni një kod PIN. Që të prodhohet kodi PIN, kaloni te ndarja e administrimit të llogarive, te pajisja e mëparshme, zgjidhni Llogari Ring që duhet përdorur dhe përzgjidhni \"Lidhni me këtë llogari një pajisje tjetër\". Do të merrni PIN-in e nevojshëm për të plotësuar këtë formular. PIN-i vlen vetëm për 10 minuta. Ose mund të importoni drejtpërsëdrejti llogarinë tuaj nga një arkiv."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Jepni PIN-in tuaj:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Ose importoni një kartelë:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Jepni fjalëkalimin tuaj:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "I mëparshmi"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Pasuesi"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Llogari"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
-msgstr ""
+msgstr "Regjistroni emër përdoruesi"
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "Duke i vënë shenjë kësaj, do të regjistroni një emër përdoruesi unik në rrjetin Ring. Njerëzit mund ta përdorin për t’u lidhur me ju, në vend se të ID-së tuaj Ring, që është 40 shenja i gjatë."
 
-#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Emër përdoruesi"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Ky fjalëkalim do të përdoret për të fshehtëzuar të dhënat e llogarisë tuaj dhe për të lidhur pajisje të reja në të."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Ripohoni fjalëkalimin"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Po prodhohet llogaria juaj Ring…"
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Po regjistrohet emri i përdoruesit…"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Kjo mund të hajë pak minuta."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Po merret llogaria juaj Ring…"
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Gabim në krijim/ngarkim llogarie."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -281,42 +281,46 @@
 msgstr "Aktivizo njoftimet për thirrje ardhëse."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr "Aktivizo njoftime për kërkesa pezull."
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Aktivizo njoftimet për mesazhe të reja fjalosjesh."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Shfaq te dritarja e fjalosjes figura dhe video."
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Dhënia e një numri te fusha e kërkimeve do të kryejë një thirrje të re."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "Dosje shkarkimesh:"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Shfaqe fjalosjen djathtas."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Shfaqe fjalosjen poshtë."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Rregullime Historiku"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Mbaje historikun për (ditë):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(vëreni 0 për historik të pakufizuar)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Pastro krejt historikun"
 
@@ -332,7 +336,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Rregullime"
 
@@ -433,19 +437,19 @@
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
-msgstr ""
+msgstr "Klikoni që të ndryshohet fjalëkalimi"
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Eksportoni llogari"
 
 #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:908
 msgid "Enable account"
-msgstr ""
+msgstr "Aktivizoje llogarinë"
 
 #: ui/newaccountsettingsview.ui:697
 msgid "SIP server"
-msgstr ""
+msgstr "Shërbyes SIP"
 
 #: ui/newaccountsettingsview.ui:781
 msgid "password"
@@ -458,7 +462,7 @@
 
 #: ui/newaccountsettingsview.ui:848
 msgid "Voicemail"
-msgstr ""
+msgstr "Voicemail"
 
 #: ui/newaccountsettingsview.ui:959
 msgid "Known devices linked to this Ring account"
@@ -466,11 +470,11 @@
 
 #: ui/newaccountsettingsview.ui:967
 msgid "Link another device"
-msgstr ""
+msgstr "Lidhni një pajisje tjetër"
 
 #: ui/newaccountsettingsview.ui:1032
 msgid "Banned contacts"
-msgstr ""
+msgstr "Kontakte të dëbuar"
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
@@ -478,27 +482,27 @@
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
-msgstr ""
+msgstr "Rregullime të përgjithshme"
 
 #: ui/newaccountsettingsview.ui:1146
 msgid "Call settings"
-msgstr ""
+msgstr "Rregullime për thirrjet"
 
 #: ui/newaccountsettingsview.ui:1184
 msgid "Allow call from untrusted peers"
-msgstr ""
+msgstr "Lejo thirrje prej personash të pabesuar"
 
 #: ui/newaccountsettingsview.ui:1219
 msgid "Auto answer calls"
-msgstr ""
+msgstr "Vetëpërgjigju thirrjeve"
 
 #: ui/newaccountsettingsview.ui:1255
 msgid "Custom ringtone"
-msgstr ""
+msgstr "Zile vetjake"
 
 #: ui/newaccountsettingsview.ui:1299
 msgid "Name server"
-msgstr ""
+msgstr "Shërbyes emrash"
 
 #: ui/newaccountsettingsview.ui:1336 ui/newaccountsettingsview.ui:2489
 msgid "Address"
@@ -506,7 +510,7 @@
 
 #: ui/newaccountsettingsview.ui:1370
 msgid "OpenDHT configuration"
-msgstr ""
+msgstr "Formësim i OpenDHT-së"
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
@@ -518,7 +522,7 @@
 
 #: ui/newaccountsettingsview.ui:1549
 msgid "Enable SDES for key exchange protocol"
-msgstr ""
+msgstr "Aktivizo SDES për protokoll shkëmbimi kyçesh"
 
 #: ui/newaccountsettingsview.ui:1585
 msgid "Fallback on RTP on encryption failure"
@@ -574,15 +578,15 @@
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
-msgstr ""
+msgstr "Aftësi lidhjeje"
 
 #: ui/newaccountsettingsview.ui:2065
 msgid "Registration expire timeout (seconds)"
-msgstr ""
+msgstr "Kohë skadimi regjistrimi (në sekonda)"
 
 #: ui/newaccountsettingsview.ui:2102
 msgid "Network interface"
-msgstr ""
+msgstr "Ndërfaqe rrjeti"
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
@@ -594,19 +598,19 @@
 
 #: ui/newaccountsettingsview.ui:2208
 msgid "(TURN) address"
-msgstr ""
+msgstr "(TURN) adresë"
 
 #: ui/newaccountsettingsview.ui:2243
 msgid "(TURN) username"
-msgstr ""
+msgstr "(TURN) emër përdoruesi"
 
 #: ui/newaccountsettingsview.ui:2277
 msgid "(TURN) password"
-msgstr ""
+msgstr "(TURN) fjalëkalim"
 
 #: ui/newaccountsettingsview.ui:2314
 msgid "(TURN) realm"
-msgstr ""
+msgstr "(TURN) shtrirje"
 
 #: ui/newaccountsettingsview.ui:2348
 msgid "Use STUN"
@@ -614,15 +618,15 @@
 
 #: ui/newaccountsettingsview.ui:2383
 msgid "(STUN) address"
-msgstr ""
+msgstr "(STUN) adresë"
 
 #: ui/newaccountsettingsview.ui:2416
 msgid "Published address"
-msgstr ""
+msgstr "Adresë e publikuar"
 
 #: ui/newaccountsettingsview.ui:2453
 msgid "Use custom address and port"
-msgstr ""
+msgstr "Përdor adresë dhe portë vetjake"
 
 #: ui/newaccountsettingsview.ui:2524
 msgid "Port"
@@ -634,7 +638,7 @@
 
 #: ui/newaccountsettingsview.ui:2623
 msgid "Enable video"
-msgstr ""
+msgstr "Aktivizo video"
 
 #: ui/newaccountsettingsview.ui:2650
 msgid "Audio codecs"
@@ -646,27 +650,27 @@
 
 #: ui/newaccountsettingsview.ui:2732
 msgid "Only used during SDP negotiation in case ICE is not supported."
-msgstr ""
+msgstr "Përdorur vetëm gjatë tratativash sesioni SDP, në rast se ICE nuk mbulohet."
 
 #: ui/newaccountsettingsview.ui:2766
 msgid "Audio RTP Min port"
-msgstr ""
+msgstr "Interval Minimum Porte Audio RTP"
 
 #: ui/newaccountsettingsview.ui:2801
 msgid "Audio RTP Max port"
-msgstr ""
+msgstr "Interval Maksimum Porte Audio RTP"
 
 #: ui/newaccountsettingsview.ui:2836
 msgid "Video RTP Min port"
-msgstr ""
+msgstr "Interval Minimum Porte Video RTP"
 
 #: ui/newaccountsettingsview.ui:2871
 msgid "Video RTP Max port"
-msgstr ""
+msgstr "Interval Maksimum Porte Video RTP"
 
 #: ui/usernameregistrationbox.ui:28
 msgid "register username"
-msgstr ""
+msgstr "regjistroni emër përdoruesi"
 
 #: ui/chatview.ui:19 ui/chatview.ui:22
 msgid "Hide chat view"
@@ -716,7 +720,7 @@
 msgid "Set selection as image"
 msgstr "Si figurë cakto përzgjedhjen"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -724,38 +728,43 @@
 "Error: %s"
 msgstr "S’arrihet të gatitet.\nSigurohuni që demoni Ring (dring) është në punë e sipër.\nGabim: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Gabim Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Shfaqe Ring-un"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Dilni"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Thirrje ardhëse"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr "Hap bisedë"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Shfaqe"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Pranoje"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s thotë:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Hidhe tej"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Hidhe tej"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
-msgstr ""
+msgstr "Regjistroje këtë emër përdoruesi te shërbyesi i emrave"
 
 #: src/usernameregistrationbox.cpp:173
 msgid "Username already taken"
@@ -767,34 +776,34 @@
 
 #: src/usernameregistrationbox.cpp:194
 msgid "Lookup unavailable, check your network connection"
-msgstr ""
+msgstr "Kërkimi s’bëhet dot, kontrolloni lidhjen tuaj në rrjet"
 
 #: src/usernameregistrationbox.cpp:274
 msgid "Performing lookup..."
-msgstr ""
+msgstr "Po kryhet kërkimi…"
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress..."
-msgstr ""
+msgstr "Regjistrim në kryerje e sipër…"
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Ky është veprim me pasoja shkatërruese. Jeni i sigurt se doni të fshihet krejt historiku juaj i fjalosjeve dhe thirrjeve?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "Zgjidhni dosje shkarkimesh"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Anuloje"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "_Ruaje"
 
@@ -807,15 +816,15 @@
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Fjalëkalim i gabuar"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Gabim rrjeti, riprovoni"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "S’u fillua dot eksportimi te Ring, riprovoni"
 
@@ -825,7 +834,7 @@
 msgid "Change password"
 msgstr "Ndryshoni fjalëkalimin"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Ruaje Kartelën"
@@ -888,11 +897,11 @@
 msgid "Voicemail number"
 msgstr "Numër voicemail"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr "Gabim: fjalëkalim i gabuar!"
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr "Gabim: pajisje e panjohur!"
 
@@ -906,7 +915,7 @@
 
 #: src/video/video_widget.cpp:588
 msgid "Stream _file"
-msgstr ""
+msgstr "_Kartelë rrjedhe"
 
 #: src/video/video_widget.cpp:601
 msgid "Show advanced information"
@@ -916,7 +925,7 @@
 msgid "Open Avatar Image"
 msgstr "Hap Figurë Avatari"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Hape"
 
@@ -928,9 +937,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "\"In varietate concordia\"\nmontuar më %.25s"
+msgstr "\"Live Free or Die\"\nngritur mbi %.25s"
 
 #: src/dialogs.c:137
 msgid ""
@@ -938,27 +947,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 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/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
-msgstr ""
+msgstr "Shtoni llogari…"
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "bëni një thirrje"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "hape fjalosjen"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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 "Përzgjidhni kontakte ose jepni një numër"
 
+#: src/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr "Braktise faqen e rregullimeve"
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Thirrje ardhëse"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr "Kërkesë e re nga"
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr "Mesazh i ri"
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1061,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Klienti Ring për GNOME"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Fjalëkalimet nuk përputhen"
 
@@ -1056,7 +1089,7 @@
 msgid "Ring ID QR code"
 msgstr "Kod QR ID-je Ring-u"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Dërgo Kartelë"
 
@@ -1064,28 +1097,28 @@
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
-msgstr ""
+msgstr "Kujdes! Ky veprim do të shkaktojë heqjen e kësaj llogarie në këtë pajisje!\nShënim: ky veprim s’mund të zhbëhet. Veç kësaj, mund të humbë emri që keni regjistruar!"
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
 #: src/newaccountsettingsview.cpp:679
 msgid "Edit name"
-msgstr ""
+msgstr "Përpunoni emrin"
 
 #: src/newaccountsettingsview.cpp:774
 msgid "Unban"
-msgstr ""
+msgstr "Zhdëboje"
 
 #: src/newaccountsettingsview.cpp:810
 msgid "New password and its confirmation are different!"
-msgstr ""
+msgstr "Fjalëkalimi i ri dhe ripohimi për të janë të ndryshëm!"
 
 #: src/newaccountsettingsview.cpp:821
 msgid "Incorrect password!"
-msgstr ""
+msgstr "Fjalëkalim i pasaktë!"
 
 #: src/newaccountsettingsview.cpp:858
 msgid "Note: this will change the password only on this device."
@@ -1101,40 +1134,40 @@
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Account exported!"
-msgstr ""
+msgstr "Llogaria u eksportua!"
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Export account failure."
-msgstr ""
+msgstr "Dështim eksportimi llogarie."
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Gabim i panjohur"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
-msgstr ""
+msgstr "Po gatitet…"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Jo në linjë"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
-msgstr ""
+msgstr "Po bëhet lidhja…"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Në linjë"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
-msgstr ""
+msgstr "Gjendje e panjohur"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
-msgstr ""
+msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
-msgstr ""
+msgstr "s’ka fjalëkalim të caktuar"
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/sv.po ring-20180816.2.e26b79f~ds1/client-gnome/po/sv.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/sv.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/sv.po	2018-08-16 15:09:41.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 09:28+0000\n"
 "Last-Translator: Åke Engelbrektson\n"
 "Language-Team: Swedish (http://www.transifex.com/savoirfairelinux/ring/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@
 
 #: ui/accountmigrationview.ui:31
 msgid "This account is malformed, please enter your password"
-msgstr ""
+msgstr "Detta konto är felaktigt, ange ditt lösenord"
 
 #: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:620
 msgid "Alias"
@@ -40,9 +40,9 @@
 
 #: ui/accountmigrationview.ui:126
 msgid "Ring ID"
-msgstr ""
+msgstr "Ring-ID"
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -60,7 +60,7 @@
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
-msgstr ""
+msgstr "Migreringen misslyckades, fel lösenord?"
 
 #: ui/currentcallview.ui:251
 msgid "End this call"
@@ -131,44 +131,44 @@
 msgid "Transfer to"
 msgstr "Överför till"
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Välkommen till"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Skapa Ring-konto"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Skapa ett nytt Ring-konto (för nya användare)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Koppla denna enhet till ett konto"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Koppla den här enheten till ett Ring-konto, skapat på en annan enhet"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
-msgstr ""
+msgstr "Avancerat..."
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
-msgstr ""
+msgstr "Lägg till nytt SIP-konto"
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Koppla den här enheten till ett befintligt konto"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -179,83 +179,83 @@
 "from an archive."
 msgstr "För att länka denna enhet till ett annat konto, har du två alternativ. Du kan importera ditt konto från DHT, men måste först ha en PIN-kod. För att generera PIN-koden, går du till kontoinställningarna på en tidigare konfigurerad enhet, väljer det Ring-konto du vill använda och \"lägger till en enhet\". Där får du den nödvändiga PIN-koden för att avsluta detta formulär. PIN-koden är giltig i endast 10 minuter. Du kan också direktimportera ditt konto från en arkivfil."
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Ange din PIN-kod:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "Eller importera en fil:"
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Ange ditt lösenord:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Föregående"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Nästa"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Konto"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
-msgstr ""
+msgstr "Registrera användarnamn"
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Detta lösenord kommer att användas för att kryptera din kontodata och för att länka nya enheter till ditt konto."
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Bekräfta lösenord"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Genererar ditt Ring-konto..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Registrerar användarnamn..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Detta kan ta några få minuter."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Hämtar ditt Ring-konto..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Fel vid skapande/inläsning av konto."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -281,42 +281,46 @@
 msgstr "Aktivera avisering för inkommande samtal."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr "Aktivera avisering för väntande förfrågningar."
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Aktivera avisering för nya chattmeddelanden."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "Visa bilder och filmer i chattfönster"
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Ange ett nummer i sökfältet för att starta ett nytt samtal."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "Nerladdningsmapp:"
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Visa chatten till höger"
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Visa chatten nederst"
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Historikinställningar"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Spara historiken i (dagar):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(Ange 0 för obegränsad historik)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Rensa all historik"
 
@@ -332,7 +336,7 @@
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Inställningar"
 
@@ -433,19 +437,19 @@
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
-msgstr ""
+msgstr "Klicka för att byta lösenord"
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Exportera konto"
 
 #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:908
 msgid "Enable account"
-msgstr ""
+msgstr "Aktivera konto"
 
 #: ui/newaccountsettingsview.ui:697
 msgid "SIP server"
-msgstr ""
+msgstr "SIP-server"
 
 #: ui/newaccountsettingsview.ui:781
 msgid "password"
@@ -458,7 +462,7 @@
 
 #: ui/newaccountsettingsview.ui:848
 msgid "Voicemail"
-msgstr ""
+msgstr "Röstbrevlåda"
 
 #: ui/newaccountsettingsview.ui:959
 msgid "Known devices linked to this Ring account"
@@ -466,11 +470,11 @@
 
 #: ui/newaccountsettingsview.ui:967
 msgid "Link another device"
-msgstr ""
+msgstr "Koppla en annan enhet"
 
 #: ui/newaccountsettingsview.ui:1032
 msgid "Banned contacts"
-msgstr ""
+msgstr "Bannlysta kontakter"
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
@@ -478,27 +482,27 @@
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
-msgstr ""
+msgstr "Allmänna inställningar"
 
 #: ui/newaccountsettingsview.ui:1146
 msgid "Call settings"
-msgstr ""
+msgstr "Samtalsinställningar"
 
 #: ui/newaccountsettingsview.ui:1184
 msgid "Allow call from untrusted peers"
-msgstr ""
+msgstr "Tillåt samtal från ej betrodda användare"
 
 #: ui/newaccountsettingsview.ui:1219
 msgid "Auto answer calls"
-msgstr ""
+msgstr "Besvara samtal automatiskt"
 
 #: ui/newaccountsettingsview.ui:1255
 msgid "Custom ringtone"
-msgstr ""
+msgstr "Anpassad ringsignal"
 
 #: ui/newaccountsettingsview.ui:1299
 msgid "Name server"
-msgstr ""
+msgstr "Namnserver"
 
 #: ui/newaccountsettingsview.ui:1336 ui/newaccountsettingsview.ui:2489
 msgid "Address"
@@ -506,7 +510,7 @@
 
 #: ui/newaccountsettingsview.ui:1370
 msgid "OpenDHT configuration"
-msgstr ""
+msgstr "OpenDHT-konfiguration"
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
@@ -518,7 +522,7 @@
 
 #: ui/newaccountsettingsview.ui:1549
 msgid "Enable SDES for key exchange protocol"
-msgstr ""
+msgstr "Aktivera SDES för nyckelutbytesprotokoll"
 
 #: ui/newaccountsettingsview.ui:1585
 msgid "Fallback on RTP on encryption failure"
@@ -574,15 +578,15 @@
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
-msgstr ""
+msgstr "Anslutningsbarhet"
 
 #: ui/newaccountsettingsview.ui:2065
 msgid "Registration expire timeout (seconds)"
-msgstr ""
+msgstr "Tidsgräns för registrering (sekunder)"
 
 #: ui/newaccountsettingsview.ui:2102
 msgid "Network interface"
-msgstr ""
+msgstr "Nätverksgränssnitt"
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
@@ -594,19 +598,19 @@
 
 #: ui/newaccountsettingsview.ui:2208
 msgid "(TURN) address"
-msgstr ""
+msgstr "(TURN) adress"
 
 #: ui/newaccountsettingsview.ui:2243
 msgid "(TURN) username"
-msgstr ""
+msgstr "(TURN) användarnamn"
 
 #: ui/newaccountsettingsview.ui:2277
 msgid "(TURN) password"
-msgstr ""
+msgstr "(TURN) lösenord"
 
 #: ui/newaccountsettingsview.ui:2314
 msgid "(TURN) realm"
-msgstr ""
+msgstr "TURN domän"
 
 #: ui/newaccountsettingsview.ui:2348
 msgid "Use STUN"
@@ -614,15 +618,15 @@
 
 #: ui/newaccountsettingsview.ui:2383
 msgid "(STUN) address"
-msgstr ""
+msgstr "(STUN) adress"
 
 #: ui/newaccountsettingsview.ui:2416
 msgid "Published address"
-msgstr ""
+msgstr "Publiserad adress"
 
 #: ui/newaccountsettingsview.ui:2453
 msgid "Use custom address and port"
-msgstr ""
+msgstr "Använd anpassad adress och port"
 
 #: ui/newaccountsettingsview.ui:2524
 msgid "Port"
@@ -646,27 +650,27 @@
 
 #: ui/newaccountsettingsview.ui:2732
 msgid "Only used during SDP negotiation in case ICE is not supported."
-msgstr ""
+msgstr "Används endast under SDP-sessionsförhandling, om ICE inte stöds."
 
 #: ui/newaccountsettingsview.ui:2766
 msgid "Audio RTP Min port"
-msgstr ""
+msgstr "Audio RTP min. port"
 
 #: ui/newaccountsettingsview.ui:2801
 msgid "Audio RTP Max port"
-msgstr ""
+msgstr "Audio RTP max. port"
 
 #: ui/newaccountsettingsview.ui:2836
 msgid "Video RTP Min port"
-msgstr ""
+msgstr "Video RTP min. port"
 
 #: ui/newaccountsettingsview.ui:2871
 msgid "Video RTP Max port"
-msgstr ""
+msgstr "Video RTP max. port"
 
 #: ui/usernameregistrationbox.ui:28
 msgid "register username"
-msgstr ""
+msgstr "Registrera användarnamn"
 
 #: ui/chatview.ui:19 ui/chatview.ui:22
 msgid "Hide chat view"
@@ -716,7 +720,7 @@
 msgid "Set selection as image"
 msgstr "Ange markerat som bild"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -724,38 +728,43 @@
 "Error: %s"
 msgstr "Kan inte starta.\nTillse att Ring-tjänsten (dring) körs.\nFel: %s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring-fel"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "Visa Ring"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Inkommande samtal"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr "Öppna konversation"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Visa"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Acceptera"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s säger:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Neka"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Avslå"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
-msgstr ""
+msgstr "Registrera detta namn i namnservern"
 
 #: src/usernameregistrationbox.cpp:173
 msgid "Username already taken"
@@ -767,34 +776,34 @@
 
 #: src/usernameregistrationbox.cpp:194
 msgid "Lookup unavailable, check your network connection"
-msgstr ""
+msgstr "Sök efter ej tillgängliga, kontrollera din nätverksanslutning"
 
 #: src/usernameregistrationbox.cpp:274
 msgid "Performing lookup..."
-msgstr ""
+msgstr "Utför sökning..."
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress..."
-msgstr ""
+msgstr "Registrering pågår..."
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Detta är en destruktiv åtgärd. Vill du verkligen ta bort all din chatt- och samtalshistorik?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "Välj nerladdningsmapp"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "_Spara"
 
@@ -807,15 +816,15 @@
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Fel lösenord"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Nätverksfel, försök igen"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Kunde inte starta export till Ring, försök igen"
 
@@ -825,7 +834,7 @@
 msgid "Change password"
 msgstr "Byt lösenord"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Spara fil"
@@ -888,11 +897,11 @@
 msgid "Voicemail number"
 msgstr "Nummer till röstbrevlåda"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr "Fel: Fel lösenord!"
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr "Fel: Okänd enhet!"
 
@@ -916,7 +925,7 @@
 msgid "Open Avatar Image"
 msgstr "Öppna avatarbild"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Öppna"
 
@@ -928,9 +937,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "\"Förenade i mångfalden\"\nkompilerat %.25s"
+msgstr "\"Lev fritt eller dö\"\nkompilerat %.25s"
 
 #: src/dialogs.c:137
 msgid ""
@@ -938,27 +947,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "GNOME-klient för Ring\nRing är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet."
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
-msgstr ""
+msgstr "Lägg till konto..."
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "starta samtal"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "öppna chatt"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr "Lämna inställningssidan"
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr "ringer dig!"
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Inkommande samtal"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr "Ny förfrågan från"
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr "Lita på begäran"
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr "Nytt meddelande"
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1028,7 +1061,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME-klient för Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Lösenorden stämmer inte"
 
@@ -1056,7 +1089,7 @@
 msgid "Ring ID QR code"
 msgstr "Ring-ID som QR-kod"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Skicka fil"
 
@@ -1064,28 +1097,28 @@
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
-msgstr ""
+msgstr "Varning! Denna åtgärd kommer att ta bort detta konto på denna enhet!\nNotera att åtgärden inte kan ångras och att ditt registrerade användarnamn kan förloras!"
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
 #: src/newaccountsettingsview.cpp:679
 msgid "Edit name"
-msgstr ""
+msgstr "Redigera namn"
 
 #: src/newaccountsettingsview.cpp:774
 msgid "Unban"
-msgstr ""
+msgstr "Ta bort bannlysning"
 
 #: src/newaccountsettingsview.cpp:810
 msgid "New password and its confirmation are different!"
-msgstr ""
+msgstr "Det nya lösenordet och bekräftelsen är olika"
 
 #: src/newaccountsettingsview.cpp:821
 msgid "Incorrect password!"
-msgstr ""
+msgstr "Felaktigt lösenord!"
 
 #: src/newaccountsettingsview.cpp:858
 msgid "Note: this will change the password only on this device."
@@ -1101,40 +1134,40 @@
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Account exported!"
-msgstr ""
+msgstr "Konto exporterat!"
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Export account failure."
-msgstr ""
+msgstr "Kontoexport misslyckades."
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
-msgstr ""
+msgstr "Startar..."
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "Nerkopplad"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
-msgstr ""
+msgstr "Ansluter..."
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "Uppkopplad"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
-msgstr ""
+msgstr "Okänd status"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
-msgstr ""
+msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
-msgstr ""
+msgstr "Lösenord saknas"
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/tr.po ring-20180816.2.e26b79f~ds1/client-gnome/po/tr.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/tr.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/tr.po	2018-08-16 15:09:41.000000000 +0000
@@ -12,9 +12,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Emin Tufan <etcetin@gmail.com>\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"
@@ -46,7 +46,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -60,7 +60,7 @@
 #: ui/newaccountsettingsview.ui:876 src/accountmigrationview.cpp:176
 #: src/newaccountsettingsview.cpp:963
 msgid "Delete account"
-msgstr ""
+msgstr "Hesabı sil"
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
@@ -135,44 +135,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "Hoş Geldiniz"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "Ring Hesabı Oluştur"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "Yeni bir Ring hesabı oluştur (yeni kullanıcılar için)"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Bu aygıtı bir hesaba bağla"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "Bu aygıtları başka aygıtta oluşturulan Ring hesabına bağla"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "İptal"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "Bu aygıtı var olan bir hesaba bağla"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -183,83 +183,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "Pin'inizi girin:"
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "Parolanızı girin:"
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "Önceki"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "İleri"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Hesap"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "Bu parola hesap bilgilerinizi şifrelemek ve hesabınızı yeni aygıtlara bağlamak için kullanılacaktır"
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Parolayı onayla"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Ring hesabınız oluşturuluyor..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "Kullanıcı adı kaydediliyor..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "Bu bir kaç dakika sürebilir."
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "Ring hesabınız alınıyor..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "Hesap oluşturma/yükleme hatası."
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "TAMAM"
@@ -285,42 +285,46 @@
 msgstr "Gelen çağrılar için bildirimleri etkinleştir."
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "Yeni konuşma iletileri için bildirimler etkinleştir."
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "Arama girişine bir numara girmek yeni bir arama yapacak."
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Konuşmayı sağda göster."
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Konuşmayı aşağıda göster."
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Geçmiş Ayarları"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Geçmişi tutulacak gün sayısı:"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(sınırsız geçmiş için 0 yapın)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Tüm geçmişi temizle"
 
@@ -336,7 +340,7 @@
 msgid "Media"
 msgstr "Ortam"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Ayarlar"
 
@@ -433,13 +437,13 @@
 
 #: ui/newaccountsettingsview.ui:460
 msgid "ID"
-msgstr ""
+msgstr "Kimlik"
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "Hesapları dışa aktar"
 
@@ -478,7 +482,7 @@
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
-msgstr ""
+msgstr "Gelişmiş ayarlar"
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
@@ -514,7 +518,7 @@
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
-msgstr ""
+msgstr "Önyükleme"
 
 #: ui/newaccountsettingsview.ui:1514
 msgid "Encrypt media streams (SRTP)"
@@ -574,7 +578,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "Güvenlik"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -590,7 +594,7 @@
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
-msgstr ""
+msgstr "UPnP"
 
 #: ui/newaccountsettingsview.ui:2173
 msgid "Use TURN"
@@ -634,7 +638,7 @@
 
 #: ui/newaccountsettingsview.ui:2560
 msgid "Video codecs"
-msgstr ""
+msgstr "Görüntü çözücüler"
 
 #: ui/newaccountsettingsview.ui:2623
 msgid "Enable video"
@@ -642,7 +646,7 @@
 
 #: ui/newaccountsettingsview.ui:2650
 msgid "Audio codecs"
-msgstr ""
+msgstr "Ses çözücüleri"
 
 #: ui/newaccountsettingsview.ui:2720
 msgid "SDP Session Negotiation (ICE Fallback)"
@@ -720,7 +724,7 @@
 msgid "Set selection as image"
 msgstr "Seçimi görüntü olarak belirle"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -728,34 +732,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring Hatası"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Gelen arama"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Göster"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Kabul et"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s diyor:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Geri Çevir"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Reddet"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -781,24 +790,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Bu yok edici bir eylemdir. Tüm konuşma ve çağrı geçmişini silmek istediğinizden emin misiniz?"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -811,15 +820,15 @@
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "Geçersiz parola"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "Ağ hatası, yeniden deneyin"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "Ring dışa aktarımı başlatılamadı, yeniden deneyin"
 
@@ -829,7 +838,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Dosyayı Kaydet"
@@ -892,11 +901,11 @@
 msgid "Voicemail number"
 msgstr "Sesli ileti numarası"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -920,7 +929,7 @@
 msgid "Open Avatar Image"
 msgstr "Avatar Resmi Aç"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Aç"
 
@@ -932,7 +941,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -942,27 +951,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Ring için GNOME istemcisi.\nRing; 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/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "ara"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "konuşma aç"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Gelen arama"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1032,7 +1065,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Ring için GNOME istemcisi"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "Parolalar uyuşmuyor"
 
@@ -1060,7 +1093,7 @@
 msgid "Ring ID QR code"
 msgstr "OR kod Ring Kimliği"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1070,7 +1103,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Kendiliğinden"
@@ -1111,34 +1144,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
-msgstr ""
+msgstr "Çevrimdışı"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
-msgstr ""
+msgstr "Çevrimiçi"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/uk.po ring-20180816.2.e26b79f~ds1/client-gnome/po/uk.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/uk.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/uk.po	2018-08-16 15:09:41.000000000 +0000
@@ -14,9 +14,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Mykola Yakovliev <vegasq@gmail.com>\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: patriotyk <patriotyk@gmail.com>\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"
@@ -48,7 +48,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -137,44 +137,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "Відміна"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -185,83 +185,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "Наступний"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "Профіль"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "Аккаунт"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "Ім’я"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "Підтвердити пароль"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Генерація вашого облікового запису Ring..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "OK"
@@ -287,42 +287,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "Показати повідомлення справа"
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "Показати повідомлення внизу"
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "Налаштування історії"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "Зберігати історію впродовж (дні)"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(установіть  0 для необмеженої історії)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "Очистити усю історію"
 
@@ -338,7 +342,7 @@
 msgid "Media"
 msgstr "Медіа"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "Налаштування"
 
@@ -441,7 +445,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -722,7 +726,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -730,34 +734,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Помилка Ring"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "Вхідний дзвінок"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "Показати"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "Прийняти"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s каже:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "Скидання"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "Відхилити"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -783,24 +792,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -813,15 +822,15 @@
 msgid "Contacts"
 msgstr "Контакти"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -831,7 +840,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "Зберегти файл"
@@ -894,11 +903,11 @@
 msgid "Voicemail number"
 msgstr "Номер голосової пошти"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -922,7 +931,7 @@
 msgid "Open Avatar Image"
 msgstr "Відкрити зображення Аватару."
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -934,7 +943,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -944,27 +953,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "Вхідний дзвінок"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1034,7 +1067,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME клієнт для Ring"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1062,7 +1095,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1072,7 +1105,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Авто"
@@ -1113,34 +1146,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/zh_CN.po ring-20180816.2.e26b79f~ds1/client-gnome/po/zh_CN.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/zh_CN.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/zh_CN.po	2018-08-16 15:09:41.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
 "Last-Translator: Ling-Xiao Yang <ling-xiao.yang@mail.mcgill.ca>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/savoirfairelinux/ring/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -134,44 +134,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "欢迎来到"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "创建Ring帐户"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "创建新的Ring帐户（新用户）"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "将此设备与一个帐户进行连接"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "将此设备与其他设备创建的Ring帐户进行连接"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "取消"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "将此设备与已有帐户进行连接"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -182,83 +182,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "输入您的PIN："
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "输入您的密码："
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "上一步"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "下一步"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "帐户资料"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "帐户"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "勾选这项以注册Ring网络用户名。该用户名唯一并可替代40字符的RingID。"
 
-#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "用户名"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "该密码用于加密您的帐户数据，以及将其他设备与您的帐户进行连接。"
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "正在生成您的Ring帐户…"
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "正在注册用户名…"
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "可能需要数分钟。"
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "正在获取您的Ring帐户…"
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "创建或载入帐户时发生错误。"
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "确定"
@@ -284,42 +284,46 @@
 msgstr "启用来电通知。"
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr ""
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "启用新消息通知。"
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "在聊天窗口中显示图片和视频"
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "要直接拨打电话号码，请在搜索栏中输入该号码。"
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "在右侧显示聊天窗口。"
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "在下方显示聊天窗口。"
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "历史记录设置"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "历史记录保存天数："
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "（设置为0则无限制）"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "清除所有历史记录"
 
@@ -335,7 +339,7 @@
 msgid "Media"
 msgstr "媒体"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "设置"
 
@@ -438,7 +442,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -719,7 +723,7 @@
 msgid "Set selection as image"
 msgstr "设置选区为头像"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -727,34 +731,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring错误"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "来电"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "显示"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "接听"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s说："
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "拒接"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "拒接"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -780,24 +789,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "该操作不可撤销。确定删除您的所有聊天与通话记录吗？"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -810,15 +819,15 @@
 msgid "Contacts"
 msgstr "通讯录"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "密码错误"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "网络错误，请重试"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "无法导出至Ring，请重试"
 
@@ -828,7 +837,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "保存文件"
@@ -891,11 +900,11 @@
 msgid "Voicemail number"
 msgstr "语音信箱号码"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -919,7 +928,7 @@
 msgid "Open Avatar Image"
 msgstr "打开头像图片"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "打开(_O)"
 
@@ -931,7 +940,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -941,27 +950,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Ring：GNOME客户端\nRing是自由软件，尊重用户的通讯自由与隐私。"
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "拨出"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "发起聊天"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "来电"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1031,7 +1064,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Ring的GNOME客户端"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "密码不匹配"
 
@@ -1059,7 +1092,7 @@
 msgid "Ring ID QR code"
 msgstr "RingID二维码"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1069,7 +1102,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "自动"
@@ -1110,34 +1143,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "离线"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "在线"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/zh.po ring-20180816.2.e26b79f~ds1/client-gnome/po/zh.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/zh.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/zh.po	2018-08-16 15:09:41.000000000 +0000
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:09+0000\n"
+"Last-Translator: Redfish Hong-Yu Li <redfish.tbc@gmail.com>\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"
@@ -44,7 +44,7 @@
 msgid "Ring ID"
 msgstr ""
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -133,44 +133,44 @@
 msgid "Transfer to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "取消"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -181,83 +181,83 @@
 "from an archive."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "下一步"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "個人檔案"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "帳號"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "使用者名"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "Ring 帳號產生中..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr ""
@@ -283,42 +283,46 @@
 msgstr ""
 
 #: ui/generalsettingsview.ui:94
-msgid "Enable notifications for new chat messages."
+msgid "Enable notifications for pending requests."
 msgstr ""
 
 #: ui/generalsettingsview.ui:102
-msgid "Show images and videos in chat window."
+msgid "Enable notifications for new chat messages."
 msgstr ""
 
 #: ui/generalsettingsview.ui:110
+msgid "Show images and videos in chat window."
+msgstr ""
+
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr ""
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr ""
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "在右側顯示聊天"
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "在下方顯示聊天"
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "歷史記錄設定"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "保留歷史紀錄(天):"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "清除所有歷史紀錄"
 
@@ -334,7 +338,7 @@
 msgid "Media"
 msgstr "媒體"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "設定"
 
@@ -437,7 +441,7 @@
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr ""
 
@@ -512,7 +516,7 @@
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
-msgstr ""
+msgstr "引導"
 
 #: ui/newaccountsettingsview.ui:1514
 msgid "Encrypt media streams (SRTP)"
@@ -572,7 +576,7 @@
 
 #: ui/newaccountsettingsview.ui:2002
 msgid "Security"
-msgstr ""
+msgstr "安全"
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
@@ -632,7 +636,7 @@
 
 #: ui/newaccountsettingsview.ui:2560
 msgid "Video codecs"
-msgstr ""
+msgstr "視訊編碼器"
 
 #: ui/newaccountsettingsview.ui:2623
 msgid "Enable video"
@@ -640,7 +644,7 @@
 
 #: ui/newaccountsettingsview.ui:2650
 msgid "Audio codecs"
-msgstr ""
+msgstr "音訊編碼器"
 
 #: ui/newaccountsettingsview.ui:2720
 msgid "SDP Session Negotiation (ICE Fallback)"
@@ -718,7 +722,7 @@
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -726,34 +730,39 @@
 "Error: %s"
 msgstr ""
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr ""
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr ""
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr ""
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "來電"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "顯示"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr ""
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s 說:"
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "拒絕"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
@@ -779,24 +788,24 @@
 msgid "Registration in progress..."
 msgstr ""
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr ""
 
@@ -809,15 +818,15 @@
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr ""
 
@@ -827,7 +836,7 @@
 msgid "Change password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "儲存檔案"
@@ -890,11 +899,11 @@
 msgid "Voicemail number"
 msgstr "語音留言號"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr ""
 
@@ -918,7 +927,7 @@
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -930,7 +939,7 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -940,27 +949,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
 msgstr ""
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr ""
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "來電"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr ""
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr ""
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr ""
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1030,7 +1063,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- GNOME 版 Ring 客戶端"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr ""
 
@@ -1058,7 +1091,7 @@
 msgid "Ring ID QR code"
 msgstr ""
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
@@ -1068,7 +1101,7 @@
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
@@ -1109,34 +1142,34 @@
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
 msgstr ""
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/po/zh_TW.po ring-20180816.2.e26b79f~ds1/client-gnome/po/zh_TW.po
--- ring-20180712.2.f3b87a6~ds1/client-gnome/po/zh_TW.po	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/po/zh_TW.po	2018-08-16 15:09:41.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-09 03:09-0400\n"
-"PO-Revision-Date: 2018-07-09 07:09+0000\n"
+"POT-Creation-Date: 2018-08-13 03:09-0400\n"
+"PO-Revision-Date: 2018-07-30 07:39+0000\n"
 "Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/savoirfairelinux/ring/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@
 
 #: ui/accountmigrationview.ui:31
 msgid "This account is malformed, please enter your password"
-msgstr ""
+msgstr "這個帳號格式錯誤，請輸入您的密碼"
 
 #: ui/accountmigrationview.ui:89 src/accountgeneraltab.cpp:620
 msgid "Alias"
@@ -42,9 +42,9 @@
 
 #: ui/accountmigrationview.ui:126
 msgid "Ring ID"
-msgstr ""
+msgstr "Ring ID"
 
-#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:457
+#: ui/accountmigrationview.ui:164 ui/accountcreationwizard.ui:455
 #: ui/newaccountsettingsview.ui:529 ui/newaccountsettingsview.ui:769
 #: src/accountgeneraltab.cpp:707
 msgid "Password"
@@ -62,7 +62,7 @@
 
 #: ui/accountmigrationview.ui:231
 msgid "Migration failed, wrong password?"
-msgstr ""
+msgstr "遷移失敗，錯誤的密碼？"
 
 #: ui/currentcallview.ui:251
 msgid "End this call"
@@ -133,44 +133,44 @@
 msgid "Transfer to"
 msgstr "轉移至"
 
-#: ui/accountcreationwizard.ui:34
+#: ui/accountcreationwizard.ui:30
 msgid "Welcome to"
 msgstr "歡迎來到"
 
-#: ui/accountcreationwizard.ui:68
+#: ui/accountcreationwizard.ui:64
 msgid "Create Ring Account"
 msgstr "建立 Ring 帳號"
 
-#: ui/accountcreationwizard.ui:69
+#: ui/accountcreationwizard.ui:65
 msgid "Create a new Ring account (for new users)"
 msgstr "建立一個新的 Ring 帳號（供新使用者使用）"
 
-#: ui/accountcreationwizard.ui:76
+#: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "連結這個裝置到一個帳號"
 
-#: ui/accountcreationwizard.ui:77
+#: ui/accountcreationwizard.ui:73
 msgid "Link this devices to a Ring account created on another device"
 msgstr "連結此裝置到一個在其他裝置上建立的 Ring 帳號"
 
-#: ui/accountcreationwizard.ui:84 ui/newaccountsettingsview.ui:183
+#: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
 #: src/newaccountsettingsview.cpp:883
 msgid "Cancel"
 msgstr "取消"
 
-#: ui/accountcreationwizard.ui:90
+#: ui/accountcreationwizard.ui:86
 msgid "Advanced..."
-msgstr ""
+msgstr "進階……"
 
-#: ui/accountcreationwizard.ui:101
+#: ui/accountcreationwizard.ui:97
 msgid "Add a new SIP account"
-msgstr ""
+msgstr "新增新的 SIP 帳號"
 
-#: ui/accountcreationwizard.ui:123
+#: ui/accountcreationwizard.ui:119
 msgid "Link this device to an existing account"
 msgstr "連結此裝置到既有的帳號"
 
-#: ui/accountcreationwizard.ui:138
+#: ui/accountcreationwizard.ui:134
 msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
@@ -181,83 +181,83 @@
 "from an archive."
 msgstr "要連結此裝置到其他帳號，您有兩個選擇。您可以從 DHT 匯入您的帳號，但首先您需要取得 PIN 碼。要生成 PIN 碼，到先前裝置的帳號管理設定，選擇 Ring 帳號來使用並選取「連結其他裝置到這個帳號」。您將會得到需要 PIN 碼來完成這份表單。PIN 僅在 10 分鐘內有效。或是您也可以從封存檔直接匯入您的帳號。"
 
-#: ui/accountcreationwizard.ui:164
+#: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
 msgstr "輸入您的 PIN 碼："
 
-#: ui/accountcreationwizard.ui:192
+#: ui/accountcreationwizard.ui:190
 msgid "Or import a file:"
 msgstr "或是匯入檔案："
 
-#: ui/accountcreationwizard.ui:211
+#: ui/accountcreationwizard.ui:209
 msgid "Enter your password:"
 msgstr "輸入您的密碼："
 
-#: ui/accountcreationwizard.ui:235 ui/accountcreationwizard.ui:536
+#: ui/accountcreationwizard.ui:231 ui/accountcreationwizard.ui:534
 msgid "Previous"
 msgstr "前一個"
 
-#: ui/accountcreationwizard.ui:243 ui/accountcreationwizard.ui:544
+#: ui/accountcreationwizard.ui:239 ui/accountcreationwizard.ui:542
 msgid "Next"
 msgstr "下一個"
 
-#: ui/accountcreationwizard.ui:275 ui/newaccountsettingsview.ui:334
+#: ui/accountcreationwizard.ui:273 ui/newaccountsettingsview.ui:334
 msgid "Profile"
 msgstr "設定檔"
 
-#: ui/accountcreationwizard.ui:356 ui/ringmainwindow.ui:109
+#: ui/accountcreationwizard.ui:354 ui/ringmainwindow.ui:109
 #: ui/newaccountsettingsview.ui:414
 msgid "Account"
 msgstr "帳號"
 
-#: ui/accountcreationwizard.ui:393
+#: ui/accountcreationwizard.ui:391
 msgid "Register username"
-msgstr ""
+msgstr "註冊使用者名稱"
 
-#: ui/accountcreationwizard.ui:394
+#: ui/accountcreationwizard.ui:392
 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 "透過勾選這個，您將會在 Ring 網路上註冊一個獨一無二的使用者名稱。人們可以使用它來聯絡您，而不必使用長達 40 個字元的您的 RingID。"
 
-#: ui/accountcreationwizard.ui:430 ui/newaccountsettingsview.ui:503
+#: ui/accountcreationwizard.ui:428 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:670
 #: src/accountgeneraltab.cpp:697
 msgid "Username"
 msgstr "使用者名稱"
 
-#: ui/accountcreationwizard.ui:458
+#: ui/accountcreationwizard.ui:456
 msgid ""
 "This password will be used to encrypt your account data and to link new "
 "devices to your account."
 msgstr "這個密碼將會用於加密您的帳號資料與連結新的裝置到您的帳號。"
 
-#: ui/accountcreationwizard.ui:497 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:495 src/newaccountsettingsview.cpp:873
 msgid "Confirm password"
 msgstr "確認密碼"
 
-#: ui/accountcreationwizard.ui:568
+#: ui/accountcreationwizard.ui:566
 msgid "Generating your Ring account..."
 msgstr "正在生成您的 Ring 帳號..."
 
-#: ui/accountcreationwizard.ui:594
+#: ui/accountcreationwizard.ui:592
 msgid "Registering username..."
 msgstr "正在註冊使用者名稱..."
 
-#: ui/accountcreationwizard.ui:601
+#: ui/accountcreationwizard.ui:599
 msgid "This may take a few minutes."
 msgstr "這將會耗費數分鐘。"
 
-#: ui/accountcreationwizard.ui:627
+#: ui/accountcreationwizard.ui:625
 msgid "Retrieving your Ring account..."
 msgstr "正在擷取您的 RIng 帳號..."
 
-#: ui/accountcreationwizard.ui:653
+#: ui/accountcreationwizard.ui:651
 msgid "Error creating/loading account."
 msgstr "建立／載入帳號時發生錯誤。"
 
-#: ui/accountcreationwizard.ui:658 ui/newaccountsettingsview.ui:266
+#: ui/accountcreationwizard.ui:656 ui/newaccountsettingsview.ui:266
 #: ui/newaccountsettingsview.ui:289
 msgid "OK"
 msgstr "確定"
@@ -283,42 +283,46 @@
 msgstr "啟用來電通知。"
 
 #: ui/generalsettingsview.ui:94
+msgid "Enable notifications for pending requests."
+msgstr "啟用擱置中請求的通知。"
+
+#: ui/generalsettingsview.ui:102
 msgid "Enable notifications for new chat messages."
 msgstr "啟用新聊天訊息通知。"
 
-#: ui/generalsettingsview.ui:102
+#: ui/generalsettingsview.ui:110
 msgid "Show images and videos in chat window."
 msgstr "在聊天室窗中顯示圖片與影片。"
 
-#: ui/generalsettingsview.ui:110
+#: ui/generalsettingsview.ui:118
 msgid "Entering a number in the search entry will place a new call."
 msgstr "在搜尋項目中輸入號碼將會打一通新電話。"
 
-#: ui/generalsettingsview.ui:123
+#: ui/generalsettingsview.ui:131
 msgid "Download folder:"
 msgstr "下載資料夾："
 
-#: ui/generalsettingsview.ui:150
+#: ui/generalsettingsview.ui:158
 msgid "Show chat on the right."
 msgstr "在右邊顯示聊天。"
 
-#: ui/generalsettingsview.ui:156
+#: ui/generalsettingsview.ui:164
 msgid "Show chat on the bottom."
 msgstr "在底部顯示聊天。"
 
-#: ui/generalsettingsview.ui:180
+#: ui/generalsettingsview.ui:188
 msgid "History Settings"
 msgstr "記錄設定"
 
-#: ui/generalsettingsview.ui:198
+#: ui/generalsettingsview.ui:206
 msgid "Keep history for (days):"
 msgstr "保持記錄數日"
 
-#: ui/generalsettingsview.ui:219
+#: ui/generalsettingsview.ui:227
 msgid "(set to 0 for unlimited history)"
 msgstr "(設定0 表示無限制記錄)"
 
-#: ui/generalsettingsview.ui:229
+#: ui/generalsettingsview.ui:237
 msgid "Clear all history"
 msgstr "清除所有記錄"
 
@@ -334,7 +338,7 @@
 msgid "Media"
 msgstr "媒體"
 
-#: ui/ringmainwindow.ui:145
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1514
 msgid "Settings"
 msgstr "設定"
 
@@ -435,19 +439,19 @@
 
 #: ui/newaccountsettingsview.ui:538
 msgid "Click to change password"
-msgstr ""
+msgstr "點選以變更密碼"
 
-#: ui/newaccountsettingsview.ui:566
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1995
 msgid "Export account"
 msgstr "匯出帳號"
 
 #: ui/newaccountsettingsview.ui:618 ui/newaccountsettingsview.ui:908
 msgid "Enable account"
-msgstr ""
+msgstr "啟用帳號"
 
 #: ui/newaccountsettingsview.ui:697
 msgid "SIP server"
-msgstr ""
+msgstr "SIP 伺服器"
 
 #: ui/newaccountsettingsview.ui:781
 msgid "password"
@@ -460,7 +464,7 @@
 
 #: ui/newaccountsettingsview.ui:848
 msgid "Voicemail"
-msgstr ""
+msgstr "語音信箱"
 
 #: ui/newaccountsettingsview.ui:959
 msgid "Known devices linked to this Ring account"
@@ -468,11 +472,11 @@
 
 #: ui/newaccountsettingsview.ui:967
 msgid "Link another device"
-msgstr ""
+msgstr "連結其他裝置"
 
 #: ui/newaccountsettingsview.ui:1032
 msgid "Banned contacts"
-msgstr ""
+msgstr "已被阻擋的連絡人"
 
 #: ui/newaccountsettingsview.ui:1088
 msgid "Advanced settings"
@@ -480,27 +484,27 @@
 
 #: ui/newaccountsettingsview.ui:1128
 msgid "General settings"
-msgstr ""
+msgstr "一般設定"
 
 #: ui/newaccountsettingsview.ui:1146
 msgid "Call settings"
-msgstr ""
+msgstr "通話設定"
 
 #: ui/newaccountsettingsview.ui:1184
 msgid "Allow call from untrusted peers"
-msgstr ""
+msgstr "允許從不被信任的他人而來的通話"
 
 #: ui/newaccountsettingsview.ui:1219
 msgid "Auto answer calls"
-msgstr ""
+msgstr "自動回覆通話"
 
 #: ui/newaccountsettingsview.ui:1255
 msgid "Custom ringtone"
-msgstr ""
+msgstr "自訂鈴聲"
 
 #: ui/newaccountsettingsview.ui:1299
 msgid "Name server"
-msgstr ""
+msgstr "名稱伺服器"
 
 #: ui/newaccountsettingsview.ui:1336 ui/newaccountsettingsview.ui:2489
 msgid "Address"
@@ -508,7 +512,7 @@
 
 #: ui/newaccountsettingsview.ui:1370
 msgid "OpenDHT configuration"
-msgstr ""
+msgstr "OpenDHT 設定"
 
 #: ui/newaccountsettingsview.ui:1454
 msgid "Bootstrap"
@@ -520,7 +524,7 @@
 
 #: ui/newaccountsettingsview.ui:1549
 msgid "Enable SDES for key exchange protocol"
-msgstr ""
+msgstr "啟用 SDES 以供金鑰交換協定使用"
 
 #: ui/newaccountsettingsview.ui:1585
 msgid "Fallback on RTP on encryption failure"
@@ -576,15 +580,15 @@
 
 #: ui/newaccountsettingsview.ui:2027
 msgid "Connectivity"
-msgstr ""
+msgstr "連線"
 
 #: ui/newaccountsettingsview.ui:2065
 msgid "Registration expire timeout (seconds)"
-msgstr ""
+msgstr "註冊過期逾時（秒）"
 
 #: ui/newaccountsettingsview.ui:2102
 msgid "Network interface"
-msgstr ""
+msgstr "網路介面"
 
 #: ui/newaccountsettingsview.ui:2138
 msgid "UPnP"
@@ -596,19 +600,19 @@
 
 #: ui/newaccountsettingsview.ui:2208
 msgid "(TURN) address"
-msgstr ""
+msgstr "(TURN) 地址"
 
 #: ui/newaccountsettingsview.ui:2243
 msgid "(TURN) username"
-msgstr ""
+msgstr "(TURN) 使用者名稱"
 
 #: ui/newaccountsettingsview.ui:2277
 msgid "(TURN) password"
-msgstr ""
+msgstr "(TURN) 密碼"
 
 #: ui/newaccountsettingsview.ui:2314
 msgid "(TURN) realm"
-msgstr ""
+msgstr "(TURN) 範圍"
 
 #: ui/newaccountsettingsview.ui:2348
 msgid "Use STUN"
@@ -616,15 +620,15 @@
 
 #: ui/newaccountsettingsview.ui:2383
 msgid "(STUN) address"
-msgstr ""
+msgstr "(STUN) 地址"
 
 #: ui/newaccountsettingsview.ui:2416
 msgid "Published address"
-msgstr ""
+msgstr "已發佈的地址"
 
 #: ui/newaccountsettingsview.ui:2453
 msgid "Use custom address and port"
-msgstr ""
+msgstr "使用自訂地址與通訊埠"
 
 #: ui/newaccountsettingsview.ui:2524
 msgid "Port"
@@ -636,7 +640,7 @@
 
 #: ui/newaccountsettingsview.ui:2623
 msgid "Enable video"
-msgstr ""
+msgstr "啟用視訊"
 
 #: ui/newaccountsettingsview.ui:2650
 msgid "Audio codecs"
@@ -648,27 +652,27 @@
 
 #: ui/newaccountsettingsview.ui:2732
 msgid "Only used during SDP negotiation in case ICE is not supported."
-msgstr ""
+msgstr "僅在 SDP 協商期間使用，以防不支援 ICE。"
 
 #: ui/newaccountsettingsview.ui:2766
 msgid "Audio RTP Min port"
-msgstr ""
+msgstr "音訊 RTP 最小通訊埠"
 
 #: ui/newaccountsettingsview.ui:2801
 msgid "Audio RTP Max port"
-msgstr ""
+msgstr "音訊 RTP 最大通訊埠"
 
 #: ui/newaccountsettingsview.ui:2836
 msgid "Video RTP Min port"
-msgstr ""
+msgstr "視訊 RTP 最小通訊埠"
 
 #: ui/newaccountsettingsview.ui:2871
 msgid "Video RTP Max port"
-msgstr ""
+msgstr "視訊 RTP 最大通訊埠"
 
 #: ui/usernameregistrationbox.ui:28
 msgid "register username"
-msgstr ""
+msgstr "註冊使用者名稱"
 
 #: ui/chatview.ui:19 ui/chatview.ui:22
 msgid "Hide chat view"
@@ -718,7 +722,7 @@
 msgid "Set selection as image"
 msgstr "設定選擇為圖片"
 
-#: src/ring_client.cpp:146
+#: src/ring_client.cpp:143
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -726,38 +730,43 @@
 "Error: %s"
 msgstr "無法初始化。\n請確定 Ring 幕後程式 (dring) 正在執行。\n錯誤：%s"
 
-#: src/ring_client.cpp:149
+#: src/ring_client.cpp:146
 msgid "Ring Error"
 msgstr "Ring 錯誤"
 
-#: src/ring_client.cpp:292
+#: src/ring_client.cpp:289
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Ring main window"
 msgid "Show Ring"
 msgstr "顯示 Ring"
 
-#: src/ring_client.cpp:296
+#: src/ring_client.cpp:293
 msgid "Quit"
 msgstr "結束"
 
-#: src/ringnotify.cpp:156
-msgid "Incoming call"
-msgstr "來電"
+#: src/ringnotify.cpp:347
+msgctxt ""
+msgid "Open conversation"
+msgstr "開啟對話"
 
-#: src/ringnotify.cpp:173 src/ringnotify.cpp:351
-msgctxt "notification action name"
-msgid "Show"
-msgstr "顯示"
+#: src/ringnotify.cpp:355 src/ringnotify.cpp:371
+msgctxt ""
+msgid "Accept"
+msgstr "接聽"
 
-#: src/ringnotify.cpp:275
-#, c-format
-msgctxt "Text message notification"
-msgid "%s says:"
-msgstr "%s 說："
+#: src/ringnotify.cpp:362
+msgctxt ""
+msgid "Refuse"
+msgstr "拒絕"
+
+#: src/ringnotify.cpp:378
+msgctxt ""
+msgid "Decline"
+msgstr "拒絕"
 
 #: src/usernameregistrationbox.cpp:164 src/usernameregistrationbox.cpp:187
 msgid "Register this username on the name server"
-msgstr ""
+msgstr "在名稱伺服器上註冊這個使用者名稱"
 
 #: src/usernameregistrationbox.cpp:173
 msgid "Username already taken"
@@ -769,34 +778,34 @@
 
 #: src/usernameregistrationbox.cpp:194
 msgid "Lookup unavailable, check your network connection"
-msgstr ""
+msgstr "查詢不可用，檢查您的網錄連線"
 
 #: src/usernameregistrationbox.cpp:274
 msgid "Performing lookup..."
-msgstr ""
+msgstr "正在執行查詢……"
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress..."
-msgstr ""
+msgstr "註冊進行中……"
 
-#: src/generalsettingsview.cpp:106
+#: src/generalsettingsview.cpp:107
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "這是一個破壞性的操作。您確定您想要刪除您所有的聊天與通話紀錄嗎？"
 
-#: src/generalsettingsview.cpp:176
+#: src/generalsettingsview.cpp:177
 msgid "Choose download folder"
 msgstr "選擇下載資料夾"
 
-#: src/generalsettingsview.cpp:179 src/accountgeneraltab.cpp:343
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:175
+#: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:343
+#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:926
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/generalsettingsview.cpp:181 src/accountgeneraltab.cpp:345
-#: src/chatview.cpp:177 src/newaccountsettingsview.cpp:928
+#: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:345
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -809,15 +818,15 @@
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1701
+#: src/accountgeneraltab.cpp:240 src/newaccountsettingsview.cpp:1705
 msgid "Bad password"
 msgstr "密碼錯誤"
 
-#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1707
+#: src/accountgeneraltab.cpp:246 src/newaccountsettingsview.cpp:1711
 msgid "Network error, try again"
 msgstr "網路錯誤，請重試"
 
-#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1725
+#: src/accountgeneraltab.cpp:258 src/newaccountsettingsview.cpp:1729
 msgid "Could not initiate export to the Ring, try again"
 msgstr "無法啟用輸出到 Ring，請重試。"
 
@@ -827,7 +836,7 @@
 msgid "Change password"
 msgstr "變更密碼"
 
-#: src/accountgeneraltab.cpp:340 src/chatview.cpp:172
+#: src/accountgeneraltab.cpp:340 src/chatview.cpp:175
 #: src/newaccountsettingsview.cpp:923
 msgid "Save File"
 msgstr "儲存檔案"
@@ -890,11 +899,11 @@
 msgid "Voicemail number"
 msgstr "語音郵件號碼"
 
-#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1784
+#: src/accountgeneraltab.cpp:800 src/newaccountsettingsview.cpp:1788
 msgid "Error: wrong password!"
 msgstr "錯誤：不正確的密碼！"
 
-#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1787
+#: src/accountgeneraltab.cpp:803 src/newaccountsettingsview.cpp:1791
 msgid "Error: unknown device!"
 msgstr "錯誤：未知的裝置！"
 
@@ -918,7 +927,7 @@
 msgid "Open Avatar Image"
 msgstr "開啟大頭貼圖片"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:177
+#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -930,9 +939,9 @@
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"In varietate concordia\"\n"
+"\"Live Free or Die\"\n"
 "built on %.25s"
-msgstr "\"In varietate concordia\"\n建構於 %.25s"
+msgstr "\"Live Free or Die\"\n構建於 %.25s"
 
 #: src/dialogs.c:137
 msgid ""
@@ -940,27 +949,51 @@
 "Ring is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr "Ring 的 GNOME 客戶端。\nRing 是一套通用通訊的自由軟體，其尊重使用者的自由與隱私。"
 
-#: src/ringmainwindow.cpp:166
+#: src/ringmainwindow.cpp:175
 msgid "Add account..."
-msgstr ""
+msgstr "新增帳號……"
 
-#: src/ringmainwindow.cpp:624
+#: src/ringmainwindow.cpp:646
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "開始通話"
 
-#: src/ringmainwindow.cpp:627
+#: src/ringmainwindow.cpp:649
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "開啟聊天"
 
-#: src/ringmainwindow.cpp:916
+#: src/ringmainwindow.cpp:1069
 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/ringmainwindow.cpp:1487
+msgid "Leave settings page"
+msgstr "離開設定頁面"
+
+#: src/ringmainwindow.cpp:1834
+msgid " is calling you!"
+msgstr "正在與您通話！"
+
+#: src/ringmainwindow.cpp:1835
+msgid "Incoming call"
+msgstr "來電"
+
+#: src/ringmainwindow.cpp:1980
+msgid "New request from "
+msgstr "新請求從"
+
+#: src/ringmainwindow.cpp:1981
+msgid "Trust request"
+msgstr "信任請求"
+
+#: src/ringmainwindow.cpp:2038
+msgid "New message"
+msgstr "新訊息"
+
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Ring Error"
@@ -1030,7 +1063,7 @@
 msgid "- GNOME client for Ring"
 msgstr "- Ring 的 GNOME 用戶端"
 
-#: src/accountcreationwizard.cpp:355
+#: src/accountcreationwizard.cpp:354
 msgid "Passwords don't match"
 msgstr "密碼不相符"
 
@@ -1058,7 +1091,7 @@
 msgid "Ring ID QR code"
 msgstr "Ring ID QR code"
 
-#: src/chatview.cpp:172
+#: src/chatview.cpp:175
 msgid "Send File"
 msgstr "傳送檔案"
 
@@ -1066,28 +1099,28 @@
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
-msgstr ""
+msgstr "警告！此動作將會在此裝置上移除此帳號！\n注意：此動作無法復原。同時，您已註冊的名稱也將會遺失！"
 
-#: src/currentcallview.cpp:952
+#: src/currentcallview.cpp:934
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "自動"
 
 #: src/newaccountsettingsview.cpp:679
 msgid "Edit name"
-msgstr ""
+msgstr "編輯名稱"
 
 #: src/newaccountsettingsview.cpp:774
 msgid "Unban"
-msgstr ""
+msgstr "取消阻擋"
 
 #: src/newaccountsettingsview.cpp:810
 msgid "New password and its confirmation are different!"
-msgstr ""
+msgstr "新密碼與其確認密碼不相符！"
 
 #: src/newaccountsettingsview.cpp:821
 msgid "Incorrect password!"
-msgstr ""
+msgstr "不正確的密碼！"
 
 #: src/newaccountsettingsview.cpp:858
 msgid "Note: this will change the password only on this device."
@@ -1103,40 +1136,40 @@
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Account exported!"
-msgstr ""
+msgstr "帳號已匯出！"
 
 #: src/newaccountsettingsview.cpp:947
 msgid "Export account failure."
-msgstr ""
+msgstr "匯出帳號失敗。"
 
-#: src/newaccountsettingsview.cpp:1713
+#: src/newaccountsettingsview.cpp:1717
 msgid "Unknown error"
 msgstr "未知的錯誤"
 
-#: src/newaccountsettingsview.cpp:1959
+#: src/newaccountsettingsview.cpp:1962
 msgid "Initializing..."
-msgstr ""
+msgstr "正在初始化……"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1965
 msgid "Offline"
 msgstr "離線"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1968
 msgid "Connecting..."
-msgstr ""
+msgstr "正在連線……"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1971
 msgid "Online"
 msgstr "線上"
 
-#: src/newaccountsettingsview.cpp:1972
+#: src/newaccountsettingsview.cpp:1975
 msgid "Unknown status"
-msgstr ""
+msgstr "未知狀態"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "••••••••"
-msgstr ""
+msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2001
+#: src/newaccountsettingsview.cpp:2006
 msgid "no password set"
-msgstr ""
+msgstr "未設定密碼"
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/accountcreationwizard.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/accountcreationwizard.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/accountcreationwizard.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/accountcreationwizard.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -24,7 +24,6 @@
 
 // LRC
 #include <account.h>
-#include <codecmodel.h>
 #include <profilemodel.h>
 #include <profile.h>
 #include <accountmodel.h>
@@ -39,12 +38,12 @@
 
 struct _AccountCreationWizard
 {
-    GtkBox parent;
+    GtkScrolledWindow parent;
 };
 
 struct _AccountCreationWizardClass
 {
-    GtkBoxClass parent_class;
+    GtkScrolledWindowClass parent_class;
 };
 
 typedef struct _AccountCreationWizardPrivate AccountCreationWizardPrivate;
@@ -107,7 +106,7 @@
 
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE(AccountCreationWizard, account_creation_wizard, GTK_TYPE_BOX);
+G_DEFINE_TYPE_WITH_PRIVATE(AccountCreationWizard, account_creation_wizard, GTK_TYPE_SCROLLED_WINDOW);
 
 #define ACCOUNT_CREATION_WIZARD_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ACCOUNT_CREATION_WIZARD_TYPE, AccountCreationWizardPrivate))
 
@@ -388,6 +387,12 @@
 show_choose_account_type(AccountCreationWizard *view)
 {
     AccountCreationWizardPrivate *priv = ACCOUNT_CREATION_WIZARD_GET_PRIVATE(view);
+
+    /* Make sure other stack elements are hidden, otherwise their width will prevent
+       the window to be correctly resized at this stage. */
+    gtk_widget_hide(priv->account_creation);
+    gtk_widget_hide(priv->existing_account);
+
     gtk_stack_set_visible_child(GTK_STACK(priv->stack_account_creation), priv->choose_account_type_vbox);
 }
 
@@ -403,6 +408,8 @@
 show_existing_account(AccountCreationWizard *view)
 {
     AccountCreationWizardPrivate *priv = ACCOUNT_CREATION_WIZARD_GET_PRIVATE(view);
+
+    gtk_widget_show(priv->existing_account);
     gtk_stack_set_visible_child(GTK_STACK(priv->stack_account_creation), priv->existing_account);
 }
 
@@ -606,6 +613,13 @@
 {
     AccountCreationWizardPrivate *priv = ACCOUNT_CREATION_WIZARD_GET_PRIVATE(win);
 
+    if (priv->account_creation) {
+        if (show_preview)
+            gtk_widget_show(priv->account_creation);
+        else
+            gtk_widget_hide(priv->account_creation);
+    }
+
     /* Similarily to general settings view, we construct and destroy the avatar manipulation widget
        each time the profile is made visible / hidden. While not the most elegant solution, this
        allows us to run the preview if and only if it is displayed, and always stop it when hidden. */
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/avatarmanipulation.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/avatarmanipulation.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/avatarmanipulation.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/avatarmanipulation.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -219,7 +219,7 @@
 static void
 set_state(AvatarManipulation *self, AvatarManipulationState state)
 {
-    // note: this funciton does not check if the state transition is valid, this is assumed to have
+    // note: this function does not check if the state transition is valid, this is assumed to have
     // been done by the caller
     AvatarManipulationPrivate *priv = AVATAR_MANIPULATION_GET_PRIVATE(self);
 
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/chatview.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/chatview.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/chatview.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/chatview.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -25,6 +25,7 @@
 
 // std
 #include <algorithm>
+#include <fstream>
 
 // GTK
 #include <glib/gi18n.h>
@@ -236,7 +237,7 @@
                 lrc::api::datatransfer::Info info = {};
                 (*priv->accountInfo_)->conversationModel->getTransferInfo(interactionId, info);
 
-                // get prefered directory destination.
+                // get preferred directory destination.
                 auto* download_directory_variant = g_settings_get_value(priv->settings, "download-folder");
                 char* download_directory_value;
                 g_variant_get(download_directory_variant, "&s", &download_directory_value);
@@ -248,9 +249,13 @@
                 // get full path
                 std::string filename = current_value.empty()? default_download_dir.c_str() : download_directory_value;
                 if (!filename.empty() && filename.back() != '/') filename += "/";
-                filename += info.displayName;
-
-                model->acceptTransfer(priv->conversation_->uid, interactionId, filename);
+                auto wantedFilename = filename + info.displayName;
+                auto duplicate = 0;
+                while (std::ifstream(wantedFilename).good()) {
+                    wantedFilename = filename + "(" + std::to_string(duplicate) + ")" + info.displayName;
+                    ++duplicate;
+                }
+                model->acceptTransfer(priv->conversation_->uid, interactionId, wantedFilename);
             } catch (...) {
                 // ignore
             }
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/conversationsview.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/conversationsview.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/conversationsview.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/conversationsview.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -241,8 +241,8 @@
                 std::time_t now = std::time(nullptr);
                 char interactionDay[100];
                 char nowDay[100];
-                std::strftime(interactionDay, sizeof(interactionDay), "%D", std::localtime(&lastInteractionTimestamp));
-                std::strftime(nowDay, sizeof(nowDay), "%D", std::localtime(&now));
+                std::strftime(interactionDay, sizeof(interactionDay), "%x", std::localtime(&lastInteractionTimestamp));
+                std::strftime(nowDay, sizeof(nowDay), "%x", std::localtime(&now));
 
                 if (std::string(interactionDay) == std::string(nowDay)) {
                     char interactionTime[100];
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/currentcallview.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/currentcallview.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/currentcallview.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/currentcallview.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -25,13 +25,11 @@
 #include <glib/gi18n.h>
 
 // Lrc
-#include <account.h>
 #include <api/conversationmodel.h>
 #include <api/contact.h>
 #include <api/contactmodel.h>
 #include <api/newcallmodel.h>
-#include <callmodel.h>
-#include <codecmodel.h>
+#include <api/newcodecmodel.h>
 #include <globalinstances.h>
 #include <smartinfohub.h>
 #include <video/previewmanager.h>
@@ -187,47 +185,6 @@
     return scale;
 }
 
-static void
-set_call_quality(Call& call, bool auto_quality_on, double desired_quality)
-{
-    /* set auto quality true or false, also set the bitrate and quality values;
-     * the slider is from 0 to 100, use the min and max vals to scale each value accordingly */
-    if (const auto& codecModel = call.account()->codecModel()) {
-        const auto& videoCodecs = codecModel->videoCodecs();
-
-        for (int i=0; i < videoCodecs->rowCount();i++) {
-            const auto& idx = videoCodecs->index(i,0);
-
-            if (auto_quality_on) {
-                // g_debug("enable auto quality");
-                videoCodecs->setData(idx, "true", CodecModel::Role::AUTO_QUALITY_ENABLED);
-            } else {
-                auto min_bitrate = idx.data(static_cast<int>(CodecModel::Role::MIN_BITRATE)).toInt();
-                auto max_bitrate = idx.data(static_cast<int>(CodecModel::Role::MAX_BITRATE)).toInt();
-                auto min_quality = idx.data(static_cast<int>(CodecModel::Role::MIN_QUALITY)).toInt();
-                auto max_quality = idx.data(static_cast<int>(CodecModel::Role::MAX_QUALITY)).toInt();
-
-                // g_debug("bitrate min: %d, max: %d, quality min: %d, max: %d", min_bitrate, max_bitrate, min_quality, max_quality);
-
-                double bitrate;
-                bitrate = min_bitrate + (double)(max_bitrate - min_bitrate)*(desired_quality/100.0);
-                if (bitrate < 0) bitrate = 0;
-
-                double quality;
-                // note: a lower value means higher quality
-                quality = (double)min_quality - (min_quality - max_quality)*(desired_quality/100.0);
-                if (quality < 0) quality = 0;
-
-                // g_debug("disable auto quality; %% quality: %d; bitrate: %d; quality: %d", (int)desired_quality, (int)bitrate, (int)quality);
-                videoCodecs->setData(idx, "false", CodecModel::Role::AUTO_QUALITY_ENABLED);
-                videoCodecs->setData(idx, QString::number((int)bitrate), CodecModel::Role::BITRATE);
-                videoCodecs->setData(idx, QString::number((int)quality), CodecModel::Role::QUALITY);
-            }
-        }
-        codecModel << CodecModel::EditAction::SAVE;
-    }
-}
-
 } // namespace
 
 class CppImpl
@@ -286,6 +243,40 @@
 {
 
 static void
+set_call_quality(CurrentCallView* view, bool auto_quality_on, double desired_quality)
+{
+    auto* priv = CURRENT_CALL_VIEW_GET_PRIVATE(view);
+
+    auto videoCodecs = (*priv->cpp->accountInfo)->codecModel->getVideoCodecs();
+    for (const auto& codec : videoCodecs) {
+        if (auto_quality_on) {
+            (*priv->cpp->accountInfo)->codecModel->autoQuality(codec.id, true);
+        } else {
+            (*priv->cpp->accountInfo)->codecModel->autoQuality(codec.id, false);
+            double min_bitrate = 0., max_bitrate = 0., min_quality = 0., max_quality = 0.;
+            try {
+                min_bitrate = std::stoi(codec.min_bitrate);
+                max_bitrate = std::stoi(codec.max_bitrate);
+                min_quality = std::stoi(codec.min_quality);
+                max_quality = std::stoi(codec.max_quality);
+            } catch (...) {
+                g_error("Cannot convert a codec value to an int, abort");
+                break;
+            }
+
+            double bitrate = min_bitrate + (max_bitrate - min_bitrate)*(desired_quality/100.0);
+            if (bitrate < 0) bitrate = 0;
+            (*priv->cpp->accountInfo)->codecModel->bitrate(codec.id, bitrate);
+
+            // note: a lower value means higher quality
+            double quality = min_quality - (min_quality - max_quality)*(desired_quality/100.0);
+            if (quality < 0) quality = 0;
+            (*priv->cpp->accountInfo)->codecModel->quality(codec.id, quality);
+        }
+    }
+}
+
+static void
 on_new_chat_interactions(CurrentCallView* view)
 {
     g_return_if_fail(IS_CURRENT_CALL_VIEW(view));
@@ -434,7 +425,7 @@
         }
     }
 
-    return FALSE; // propogate event
+    return FALSE; // propagate event
 }
 
 static void
@@ -455,14 +446,7 @@
 
     double desired_quality = gtk_scale_button_get_value(GTK_SCALE_BUTTON(priv->scalebutton_quality));
 
-    auto callToRender = priv->cpp->conversation->callId;
-    if (!priv->cpp->conversation->confId.empty())
-        callToRender = priv->cpp->conversation->confId;
-    auto renderer = (*priv->cpp->accountInfo)->callModel->getRenderer(callToRender);
-    for (auto* activeCall: CallModel::instance().getActiveCalls()) {
-        if (activeCall and activeCall->videoRenderer() == renderer)
-            set_call_quality(*activeCall, auto_quality_on, desired_quality);
-    }
+    set_call_quality(view, auto_quality_on, desired_quality);
 }
 
 static void
@@ -478,13 +462,7 @@
     /* only update if the scale button is released, to reduce the number of updates */
     if (priv->cpp->quality_scale_pressed) return;
 
-    auto callToRender = priv->cpp->conversation->callId;
-    if (!priv->cpp->conversation->confId.empty())
-        callToRender = priv->cpp->conversation->confId;
-    auto renderer = (*priv->cpp->accountInfo)->callModel->getRenderer(callToRender);
-    for (auto* activeCall: CallModel::instance().getActiveCalls())
-        if (activeCall and activeCall->videoRenderer() == renderer)
-            set_call_quality(*activeCall, false, gtk_scale_button_get_value(button));
+    set_call_quality(view, false, gtk_scale_button_get_value(button));
 }
 
 static gboolean
@@ -532,7 +510,7 @@
         return TRUE;
     }
 
-    // did not select the next child, propogate the event
+    // did not select the next child, propagate the event
     return FALSE;
 }
 
@@ -963,35 +941,15 @@
         g_signal_connect(scale, "button-release-event", G_CALLBACK(on_quality_button_released), self);
     }
 
-    /* by this time we should have the call already set, but we check to make sure */
-    auto callToRender = conversation->callId;
-    if (!conversation->confId.empty())
-        callToRender = conversation->confId;
-    auto renderer = (*accountInfo)->callModel->getRenderer(callToRender);
-    for (auto* activeCall: CallModel::instance().getActiveCalls())
-        if (activeCall and activeCall->videoRenderer() == renderer) {
-            g_signal_connect(widgets->video_widget, "drag-data-received",
-                             G_CALLBACK(video_widget_on_drag_data_received), activeCall);
-            /* check if auto quality is enabled or not */
-            if (const auto& codecModel = activeCall->account()->codecModel()) {
-                const auto& videoCodecs = codecModel->videoCodecs();
-                if (videoCodecs->rowCount() > 0) {
-                    /* we only need to check the first codec since by default it is ON for all, and the
-                     * gnome client sets its ON or OFF for all codecs as well */
-                    const auto& idx = videoCodecs->index(0,0);
-                    auto auto_quality_enabled = idx.data(static_cast<int>(CodecModel::Role::AUTO_QUALITY_ENABLED)).toString() == "true";
-                    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->checkbutton_autoquality),
-                                                 auto_quality_enabled);
-
-                    // TODO: save the manual quality setting in the client and set the slider to that value here;
-                    //       the daemon resets the bitrate/quality between each call, and the default may be
-                    //       different for each codec, so there is no reason to check it here
-                }
-            }
-        } else {
-            /* Auto-quality is off by default */
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->checkbutton_autoquality), FALSE);
-        }
+    auto videoCodecs = (*accountInfo)->codecModel->getVideoCodecs();
+    if (!videoCodecs.empty()) {
+        bool autoQualityEnabled = videoCodecs.front().auto_quality_enabled;
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->checkbutton_autoquality),
+                                     autoQualityEnabled);
+    } else {
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->checkbutton_autoquality),
+                                     false);
+    }
 
     // Get if the user wants to show the smartInfo box
     auto display_smartinfo = g_action_map_lookup_action(G_ACTION_MAP(g_application_get_default()),
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/dialogs.c ring-20180816.2.e26b79f~ds1/client-gnome/src/dialogs.c
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/dialogs.c	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/dialogs.c	2018-08-16 15:09:41.000000000 +0000
@@ -81,7 +81,7 @@
     }
 
     gchar *version = g_strdup_printf(C_("Do not translate the release name nor the status (beta, final, ...)",
-                                        "\"In varietate concordia\"\nbuilt on %.25s"),
+                                        "\"Live Free or Die\"\nbuilt on %.25s"),
                                      RING_CLIENT_BUILD_DATE);
 
     const gchar *authors[] = {
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/generalsettingsview.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/generalsettingsview.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/generalsettingsview.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/generalsettingsview.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -59,6 +59,7 @@
     GtkWidget *checkbutton_showstatusicon;
     GtkWidget *checkbutton_bringtofront;
     GtkWidget *checkbutton_callnotifications;
+    GtkWidget *checkbutton_pendingnotifications;
     GtkWidget *checkbutton_chatnotifications;
     GtkWidget *checkbutton_chatdisplaylinks;
     GtkWidget *checkbutton_searchentryplacescall;
@@ -223,6 +224,9 @@
     g_settings_bind(priv->settings, "enable-display-links",
                     priv->checkbutton_chatdisplaylinks, "active",
                     G_SETTINGS_BIND_DEFAULT);
+    g_settings_bind(priv->settings, "enable-pending-notifications",
+                    priv->checkbutton_pendingnotifications, "active",
+                    G_SETTINGS_BIND_DEFAULT);
     g_settings_bind(priv->settings, "enable-chat-notifications",
                     priv->checkbutton_chatnotifications, "active",
                     G_SETTINGS_BIND_DEFAULT);
@@ -316,6 +320,7 @@
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_bringtofront);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_callnotifications);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_chatdisplaylinks);
+    gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_pendingnotifications);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_chatnotifications);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_searchentryplacescall);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, radiobutton_chatright);
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/newaccountsettingsview.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/newaccountsettingsview.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/newaccountsettingsview.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/newaccountsettingsview.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -914,7 +914,7 @@
 {
     g_return_if_fail(IS_NEW_ACCOUNT_SETTINGS_VIEW(view));
     auto* priv = NEW_ACCOUNT_SETTINGS_VIEW_GET_PRIVATE(view);
-    // Get prefered path
+    // Get preferred path
     GtkWidget* dialog;
     GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SAVE;
     gint res;
@@ -1876,7 +1876,6 @@
     g_signal_connect(priv->entry_sip_username, "focus-out-event", G_CALLBACK(update_sip_username), view);
     g_signal_connect(priv->entry_sip_password, "focus-out-event", G_CALLBACK(update_sip_password), view);
     g_signal_connect(priv->entry_sip_proxy, "focus-out-event", G_CALLBACK(update_sip_proxy), view);
-    g_signal_connect(priv->entry_sip_password, "focus-out-event", G_CALLBACK(update_sip_password), view);
     g_signal_connect_swapped(priv->button_export_account, "clicked", G_CALLBACK(choose_export_file), view);
     g_signal_connect_swapped(priv->button_delete_account, "clicked", G_CALLBACK(remove_account), view);
     g_signal_connect_swapped(priv->sip_button_delete_account, "clicked", G_CALLBACK(remove_account), view);
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/ring_client.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/ring_client.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/ring_client.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/ring_client.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -119,9 +119,6 @@
     NMClient *nm_client;
     NMActiveConnection *primary_connection;
 #endif
-
-    /* notifications */
-    QMetaObject::Connection call_notification;
 };
 
 /* this union is used to pass ints as pointers and vice versa for GAction parameters*/
@@ -256,9 +253,9 @@
         /* we want to simply hide the window and keep the client running */
         ring_window_hide(client);
         ring_main_window_reset(RING_MAIN_WINDOW(window));
-        return TRUE; /* do not propogate event */
+        return TRUE; /* do not propagate event */
     } else {
-        /* we want to quit the application, so just propogate the event */
+        /* we want to quit the application, so just propagate the event */
         return FALSE;
     }
 }
@@ -458,22 +455,6 @@
 #endif /* USE_LIBNM */
 
 static void
-call_notifications_toggled(RingClient *self)
-{
-    auto priv = RING_CLIENT_GET_PRIVATE(self);
-
-    if (g_settings_get_boolean(priv->settings, "enable-call-notifications")) {
-        priv->call_notification = QObject::connect(
-            &CallModel::instance(),
-            &CallModel::incomingCall,
-            [] (Call *call) { ring_notify_incoming_call(call); }
-        );
-    } else {
-        QObject::disconnect(priv->call_notification);
-    }
-}
-
-static void
 ring_client_startup(GApplication *app)
 {
     // TODO still use old LRC models, in the future, we will init the LRC here.
@@ -491,7 +472,7 @@
     int clutter_error;
     if ((clutter_error = gtk_clutter_init(&priv->argc, &priv->argv)) != CLUTTER_INIT_SUCCESS) {
         g_error("Could not init clutter : %d\n", clutter_error);
-        exit(1); /* the g_error above should normally cause the applicaiton to exit */
+        exit(1); /* the g_error above should normally cause the application to exit */
     }
 
     /* init libRingClient and make sure its connected to the dbus */
@@ -590,12 +571,6 @@
                 ring_window_show(client);
         }
     );
-
-    /* enable notifications based on settings */
-    ring_notify_init();
-    call_notifications_toggled(client);
-    g_signal_connect_swapped(priv->settings, "changed::enable-call-notifications", G_CALLBACK(call_notifications_toggled), client);
-
 #if USE_LIBNM
      /* monitor the network using libnm to notify the daemon about connectivity chagnes */
      nm_client_new_async(priv->cancellable, (GAsyncReadyCallback)nm_client_cb, client);
@@ -617,7 +592,6 @@
     g_object_unref(priv->cancellable);
 
     QObject::disconnect(priv->uam_updated);
-    QObject::disconnect(priv->call_notification);
 
     /* free the QCoreApplication, which will destroy all libRingClient models
      * and thus send the Unregister signal over dbus to dring */
@@ -631,8 +605,6 @@
 
     g_clear_object(&priv->settings);
 
-    ring_notify_uninit();
-
 #if USE_LIBNM
     /* clear NetworkManager client if it was used */
     g_clear_object(&priv->nm_client);
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/ringmainwindow.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/ringmainwindow.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/ringmainwindow.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/ringmainwindow.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -23,7 +23,8 @@
 // GTK+ related
 #include <glib/gi18n.h>
 
-#include <iostream>
+// std
+#include <algorithm>
 
 // LRC
 #include <accountmodel.h> // Old lrc but still used
@@ -62,6 +63,7 @@
 #include "ringnotify.h"
 #include "accountinfopointer.h"
 #include "native/pixbufmanipulator.h"
+#include "ringnotify.h"
 
 //==============================================================================
 
@@ -111,11 +113,18 @@
     GtkWidget *scrolled_window_contact_requests;
     GtkWidget *webkit_chat_container; ///< The webkit_chat_container is created once, then reused for all chat views
 
+    GtkWidget *notifier;
+
     GSettings *settings;
 
     details::CppImpl* cpp; ///< Non-UI and C++ only code
 
     gulong update_download_folder;
+    gulong notif_chat_view;
+    gulong notif_accept_pending;
+    gulong notif_refuse_pending;
+    gulong notif_accept_call;
+    gulong notif_decline_call;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE(RingMainWindow, ring_main_window, GTK_TYPE_APPLICATION_WINDOW);
@@ -282,7 +291,7 @@
     void leaveSettingsView();
 
     void showAccountSelectorWidget(bool show = true);
-    std::size_t refreshAccountSelectorWidget(int selection_row = -1, bool show = true, const std::string& selected = "");
+    std::size_t refreshAccountSelectorWidget(int selection_row = -1, const std::string& selected = "");
 
     WebKitChatContainer* webkitChatContainer() const;
 
@@ -304,17 +313,22 @@
     QMetaObject::Connection showChatViewConnection_;
     QMetaObject::Connection showCallViewConnection_;
     QMetaObject::Connection showIncomingViewConnection_;
+    QMetaObject::Connection newTrustRequestNotification_;
+    QMetaObject::Connection closeTrustRequestNotification_;
+    QMetaObject::Connection slotNewInteraction_;
+    QMetaObject::Connection slotReadInteraction_;
     QMetaObject::Connection changeAccountConnection_;
     QMetaObject::Connection newAccountConnection_;
     QMetaObject::Connection rmAccountConnection_;
     QMetaObject::Connection invalidAccountConnection_;
     QMetaObject::Connection historyClearedConnection_;
     QMetaObject::Connection modelSortedConnection_;
+    QMetaObject::Connection callChangedConnection_;
+    QMetaObject::Connection newIncomingCallConnection_;
     QMetaObject::Connection filterChangedConnection_;
     QMetaObject::Connection newConversationConnection_;
     QMetaObject::Connection conversationRemovedConnection_;
     QMetaObject::Connection accountStatusChangedConnection_;
-    QMetaObject::Connection chatNotification_;
 
 private:
     CppImpl() = delete;
@@ -325,7 +339,6 @@
     GtkWidget* displayIncomingView(lrc::api::conversation::Info);
     GtkWidget* displayCurrentCallView(lrc::api::conversation::Info);
     GtkWidget* displayChatView(lrc::api::conversation::Info);
-    void chatNotifications();
 
     // Callbacks used as LRC Qt slot
     void slotAccountAddedFromLrc(const std::string& id);
@@ -334,12 +347,19 @@
     void slotAccountStatusChanged(const std::string& id);
     void slotConversationCleared(const std::string& uid);
     void slotModelSorted();
+    void slotNewIncomingCall(const std::string& callId);
+    void slotCallStatusChanged(const std::string& callId);
     void slotFilterChanged();
     void slotNewConversation(const std::string& uid);
     void slotConversationRemoved(const std::string& uid);
     void slotShowChatView(const std::string& id, lrc::api::conversation::Info origin);
     void slotShowCallView(const std::string& id, lrc::api::conversation::Info origin);
     void slotShowIncomingCallView(const std::string& id, lrc::api::conversation::Info origin);
+    void slotNewTrustRequest(const std::string& id, const std::string& contactUri);
+    void slotCloseTrustRequest(const std::string& id, const std::string& contactUri);
+    void slotNewInteraction(const std::string& accountId, const std::string& conversation,
+                                uint64_t, const lrc::api::interaction::Info& interaction);
+    void slotCloseInteraction(const std::string& accountId, const std::string& conversation, uint64_t);
 };
 
 inline namespace gtk_callbacks
@@ -580,7 +600,7 @@
     QString val = QString::fromUcs4(&unicode_val, 1);
     g_debug("attemptingto play DTMF tone during ongoing call: %s", val.toUtf8().constData());
     priv->cpp->accountInfo_->callModel->playDTMF(current_item.callId, val.toStdString());
-    // always propogate the key, so we don't steal accelerators/shortcuts
+    // always propagate the key, so we don't steal accelerators/shortcuts
     return GDK_EVENT_PROPAGATE;
 }
 
@@ -646,7 +666,6 @@
     for (const auto& accountId : accounts) {
         priv->cpp->accountInfoForMigration_ = &priv->cpp->lrc_->getAccountModel().getAccountInfo(accountId);
         if (priv->cpp->accountInfoForMigration_->status == lrc::api::account::Status::ERROR_NEED_MIGRATION) {
-            std::cout << "DO MIGRATION" << std::endl;
             priv->account_migration_view = account_migration_view_new(priv->cpp->accountInfoForMigration_);
             g_signal_connect_swapped(priv->account_migration_view, "account-migration-completed",
                                      G_CALLBACK(on_handle_account_migrations), self);
@@ -678,6 +697,155 @@
     priv->cpp->showAccountSelectorWidget();
 }
 
+enum class Action {
+    SELECT,
+    ACCEPT,
+    REFUSE
+};
+
+static void
+action_notification(gchar* title, RingMainWindow* self, Action action)
+{
+    g_return_if_fail(IS_RING_MAIN_WINDOW(self) && title);
+    auto* priv = RING_MAIN_WINDOW_GET_PRIVATE(RING_MAIN_WINDOW(self));
+    if (!priv->cpp->accountInfo_) {
+        g_warning("Notification clicked but accountInfo_ currently empty");
+        return;
+    }
+
+    std::string titleStr = title;
+    auto firstMarker = titleStr.find(":");
+    if (firstMarker == std::string::npos) return;
+    auto secondMarker = titleStr.find(":", firstMarker + 1);
+    if (secondMarker == std::string::npos) return;
+
+    auto id = titleStr.substr(0, firstMarker);
+    auto type = titleStr.substr(firstMarker + 1, secondMarker - firstMarker - 1);
+    auto information = titleStr.substr(secondMarker + 1);
+
+    if (action == Action::SELECT) {
+        // Select conversation
+        if (priv->cpp->show_settings) {
+            priv->cpp->leaveSettingsView();
+        }
+
+        if (priv->cpp->accountInfo_->id != id) {
+            priv->cpp->updateLrc(id);
+        }
+
+        if (type == "interaction") {
+            priv->cpp->accountInfo_->conversationModel->selectConversation(information);
+            conversations_view_select_conversation(CONVERSATIONS_VIEW(priv->treeview_conversations), information);
+        } else if (type == "request") {
+            for (const auto& conversation : priv->cpp->accountInfo_->conversationModel->getFilteredConversations(lrc::api::profile::Type::PENDING)) {
+                auto current_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(priv->notebook_contacts));
+                auto contactRequestsPageNum = gtk_notebook_page_num(GTK_NOTEBOOK(priv->notebook_contacts),
+                                                               priv->scrolled_window_contact_requests);
+                gtk_notebook_set_current_page(GTK_NOTEBOOK(priv->notebook_contacts), contactRequestsPageNum);
+                if (!conversation.participants.empty() && conversation.participants.front() == information) {
+                    priv->cpp->accountInfo_->conversationModel->selectConversation(conversation.uid);
+                }
+                conversations_view_select_conversation(CONVERSATIONS_VIEW(priv->treeview_conversations), conversation.uid);
+            }
+        }
+    } else {
+        // accept or refuse notifiation
+        try {
+            auto& accountInfo = priv->cpp->lrc_->getAccountModel().getAccountInfo(id);
+            for (const auto& conversation : accountInfo.conversationModel->getFilteredConversations(lrc::api::profile::Type::PENDING)) {
+                if (!conversation.participants.empty() && conversation.participants.front() == information) {
+                    if (action == Action::ACCEPT) {
+                        accountInfo.conversationModel->makePermanent(conversation.uid);
+                    } else {
+                        accountInfo.conversationModel->removeConversation(conversation.uid);
+                    }
+                }
+            }
+        } catch (const std::out_of_range& e) {
+            g_warning("Can't get account %i: %s", id.c_str(), e.what());
+        }
+    }
+
+}
+
+static void
+on_notification_chat_clicked(GtkWidget* notifier, gchar *title, RingMainWindow* self)
+{
+    action_notification(title, self, Action::SELECT);
+}
+
+static void
+on_notification_accept_pending(GtkWidget*, gchar *title, RingMainWindow* self)
+{
+    action_notification(title, self, Action::ACCEPT);
+}
+
+static void
+on_notification_refuse_pending(GtkWidget*, gchar *title, RingMainWindow* self)
+{
+    action_notification(title, self, Action::REFUSE);
+}
+
+static void
+on_notification_accept_call(GtkWidget* notifier, gchar *title, RingMainWindow* self)
+{
+    g_return_if_fail(IS_RING_MAIN_WINDOW(self) && title);
+    auto* priv = RING_MAIN_WINDOW_GET_PRIVATE(RING_MAIN_WINDOW(self));
+    if (!priv->cpp->accountInfo_) {
+        g_warning("Notification clicked but accountInfo_ currently empty");
+        return;
+    }
+
+    std::string titleStr = title;
+    auto firstMarker = titleStr.find(":");
+    if (firstMarker == std::string::npos) return;
+    auto secondMarker = titleStr.find(":", firstMarker + 1);
+    if (secondMarker == std::string::npos) return;
+
+    auto id = titleStr.substr(0, firstMarker);
+    auto type = titleStr.substr(firstMarker + 1, secondMarker - firstMarker - 1);
+    auto information = titleStr.substr(secondMarker + 1);
+
+    if (priv->cpp->show_settings) {
+        priv->cpp->leaveSettingsView();
+    }
+
+    try {
+        auto& accountInfo = priv->cpp->lrc_->getAccountModel().getAccountInfo(id);
+        accountInfo.callModel->accept(information);
+    } catch (const std::out_of_range& e) {
+        g_warning("Can't get account %i: %s", id.c_str(), e.what());
+    }
+}
+
+static void
+on_notification_decline_call(GtkWidget* notifier, gchar *title, RingMainWindow* self)
+{
+    g_return_if_fail(IS_RING_MAIN_WINDOW(self) && title);
+    auto* priv = RING_MAIN_WINDOW_GET_PRIVATE(RING_MAIN_WINDOW(self));
+    if (!priv->cpp->accountInfo_) {
+        g_warning("Notification clicked but accountInfo_ currently empty");
+        return;
+    }
+
+    std::string titleStr = title;
+    auto firstMarker = titleStr.find(":");
+    if (firstMarker == std::string::npos) return;
+    auto secondMarker = titleStr.find(":", firstMarker + 1);
+    if (secondMarker == std::string::npos) return;
+
+    auto id = titleStr.substr(0, firstMarker);
+    auto type = titleStr.substr(firstMarker + 1, secondMarker - firstMarker - 1);
+    auto information = titleStr.substr(secondMarker + 1);
+
+    try {
+        auto& accountInfo = priv->cpp->lrc_->getAccountModel().getAccountInfo(id);
+        accountInfo.callModel->hangUp(information);
+    } catch (const std::out_of_range& e) {
+        g_warning("Can't get account %i: %s", id.c_str(), e.what());
+    }
+}
+
 } // namespace gtk_callbacks
 
 CppImpl::CppImpl(RingMainWindow& widget)
@@ -686,23 +854,6 @@
     , lrc_ {std::make_unique<lrc::api::Lrc>()}
 {}
 
-void
-CppImpl::chatNotifications()
-{
-    chatNotification_ = QObject::connect(
-        &Media::RecordingModel::instance(),
-        &Media::RecordingModel::newTextMessage,
-        [this] (Media::TextRecording* t, ContactMethod* cm) {
-            if ((chatViewConversation_
-                && chatViewConversation_->participants[0] == cm->uri().toStdString())
-                || not g_settings_get_boolean(widgets->settings, "enable-chat-notifications"))
-                    return;
-
-            ring_notify_message(cm, t);
-        }
-    );
-}
-
 static gboolean
 on_clear_all_history_foreach(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer self)
 {
@@ -957,10 +1108,6 @@
             }
         }
     }
-
-    // setup chat notification
-    chatNotifications();
-
     // delete obsolete history
     if (not accountIds.empty()) {
         auto days = g_settings_get_int(widgets->settings, "history-limit");
@@ -975,6 +1122,17 @@
     if (accounts.empty()) {
         enterAccountCreationWizard();
     }
+
+    widgets->notif_chat_view = g_signal_connect(widgets->notifier, "showChatView",
+                                                     G_CALLBACK(on_notification_chat_clicked), self);
+    widgets->notif_accept_pending = g_signal_connect(widgets->notifier, "acceptPending",
+                                                     G_CALLBACK(on_notification_accept_pending), self);
+    widgets->notif_refuse_pending = g_signal_connect(widgets->notifier, "refusePending",
+                                                    G_CALLBACK(on_notification_refuse_pending), self);
+    widgets->notif_accept_call = g_signal_connect(widgets->notifier, "acceptCall",
+                                                  G_CALLBACK(on_notification_accept_call), self);
+    widgets->notif_decline_call = g_signal_connect(widgets->notifier, "declineCall",
+                                                   G_CALLBACK(on_notification_decline_call), self);
 }
 
 CppImpl::~CppImpl()
@@ -983,6 +1141,8 @@
     QObject::disconnect(showIncomingViewConnection_);
     QObject::disconnect(historyClearedConnection_);
     QObject::disconnect(modelSortedConnection_);
+    QObject::disconnect(callChangedConnection_);
+    QObject::disconnect(newIncomingCallConnection_);
     QObject::disconnect(filterChangedConnection_);
     QObject::disconnect(newConversationConnection_);
     QObject::disconnect(conversationRemovedConnection_);
@@ -991,9 +1151,11 @@
     QObject::disconnect(rmAccountConnection_);
     QObject::disconnect(invalidAccountConnection_);
     QObject::disconnect(showCallViewConnection_);
-    QObject::disconnect(modelSortedConnection_);
+    QObject::disconnect(newTrustRequestNotification_);
+    QObject::disconnect(closeTrustRequestNotification_);
+    QObject::disconnect(slotNewInteraction_);
+    QObject::disconnect(slotReadInteraction_);
     QObject::disconnect(accountStatusChangedConnection_);
-    QObject::disconnect(chatNotification_);
 
     g_clear_object(&widgets->welcome_view);
     g_clear_object(&widgets->webkit_chat_container);
@@ -1070,6 +1232,16 @@
     chatViewConversation_.reset(new lrc::api::conversation::Info(conversation));
     auto* new_view = chat_view_new(webkitChatContainer(), accountInfo_, chatViewConversation_.get());
     g_signal_connect_swapped(new_view, "hide-view-clicked", G_CALLBACK(on_hide_view_clicked), self);
+    try {
+        auto contactUri = chatViewConversation_->participants.front();
+        auto contactInfo = accountInfo_->contactModel->getContact(contactUri);
+        auto isPending = contactInfo.profileInfo.type == lrc::api::profile::Type::PENDING;
+        if (isPending) {
+            auto notifId = accountInfo_->id + ":request:" + contactUri;
+            ring_hide_notification(RING_NOTIFIER(widgets->notifier), notifId);
+        }
+    } catch(...) { }
+
     return new_view;
 }
 
@@ -1150,20 +1322,15 @@
 void
 CppImpl::showAccountSelectorWidget(bool show)
 {
-    // we only want to show the account selector when there is more than 1 enabled
-    // account; so every time we want to show it, we should preform this check
-    std::size_t enabled_accounts = 0;
-    foreachLrcAccount(*lrc_, [&] (const auto&) { ++enabled_accounts; });
     gtk_widget_set_visible(widgets->combobox_account_selector, show);
 }
 
 /// Update the account GtkComboBox from LRC data and select the given entry.
 /// The widget visibility is changed depending on number of account found.
 /// /note Default selection_row is -1, meaning no selection.
-/// /note Default visibility mode is true, meaning showing the widget.
 /// /note Default selected is "", meaning no forcing
 std::size_t
-CppImpl::refreshAccountSelectorWidget(int selection_row, bool show, const std::string& selected)
+CppImpl::refreshAccountSelectorWidget(int selection_row, const std::string& selected)
 {
     auto store = gtk_list_store_new(6 /* # of cols */ ,
                                     G_TYPE_STRING,
@@ -1208,7 +1375,6 @@
         GTK_TREE_MODEL(store)
     );
     gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->combobox_account_selector), selection_row);
-    gtk_widget_set_visible(widgets->combobox_account_selector, show);
 
     return enabled_accounts;
 }
@@ -1291,20 +1457,22 @@
 CppImpl::onAccountSelectionChange(const std::string& id)
 {
     auto oldId = accountInfo_? accountInfo_->id : "";
-    auto idChanged = id == oldId;
-    // Go to welcome view
-    changeView(RING_WELCOME_VIEW_TYPE);
-    // Show conversation panel
-    gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->notebook_contacts), 0);
-    // Reinit LRC
-    updateLrc(id);
-    // Update the welcome view
-    ring_welcome_update_view(RING_WELCOME_VIEW(widgets->welcome_view));
-    // Show pending contacts tab if necessary
-    refreshPendingContactRequestTab();
-    // Update account settings
-    if (widgets->new_account_settings_view)
-        new_account_settings_view_update(NEW_ACCOUNT_SETTINGS_VIEW(widgets->new_account_settings_view), !idChanged);
+
+    if (id != oldId) {
+        // Go to welcome view
+        changeView(RING_WELCOME_VIEW_TYPE);
+        // Show conversation panel
+        gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->notebook_contacts), 0);
+        // Reinit LRC
+        updateLrc(id);
+        // Update the welcome view
+        ring_welcome_update_view(RING_WELCOME_VIEW(widgets->welcome_view));
+        // Show pending contacts tab if necessary
+        refreshPendingContactRequestTab();
+        // Update account settings
+        if (widgets->new_account_settings_view)
+            new_account_settings_view_update(NEW_ACCOUNT_SETTINGS_VIEW(widgets->new_account_settings_view), true);
+    }
 }
 
 void
@@ -1373,7 +1541,13 @@
     QObject::disconnect(showIncomingViewConnection_);
     QObject::disconnect(changeAccountConnection_);
     QObject::disconnect(showCallViewConnection_);
+    QObject::disconnect(newTrustRequestNotification_);
+    QObject::disconnect(closeTrustRequestNotification_);
+    QObject::disconnect(slotNewInteraction_);
+    QObject::disconnect(slotReadInteraction_);
     QObject::disconnect(modelSortedConnection_);
+    QObject::disconnect(callChangedConnection_);
+    QObject::disconnect(newIncomingCallConnection_);
     QObject::disconnect(historyClearedConnection_);
     QObject::disconnect(filterChangedConnection_);
     QObject::disconnect(newConversationConnection_);
@@ -1425,6 +1599,14 @@
                                               &lrc::api::ConversationModel::modelSorted,
                                               [this] { slotModelSorted(); });
 
+    callChangedConnection_ = QObject::connect(&*accountInfo_->callModel,
+                                              &lrc::api::NewCallModel::callStatusChanged,
+                                              [this] (const std::string& callId) { slotCallStatusChanged(callId); });
+
+    newIncomingCallConnection_ = QObject::connect(&*accountInfo_->callModel,
+                                                  &lrc::api::NewCallModel::newIncomingCall,
+                                                  [this] (const std::string&, const std::string& callId) { slotNewIncomingCall(callId); });
+
     filterChangedConnection_ = QObject::connect(&*accountInfo_->conversationModel,
                                                 &lrc::api::ConversationModel::filterChanged,
                                                 [this] { slotFilterChanged(); });
@@ -1445,9 +1627,29 @@
                                                &lrc::api::BehaviorController::showCallView,
                                                [this] (const std::string& id, lrc::api::conversation::Info origin) { slotShowCallView(id, origin); });
 
+    newTrustRequestNotification_ = QObject::connect(&lrc_->getBehaviorController(),
+                                                    &lrc::api::BehaviorController::newTrustRequest,
+                                                    [this] (const std::string& id, const std::string& contactUri) { slotNewTrustRequest(id, contactUri); });
+
+    closeTrustRequestNotification_ = QObject::connect(&lrc_->getBehaviorController(),
+                                                      &lrc::api::BehaviorController::trustRequestTreated,
+                                                      [this] (const std::string& id, const std::string& contactUri) { slotCloseTrustRequest(id, contactUri); });
+
     showIncomingViewConnection_ = QObject::connect(&lrc_->getBehaviorController(),
                                                    &lrc::api::BehaviorController::showIncomingCallView,
-                                                   [this] (const std::string& id, lrc::api::conversation::Info origin) { slotShowIncomingCallView(id, origin); });
+                                                   [this] (const std::string& id, lrc::api::conversation::Info origin)
+                                                          { slotShowIncomingCallView(id, origin); });
+
+    slotNewInteraction_ = QObject::connect(&lrc_->getBehaviorController(),
+                                           &lrc::api::BehaviorController::newUnreadInteraction,
+                                           [this] (const std::string& accountId, const std::string& conversation,
+                                                  uint64_t interactionId, const lrc::api::interaction::Info& interaction)
+                                                  { slotNewInteraction(accountId, conversation, interactionId, interaction); });
+
+    slotReadInteraction_ = QObject::connect(&lrc_->getBehaviorController(),
+                                            &lrc::api::BehaviorController::newReadInteraction,
+                                            [this] (const std::string& accountId, const std::string& conversation, uint64_t interactionId)
+                                                   { slotCloseInteraction(accountId, conversation, interactionId); });
 
     const gchar *text = gtk_entry_get_text(GTK_ENTRY(widgets->search_entry));
     currentTypeFilter_ = accountInfo_->profileInfo.type;
@@ -1479,15 +1681,13 @@
                                     NEW_ACCOUNT_SETTINGS_VIEW_NAME);
             }
         }
+        refreshAccountSelectorWidget(currentIdx, id);
         if (account_info.profileInfo.type == lrc::api::profile::Type::SIP) {
-            refreshAccountSelectorWidget(currentIdx, false, id);
             enterSettingsView();
             gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->radiobutton_new_account_settings), true);
-        } else {
-            refreshAccountSelectorWidget(currentIdx, true, id);
         }
     } catch (...) {
-        refreshAccountSelectorWidget(currentIdx, true, id);
+        refreshAccountSelectorWidget(currentIdx, id);
     }
 }
 
@@ -1528,17 +1728,6 @@
         ring_welcome_update_view(RING_WELCOME_VIEW(widgets->welcome_view));
         return;
     }
-
-    auto selectionIdx = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->combobox_account_selector));
-
-    auto enabledAccounts = refreshAccountSelectorWidget(selectionIdx);
-
-    // if no account. reset the view.
-    if (enabledAccounts == 0) {
-        updateLrc("");
-        changeView(RING_WELCOME_VIEW_TYPE);
-        ring_welcome_update_view(RING_WELCOME_VIEW(widgets->welcome_view));
-    }
 }
 
 void
@@ -1579,6 +1768,78 @@
 }
 
 void
+CppImpl::slotCallStatusChanged(const std::string& callId)
+{
+    if (!accountInfo_) {
+        return;
+    }
+    try {
+        auto call = accountInfo_->callModel->getCall(callId);
+        auto peer = call.peer;
+        if (accountInfo_->profileInfo.type == lrc::api::profile::Type::RING && peer.find("ring:") == 0) {
+            peer = peer.substr(5);
+        }
+        auto& contactModel = accountInfo_->contactModel;
+        std::string notifId = "";
+        try {
+            notifId = accountInfo_->id + ":call:" + callId;
+        } catch (...) {
+            g_warning("Can't get contact for account %s. Don't show notification", accountInfo_->id.c_str());
+            return;
+        }
+
+        if (call.status == lrc::api::call::Status::IN_PROGRESS
+            || call.status == lrc::api::call::Status::ENDED) {
+            // Call ended, close the notification
+            ring_hide_notification(RING_NOTIFIER(widgets->notifier), notifId);
+        }
+    } catch (const std::exception& e) {
+        g_warning("Can't get call %lu for this account.", callId);
+    }
+}
+
+void
+CppImpl::slotNewIncomingCall(const std::string& callId)
+{
+    if (!accountInfo_) {
+        return;
+    }
+    try {
+        auto call = accountInfo_->callModel->getCall(callId);
+        auto peer = call.peer;
+        if (accountInfo_->profileInfo.type == lrc::api::profile::Type::RING && peer.find("ring:") == 0) {
+            peer = peer.substr(5);
+        }
+        auto& contactModel = accountInfo_->contactModel;
+        std::string avatar = "", name = "", notifId = "", uri = "";
+        try {
+            auto contactInfo = contactModel->getContact(peer);
+            uri = contactInfo.profileInfo.uri;
+            avatar = contactInfo.profileInfo.avatar;
+            name = contactInfo.profileInfo.alias;
+            if (name.empty()) {
+                name = contactInfo.registeredName;
+                if (name.empty()) {
+                    name = contactInfo.profileInfo.uri;
+                }
+            }
+            notifId = accountInfo_->id + ":call:" + callId;
+        } catch (...) {
+            g_warning("Can't get contact for account %s. Don't show notification", accountInfo_->id.c_str());
+            return;
+        }
+
+        if (g_settings_get_boolean(widgets->settings, "enable-call-notifications")) {
+            name.erase(std::remove(name.begin(), name.end(), '\r'), name.end());
+            auto body = name + _(" is calling you!");
+            ring_show_notification(RING_NOTIFIER(widgets->notifier), avatar, uri, name, notifId, _("Incoming call"), body, NotificationType::CALL);
+        }
+    } catch (const std::exception& e) {
+        g_warning("Can't get call %lu for this account.", callId);
+    }
+}
+
+void
 CppImpl::slotFilterChanged()
 {
     // Synchronize selection when filter changes
@@ -1692,9 +1953,118 @@
 }
 
 void
+CppImpl::slotNewTrustRequest(const std::string& id, const std::string& contactUri)
+{
+    try {
+        auto& accountInfo = lrc_->getAccountModel().getAccountInfo(id);
+        auto notifId = accountInfo.id + ":request:" + contactUri;
+        std::string avatar = "", name = "", uri = "";
+        auto& contactModel = accountInfo.contactModel;
+        try {
+            auto contactInfo = contactModel->getContact(contactUri);
+            uri = contactInfo.profileInfo.uri;
+            avatar = contactInfo.profileInfo.avatar;
+            name = contactInfo.profileInfo.alias;
+            if (name.empty()) {
+                name = contactInfo.registeredName;
+                if (name.empty()) {
+                    name = contactInfo.profileInfo.uri;
+                }
+            }
+        } catch (...) {
+            g_warning("Can't get contact for account %s. Don't show notification", accountInfo.id.c_str());
+            return;
+        }
+        if (g_settings_get_boolean(widgets->settings, "enable-pending-notifications")) {
+            name.erase(std::remove(name.begin(), name.end(), '\r'), name.end());
+            auto body = _("New request from ") + name;
+            ring_show_notification(RING_NOTIFIER(widgets->notifier), avatar, uri, name, notifId, _("Trust request"), body, NotificationType::REQUEST);
+        }
+    } catch (...) {
+        g_warning("Can't get account %s", id.c_str());
+    }
+}
+
+void
+CppImpl::slotCloseTrustRequest(const std::string& id, const std::string& contactUri)
+{
+    try {
+        auto& accountInfo = lrc_->getAccountModel().getAccountInfo(id);
+        auto notifId = accountInfo.id + ":request:" + contactUri;
+        ring_hide_notification(RING_NOTIFIER(widgets->notifier), notifId);
+    } catch (...) {
+        g_warning("Can't get account %s", id.c_str());
+    }
+}
+
+void
+CppImpl::slotNewInteraction(const std::string& accountId, const std::string& conversation,
+                            uint64_t, const lrc::api::interaction::Info& interaction)
+{
+    if (chatViewConversation_ && chatViewConversation_->uid == conversation) {
+        if (gtk_window_is_active(GTK_WINDOW(self))) {
+            return;
+        }
+    }
+    try {
+        auto& accountInfo = lrc_->getAccountModel().getAccountInfo(accountId);
+        auto notifId = accountInfo.id + ":interaction:" + conversation;
+        auto& contactModel = accountInfo.contactModel;
+        auto& conversationModel = accountInfo.conversationModel;
+        for (const auto& conv : conversationModel->allFilteredConversations())
+        {
+            if (conv.uid == conversation) {
+                if (conv.participants.empty()) return;
+                std::string avatar = "", name = "", uri = "";
+                try {
+                    auto contactInfo = contactModel->getContact(conv.participants.front());
+                    uri = contactInfo.profileInfo.uri;
+                    avatar = contactInfo.profileInfo.avatar;
+                    name = contactInfo.profileInfo.alias;
+                    if (name.empty()) {
+                        name = contactInfo.registeredName;
+                        if (name.empty()) {
+                            name = contactInfo.profileInfo.uri;
+                        }
+                    }
+                } catch (...) {
+                    g_warning("Can't get contact for account %s. Don't show notification", accountInfo.id.c_str());
+                    return;
+                }
+
+                if (g_settings_get_boolean(widgets->settings, "enable-chat-notifications")) {
+                    name.erase(std::remove(name.begin(), name.end(), '\r'), name.end());
+                    auto body = name + ": " + interaction.body;
+                    ring_show_notification(RING_NOTIFIER(widgets->notifier), avatar, uri, name, notifId, _("New message"), body, NotificationType::CHAT);
+                }
+            }
+        }
+    } catch (...) {
+        g_warning("Can't get account %s", accountId.c_str());
+    }
+}
+
+void
+CppImpl::slotCloseInteraction(const std::string& accountId, const std::string& conversation, uint64_t)
+{
+    if (!gtk_window_is_active(GTK_WINDOW(self))
+        || (chatViewConversation_ && chatViewConversation_->uid != conversation)) {
+            return;
+    }
+    try {
+        auto& accountInfo = lrc_->getAccountModel().getAccountInfo(accountId);
+        auto notifId = accountInfo.id + ":interaction:" + conversation;
+        ring_hide_notification(RING_NOTIFIER(widgets->notifier), notifId);
+    } catch (...) {
+        g_warning("Can't get account %s", accountId.c_str());
+    }
+}
+
+void
 CppImpl::slotShowIncomingCallView(const std::string& id, lrc::api::conversation::Info origin)
 {
     changeAccountSelection(id);
+
     // Change the view if we want a different view.
     auto* old_view = gtk_bin_get_child(GTK_BIN(widgets->frame_call));
 
@@ -1727,6 +2097,7 @@
 
     // CppImpl ctor
     priv->cpp = new details::CppImpl {*win};
+    priv->notifier = ring_notifier_new();
     priv->cpp->init();
 }
 
@@ -1738,12 +2109,24 @@
 
     delete priv->cpp;
     priv->cpp = nullptr;
+    delete priv->notifier;
+    priv->notifier = nullptr;
 
     G_OBJECT_CLASS(ring_main_window_parent_class)->dispose(object);
 
     if (priv->general_settings_view) {
         g_signal_handler_disconnect(priv->general_settings_view, priv->update_download_folder);
         priv->update_download_folder = 0;
+        g_signal_handler_disconnect(priv->notifier, priv->notif_chat_view);
+        priv->notif_chat_view = 0;
+        g_signal_handler_disconnect(priv->notifier, priv->notif_accept_pending);
+        priv->notif_accept_pending = 0;
+        g_signal_handler_disconnect(priv->notifier, priv->notif_refuse_pending);
+        priv->notif_refuse_pending = 0;
+        g_signal_handler_disconnect(priv->notifier, priv->notif_accept_call);
+        priv->notif_accept_call = 0;
+        g_signal_handler_disconnect(priv->notifier, priv->notif_decline_call);
+        priv->notif_decline_call = 0;
     }
 }
 
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/ringnotify.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/ringnotify.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/ringnotify.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/ringnotify.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -1,6 +1,7 @@
 /*
  *  Copyright (C) 2015-2018 Savoir-faire Linux Inc.
  *  Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
+ *  Author: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -40,13 +41,10 @@
 #include <recentmodel.h>
 #endif
 
-#if USE_LIBNOTIFY
 
-static constexpr int MAX_NOTIFICATIONS = 10; // max unread chat msgs to display from the same contact
 static constexpr const char* SERVER_NOTIFY_OSD = "notify-osd";
 static constexpr const char* NOTIFICATION_FILE = SOUNDSDIR "/ringtone_notify.wav";
 
-
 /* struct to store the parsed list of the notify server capabilities */
 struct RingNotifyServerInfo
 {
@@ -69,22 +67,110 @@
     }
 };
 
-static struct RingNotifyServerInfo server_info;
+namespace details
+{
+class CppImpl;
+}
+
+struct _RingNotifier
+{
+    GtkBox parent;
+};
+
+struct _RingNotifierClass
+{
+    GtkBoxClass parent_class;
+};
+
+typedef struct _RingNotifierPrivate RingNotifierPrivate;
+
+struct _RingNotifierPrivate
+{
+    RingNotifyServerInfo serverInfo;
+
+    details::CppImpl* cpp; ///< Non-UI and C++ only code0
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE(RingNotifier, ring_notifier, GTK_TYPE_BOX);
+
+#define RING_NOTIFIER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), RING_NOTIFIER_TYPE, RingNotifierPrivate))
+
+/* signals */
+enum {
+    SHOW_CHAT,
+    ACCEPT_PENDING,
+    REFUSE_PENDING,
+    ACCEPT_CALL,
+    DECLINE_CALL,
+    LAST_SIGNAL
+};
+
+static guint ring_notifier_signals[LAST_SIGNAL] = { 0 };
+
+namespace details
+{
+
+class CppImpl
+{
+public:
+    explicit CppImpl(RingNotifier& widget);
+    ~CppImpl();
+
+    RingNotifier* self = nullptr; // The GTK widget itself
+    RingNotifierPrivate* priv = nullptr;
+
+    std::map<std::string, std::shared_ptr<NotifyNotification>> notifications_;
+private:
+    CppImpl() = delete;
+    CppImpl(const CppImpl&) = delete;
+    CppImpl& operator=(const CppImpl&) = delete;
+
+};
+
+CppImpl::CppImpl(RingNotifier& widget)
+    : self {&widget}
+{}
+
+CppImpl::~CppImpl()
+{}
+
+}
+
+static void
+ring_notifier_dispose(GObject *object)
+{
+    auto* self = RING_NOTIFIER(object);
+    auto* priv = RING_NOTIFIER_GET_PRIVATE(self);
+
+    delete priv->cpp;
+    priv->cpp = nullptr;
+
+#if USE_LIBNOTIFY
+    if (notify_is_initted())
+        notify_uninit();
 #endif
 
-void
-ring_notify_init()
+    G_OBJECT_CLASS(ring_notifier_parent_class)->dispose(object);
+}
+
+static void
+ring_notifier_init(RingNotifier *view)
 {
+    gtk_widget_init_template(GTK_WIDGET(view));
+
+    RingNotifierPrivate *priv = RING_NOTIFIER_GET_PRIVATE(view);
+    priv->cpp = new details::CppImpl {*view};
+
 #if USE_LIBNOTIFY
     notify_init("Ring");
 
     /* get notify server info */
-    if (notify_get_server_info(&server_info.name,
-                               &server_info.vendor,
-                               &server_info.version,
-                               &server_info.spec)) {
+    if (notify_get_server_info(&(priv->serverInfo).name,
+                               &(priv->serverInfo).vendor,
+                               &(priv->serverInfo).version,
+                               &(priv->serverInfo).spec)) {
         g_debug("notify server name: %s, vendor: %s, version: %s, spec: %s",
-                server_info.name, server_info.vendor, server_info.version, server_info.spec);
+                priv->serverInfo.name, priv->serverInfo.vendor, priv->serverInfo.version, priv->serverInfo.spec);
     }
 
     /* check  notify server capabilities */
@@ -92,10 +178,10 @@
     while (list) {
         if (g_strcmp0((const char *)list->data, "append") == 0 ||
             g_strcmp0((const char *)list->data, "x-canonical-append") == 0) {
-            server_info.append = TRUE;
+            priv->serverInfo.append = TRUE;
         }
         if (g_strcmp0((const char *)list->data, "actions") == 0) {
-            server_info.actions = TRUE;
+            priv->serverInfo.actions = TRUE;
         }
 
         list = g_list_next(list);
@@ -105,359 +191,229 @@
 #endif
 }
 
-void
-ring_notify_uninit()
+static void
+ring_notifier_class_init(RingNotifierClass *klass)
 {
-#if USE_LIBNOTIFY
-    if (notify_is_initted())
-        notify_uninit();
-#endif
+    G_OBJECT_CLASS(klass)->dispose = ring_notifier_dispose;
+
+    ring_notifier_signals[SHOW_CHAT] = g_signal_new(
+        "showChatView",
+        G_TYPE_FROM_CLASS(klass),
+        (GSignalFlags) (G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED),
+        0,
+        nullptr,
+        nullptr,
+        g_cclosure_marshal_VOID__STRING,
+        G_TYPE_NONE, 1, G_TYPE_STRING);
+
+    ring_notifier_signals[ACCEPT_PENDING] = g_signal_new(
+        "acceptPending",
+        G_TYPE_FROM_CLASS(klass),
+        (GSignalFlags) (G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED),
+        0,
+        nullptr,
+        nullptr,
+        g_cclosure_marshal_VOID__STRING,
+        G_TYPE_NONE, 1, G_TYPE_STRING);
+
+    ring_notifier_signals[REFUSE_PENDING] = g_signal_new(
+        "refusePending",
+        G_TYPE_FROM_CLASS(klass),
+        (GSignalFlags) (G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED),
+        0,
+        nullptr,
+        nullptr,
+        g_cclosure_marshal_VOID__STRING,
+        G_TYPE_NONE, 1, G_TYPE_STRING);
+
+    ring_notifier_signals[ACCEPT_CALL] = g_signal_new(
+        "acceptCall",
+        G_TYPE_FROM_CLASS(klass),
+        (GSignalFlags) (G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED),
+        0,
+        nullptr,
+        nullptr,
+        g_cclosure_marshal_VOID__STRING,
+        G_TYPE_NONE, 1, G_TYPE_STRING);
+
+    ring_notifier_signals[DECLINE_CALL] = g_signal_new(
+        "declineCall",
+        G_TYPE_FROM_CLASS(klass),
+        (GSignalFlags) (G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED),
+        0,
+        nullptr,
+        nullptr,
+        g_cclosure_marshal_VOID__STRING,
+        G_TYPE_NONE, 1, G_TYPE_STRING);
 }
 
-gboolean
-ring_notify_is_initted()
+GtkWidget *
+ring_notifier_new()
 {
-#if USE_LIBNOTIFY
-    return notify_is_initted();
-#else
-    return FALSE;
-#endif
+    gpointer view = g_object_new(RING_NOTIFIER_TYPE, NULL);
+    return (GtkWidget *)view;
 }
 
 #if USE_LIBNOTIFY
 static void
-ring_notify_show_cm(NotifyNotification*, char *, ContactMethod *cm)
+show_chat_view(NotifyNotification*, char* id, RingNotifier* view)
 {
-    /* show the main window in case its hidden */
-    if (auto action = g_action_map_lookup_action(G_ACTION_MAP(g_application_get_default()), "show-main-window")) {
-        g_action_change_state(action, g_variant_new_boolean(TRUE));
-    }
-    /* select the relevant cm */
-    auto idx = RecentModel::instance().getIndex(cm);
-    if (idx.isValid()) {
-        RecentModel::instance().selectionModel()->setCurrentIndex(idx, QItemSelectionModel::ClearAndSelect);
-    }
+    g_signal_emit(G_OBJECT(view), ring_notifier_signals[SHOW_CHAT], 0, id);
 }
-#endif
 
-gboolean
-ring_notify_incoming_call(
-#if !USE_LIBNOTIFY
-    G_GNUC_UNUSED
-#endif
-    Call* call)
+static void
+accept_pending(NotifyNotification*, char* id, RingNotifier* view)
 {
-    gboolean success = FALSE;
-#if USE_LIBNOTIFY
-    g_return_val_if_fail(call, FALSE);
-
-    gchar *body = g_markup_escape_text(call->formattedName().toUtf8().constData(), -1);
-    std::shared_ptr<NotifyNotification> notification(
-        notify_notification_new(_("Incoming call"), body, NULL), g_object_unref);
-    g_free(body);
-
-    /* get photo */
-    QVariant var_p = GlobalInstances::pixmapManipulator().callPhoto(
-        call->peerContactMethod(), QSize(50, 50), false);
-    std::shared_ptr<GdkPixbuf> photo = var_p.value<std::shared_ptr<GdkPixbuf>>();
-    notify_notification_set_image_from_pixbuf(notification.get(), photo.get());
-
-    /* calls have highest urgency */
-    notify_notification_set_urgency(notification.get(), NOTIFY_URGENCY_CRITICAL);
-    notify_notification_set_timeout(notification.get(), NOTIFY_EXPIRES_DEFAULT);
-
-    /* if the notification server supports actions, make the default action to show the call */
-    if (server_info.actions) {
-        notify_notification_add_action(notification.get(),
-                                       "default",
-                                       C_("notification action name", "Show"),
-                                       (NotifyActionCallback)ring_notify_show_cm,
-                                       call->peerContactMethod(),
-                                       nullptr);
-    }
-
-    GError *error = NULL;
-    success = notify_notification_show(notification.get(), &error);
-
-    if (success) {
-        /* monitor the life cycle of the call and try to close the notification
-         * once the call has been aswered */
-        auto state_changed_conn = std::make_shared<QMetaObject::Connection>();
-        *state_changed_conn = QObject::connect(
-            call,
-            &Call::lifeCycleStateChanged,
-            [notification, state_changed_conn] (Call::LifeCycleState newState, G_GNUC_UNUSED Call::LifeCycleState previousState)
-                {
-                    g_return_if_fail(NOTIFY_IS_NOTIFICATION(notification.get()));
-                    if (newState > Call::LifeCycleState::INITIALIZATION) {
-                        /* note: not all systems will actually close the notification
-                         * even if the above function returns as true */
-                        if (!notify_notification_close(notification.get(), NULL))
-                            g_warning("could not close notification");
-
-                        /* once we (try to) close the notification, we can
-                         * disconnect from this signal; this should also destroy
-                         * the notification shared_ptr as its ref count will
-                         * drop to 0 */
-                        QObject::disconnect(*state_changed_conn);
-                    }
-                }
-            );
-    } else {
-        g_warning("failed to show notification: %s", error->message);
-        g_clear_error(&error);
-    }
-#endif
-    return success;
+    std::string newId = id;
+    g_signal_emit(G_OBJECT(view), ring_notifier_signals[ACCEPT_PENDING], 0, newId.substr(std::string("add:").length()).c_str());
 }
 
-#if USE_LIBNOTIFY
-
 static void
-ring_notify_free_list(gpointer, GList *value, gpointer)
+refuse_pending(NotifyNotification*, char* id, RingNotifier* view)
 {
-    if (value) {
-        g_object_unref(G_OBJECT(value->data));
-        g_list_free(value);
-    }
+    std::string newId = id;
+    g_signal_emit(G_OBJECT(view), ring_notifier_signals[REFUSE_PENDING], 0, newId.substr(std::string("rm:").length()).c_str());
 }
 
 static void
-ring_notify_free_chat_table(GHashTable *table) {
-    if (table) {
-        g_hash_table_foreach(table, (GHFunc)ring_notify_free_list, nullptr);
-        g_hash_table_destroy(table);
-    }
-}
-
-/**
- * Returns a pointer to a GHashTable which contains key,value pairs where a ContactMethod pointer
- * is the key and a GList of notifications for that CM is the vlue.
- */
-GHashTable *
-ring_notify_get_chat_table()
+accept_call(NotifyNotification*, char* id, RingNotifier* view)
 {
-    static std::unique_ptr<GHashTable, decltype(ring_notify_free_chat_table)&> chat_table(
-        nullptr, ring_notify_free_chat_table);
-
-    if (chat_table.get() == nullptr)
-        chat_table.reset(g_hash_table_new(NULL, NULL));
-
-    return chat_table.get();
+    std::string newId = id;
+    g_signal_emit(G_OBJECT(view), ring_notifier_signals[ACCEPT_CALL], 0, newId.substr(std::string("accept:").length()).c_str());
 }
 
 static void
-notification_closed(NotifyNotification *notification, ContactMethod *cm)
+decline_call(NotifyNotification*, char* id, RingNotifier* view)
 {
-    g_return_if_fail(cm);
-
-    /* remove from the list */
-    auto chat_table = ring_notify_get_chat_table();
-    if (auto list = (GList *)g_hash_table_lookup(chat_table, cm)) {
-        list = g_list_remove(list, notification);
-        if (list) {
-            // the head of the list may have changed
-            g_hash_table_replace(chat_table, cm, list);
-        } else {
-            g_hash_table_remove(chat_table, cm);
-        }
-    }
-
-    g_object_unref(notification);
+    std::string newId = id;
+    g_signal_emit(G_OBJECT(view), ring_notifier_signals[DECLINE_CALL], 0, newId.substr(std::string("decline:").length()).c_str());
 }
 
-static gboolean
-ring_notify_show_text_message(ContactMethod *cm, const QModelIndex& idx)
+#endif
+
+gboolean
+ring_show_notification(RingNotifier* view, const std::string& icon,
+                       const std::string& uri, const std::string& name,
+                       const std::string& id, const std::string& title,
+                       const std::string& body, NotificationType type)
 {
-    g_return_val_if_fail(idx.isValid() && cm, FALSE);
+    g_return_val_if_fail(IS_RING_NOTIFIER(view), false);
     gboolean success = FALSE;
+    RingNotifierPrivate *priv = RING_NOTIFIER_GET_PRIVATE(view);
 
-    auto title = g_markup_printf_escaped(C_("Text message notification", "%s says:"), idx.data(static_cast<int>(Ring::Role::Name)).toString().toUtf8().constData());
-    auto body = g_markup_escape_text(idx.data(Qt::DisplayRole).toString().toUtf8().constData(), -1);
-
-    NotifyNotification *notification_new = nullptr;
-    NotifyNotification *notification_old = nullptr;
+#if USE_LIBNOTIFY
+    std::shared_ptr<NotifyNotification> notification(
+        notify_notification_new(title.c_str(), body.c_str(), nullptr), g_object_unref);
+    priv->cpp->notifications_.emplace(id, notification);
 
-    /* try to get the previous notification */
-    auto chat_table = ring_notify_get_chat_table();
-    auto list = (GList *)g_hash_table_lookup(chat_table, cm);
-    if (list)
-        notification_old = (NotifyNotification *)list->data;
-
-    /* we display chat notifications in different ways to suit different notification servers and
-     * their capabilities:
-     * 1. if the server doesn't support appending (eg: Notification Daemon) then we update the
-     *    previous notification (if exists) with new text; otherwise it takes we have many
-     *    notifications from the same person... we don't concatinate the old messages because
-     *    servers which don't support append usually don't support multi line bodies
-     * 2. the notify-osd server supports appending; however it doesn't clear the old notifications
-     *    on demand, which means in our case that chat messages which have already been read could
-     *    still be displayed when a new notification is appended, thus in this case, we update
-     *    the old notification body manually to only contain the unread messages
-     * 3. the 3rd case is that the server supports append but is not notify-osd, then we simply use
-     *    the append feature
-     */
-
-    if (notification_old && !server_info.append) {
-        /* case 1 */
-        notify_notification_update(notification_old, title, body, nullptr);
-        notification_new = notification_old;
-    } else if (notification_old && g_strcmp0(server_info.name, SERVER_NOTIFY_OSD) == 0) {
-        /* case 2 */
-        /* print up to MAX_NOTIFICATIONS unread messages */
-        int msg_count = 0;
-        auto idx_next = idx.sibling(idx.row() - 1, idx.column());
-        auto read = idx_next.data(static_cast<int>(Media::TextRecording::Role::IsRead)).toBool();
-        while (idx_next.isValid() && !read && msg_count < MAX_NOTIFICATIONS) {
-
-            auto body_prev = body;
-            body = g_markup_printf_escaped("%s\n%s", body_prev, idx_next.data(Qt::DisplayRole).toString().toUtf8().constData());
-            g_free(body_prev);
-
-            idx_next = idx_next.sibling(idx_next.row() - 1, idx_next.column());
-            read = idx_next.data(static_cast<int>(Media::TextRecording::Role::IsRead)).toBool();
-            ++msg_count;
+    // Draw icon
+    auto firstLetter = name.empty() ? "" : QString(QString(name.c_str()).at(0)).toStdString();  // NOTE best way to be compatible with UTF-8
+    auto default_avatar = Interfaces::PixbufManipulator().generateAvatar(firstLetter, uri);
+    auto photo = Interfaces::PixbufManipulator().scaleAndFrame(default_avatar.get(), QSize(50, 50));
+    if (!icon.empty()) {
+        QByteArray byteArray(icon.c_str(), icon.length());
+        QVariant avatar = Interfaces::PixbufManipulator().personPhoto(byteArray);
+        auto pixbuf_photo = Interfaces::PixbufManipulator().scaleAndFrame(avatar.value<std::shared_ptr<GdkPixbuf>>().get(), QSize(50, 50));
+        if (avatar.isValid()) {
+            photo = pixbuf_photo;
         }
+    }
+    notify_notification_set_image_from_pixbuf(notification.get(), photo.get());
 
-        notify_notification_update(notification_old, title, body, nullptr);
-
-        notification_new = notification_old;
+    if (type != NotificationType::CHAT) {
+        notify_notification_set_urgency(notification.get(), NOTIFY_URGENCY_CRITICAL);
+        notify_notification_set_timeout(notification.get(), NOTIFY_EXPIRES_DEFAULT);
     } else {
-        /* need new notification for case 1, 2, or 3 */
-        notification_new = notify_notification_new(title, body, nullptr);
-
-        /* track in hash table */
-        auto list = (GList *)g_hash_table_lookup(chat_table, cm);
-        list = g_list_append(list, notification_new);
-        g_hash_table_replace(chat_table, cm, list);
-
-        /* get photo */
-        QVariant var_p = GlobalInstances::pixmapManipulator().callPhoto(
-            cm, QSize(50, 50), false);
-        std::shared_ptr<GdkPixbuf> photo = var_p.value<std::shared_ptr<GdkPixbuf>>();
-        notify_notification_set_image_from_pixbuf(notification_new, photo.get());
-
-        /* normal priority for messages */
-        notify_notification_set_urgency(notification_new, NOTIFY_URGENCY_NORMAL);
-
-        /* remove the key and value from the hash table once the notification is
-         * closed; note that this will also unref the notification */
-        g_signal_connect(notification_new, "closed", G_CALLBACK(notification_closed), cm);
-
-        /* if the notification server supports actions, make the default action to show the chat view */
-        if (server_info.actions) {
-            notify_notification_add_action(notification_new,
-                                           "default",
-                                           C_("notification action name", "Show"),
-                                           (NotifyActionCallback)ring_notify_show_cm,
-                                           cm,
-                                           nullptr);
-        }
+        notify_notification_set_urgency(notification.get(), NOTIFY_URGENCY_NORMAL);
     }
 
-    GError *error = nullptr;
-    success = notify_notification_show(notification_new, &error);
-
 #if USE_CANBERRA
-    auto status = ca_context_play(ca_gtk_context_get(),
-                                  0,
-                                  CA_PROP_MEDIA_FILENAME,
-                                  NOTIFICATION_FILE,
-                                  NULL);
-    if (status != 0)
-        g_warning("ca_context_play: %s", ca_strerror(status));
-#endif // USE_CANBERRA
-
-    if (!success) {
-        g_warning("failed to show notification: %s", error->message);
-        g_clear_error(&error);
+    if (type != NotificationType::CALL) {
+        auto status = ca_context_play(ca_gtk_context_get(),
+                                      0,
+                                      CA_PROP_MEDIA_FILENAME,
+                                      NOTIFICATION_FILE,
+                                      nullptr);
+        if (status != 0)
+            g_warning("ca_context_play: %s", ca_strerror(status));
     }
+#endif // USE_CANBERRA
 
-    g_free(title);
-    g_free(body);
-
-    return success;
-}
-
-static gboolean
-show_message_if_unread(const QModelIndex *idx)
-{
-    g_return_val_if_fail(idx && idx->isValid(), G_SOURCE_REMOVE);
-
-    if (!idx->data(static_cast<int>(Media::TextRecording::Role::IsRead)).toBool()) {
-        auto cm = idx->data(static_cast<int>(Media::TextRecording::Role::ContactMethod)).value<ContactMethod *>();
-        ring_notify_show_text_message(cm, *idx);
+    // if the notification server supports actions, make the default action to show the chat view
+    if (priv->serverInfo.actions) {
+        if (type != NotificationType::CALL) {
+            notify_notification_add_action(notification.get(),
+                id.c_str(),
+                C_("", "Open conversation"),
+                (NotifyActionCallback)show_chat_view,
+                view,
+                nullptr);
+            if (type != NotificationType::CHAT) {
+                auto addId = "add:" + id;
+                notify_notification_add_action(notification.get(),
+                    addId.c_str(),
+                    C_("", "Accept"),
+                    (NotifyActionCallback)accept_pending,
+                    view,
+                    nullptr);
+                auto rmId = "rm:" + id;
+                notify_notification_add_action(notification.get(),
+                    rmId.c_str(),
+                    C_("", "Refuse"),
+                    (NotifyActionCallback)refuse_pending,
+                    view,
+                    nullptr);
+            }
+        } else {
+            auto acceptId = "accept:" + id;
+            notify_notification_add_action(notification.get(),
+                acceptId.c_str(),
+                C_("", "Accept"),
+                (NotifyActionCallback)accept_call,
+                view,
+                nullptr);
+            auto declineId = "decline:" + id;
+            notify_notification_add_action(notification.get(),
+                declineId.c_str(),
+                C_("", "Decline"),
+                (NotifyActionCallback)decline_call,
+                view,
+                nullptr);
+        }
     }
 
-    return G_SOURCE_REMOVE;
-}
+    GError *error = nullptr;
+    success = notify_notification_show(notification.get(), &error);
 
-static void
-delete_idx(QModelIndex *idx)
-{
-    if (idx) {
-        delete idx;
-        idx = nullptr;
+    if (error) {
+        g_warning("failed to show notification: %s", error->message);
+        g_clear_error(&error);
     }
-}
-
-#endif
-
-void
-ring_notify_message(
-#if !USE_LIBNOTIFY
-    ContactMethod*, Media::TextRecording*)
-#else
-    ContactMethod *cm, Media::TextRecording *t)
-#endif
-{
-
-#if USE_LIBNOTIFY
-    g_return_if_fail(cm && t);
-
-    // get the message
-    auto model = t->instantMessagingModel();
-    auto msg_idx = model->index(model->rowCount()-1, 0);
-
-    ring_notify_show_text_message(cm, msg_idx);
-
-    return;
 #endif
+    return success;
 }
 
 gboolean
-ring_notify_close_chat_notification(
-#if !USE_LIBNOTIFY
-    G_GNUC_UNUSED
-#endif
-    ContactMethod *cm)
+ring_hide_notification(RingNotifier* view, const std::string& id)
 {
-    gboolean notification_existed = FALSE;
+    g_return_val_if_fail(IS_RING_NOTIFIER(view), false);
+    gboolean success = FALSE;
+    RingNotifierPrivate *priv = RING_NOTIFIER_GET_PRIVATE(view);
 
 #if USE_LIBNOTIFY
-    /* checks if there exists a chat notification associated with the given ContactMethod
-     * and tries to close it; if it did exist, then the function returns TRUE */
-    g_return_val_if_fail(cm, FALSE);
-
-
-    auto chat_table = ring_notify_get_chat_table();
-
-    if (auto list = (GList *)g_hash_table_lookup(chat_table, cm)) {
-        while (list) {
-            notification_existed = TRUE;
-            auto notification = (NotifyNotification *)list->data;
-
-            GError *error = NULL;
-            if (!notify_notification_close(notification, &error)) {
-                g_warning("could not close notification: %s", error->message);
-                g_clear_error(&error);
-            }
-
-            list = g_list_next(list);
-        }
+    // Search
+    auto notification = priv->cpp->notifications_.find(id);
+    if (notification == priv->cpp->notifications_.end()) {
+        return success;
     }
-
+    // Close
+    GError *error = nullptr;
+    if (!notify_notification_close(notification->second.get(), &error)) {
+        g_warning("could not close notification: %s", error->message);
+        g_clear_error(&error);
+    }
+    // Erase
+    priv->cpp->notifications_.erase(id);
 #endif
-
-    return notification_existed;
+    return success;
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/ringnotify.h ring-20180816.2.e26b79f~ds1/client-gnome/src/ringnotify.h
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/ringnotify.h	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/ringnotify.h	2018-08-16 15:09:41.000000000 +0000
@@ -1,6 +1,7 @@
 /*
  *  Copyright (C) 2015-2018 Savoir-faire Linux Inc.
  *  Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
+ *  Author: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,22 +22,37 @@
 #define RING_NOTIFY_H_
 
 #include <gtk/gtk.h>
-#include "ringmainwindow.h"
-
-class Call;
-class ContactMethod;
-namespace Media {
-class TextRecording;
-}
+#include <string>
 
 G_BEGIN_DECLS
-
-void     ring_notify_init();
-void     ring_notify_uninit();
-gboolean ring_notify_is_initted();
-gboolean ring_notify_incoming_call(Call*);
-void     ring_notify_message(ContactMethod*, Media::TextRecording*);
-gboolean ring_notify_close_chat_notification(ContactMethod*);
+#define RING_NOTIFIER_TYPE            (ring_notifier_get_type ())
+#define RING_NOTIFIER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), RING_NOTIFIER_TYPE, RingNotifier))
+#define RING_NOTIFIER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), RING_NOTIFIER_TYPE, RingNotifierClass))
+#define IS_RING_NOTIFIER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), RING_NOTIFIER_TYPE))
+#define IS_RING_NOTIFIER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), RING_NOTIFIER_TYPE))
+
+typedef struct _RingNotifier      RingNotifier;
+typedef struct _RingNotifierClass RingNotifierClass;
+
+enum class NotificationType
+{
+    CALL,
+    REQUEST,
+    CHAT
+};
+
+GType      ring_notifier_get_type             (void) G_GNUC_CONST;
+GtkWidget* ring_notifier_new                  (void);
+
+gboolean    ring_show_notification(RingNotifier* view,
+                                   const std::string& icon,
+                                   const std::string& uri,
+                                   const std::string& name,
+                                   const std::string& id,
+                                   const std::string& title,
+                                   const std::string& body,
+                                   NotificationType type);
+gboolean    ring_hide_notification(RingNotifier* view, const std::string& id);
 
 G_END_DECLS
 
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/utils/models.h ring-20180816.2.e26b79f~ds1/client-gnome/src/utils/models.h
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/utils/models.h	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/utils/models.h	2018-08-16 15:09:41.000000000 +0000
@@ -49,8 +49,8 @@
 
 /**
  * Like gtk_combo_box_set_qmodel, but sets a GtkCellRendererText for the combo box which will
- * display the Qt::DisplayRole as simple text. This function is a usefull default for most
- * combo boxes. If you want to customize the GtkCellRenderer of your combo box, you should usefull
+ * display the Qt::DisplayRole as simple text. This function is a useful default for most
+ * combo boxes. If you want to customize the GtkCellRenderer of your combo box, you should useful
  * gtk_combo_box_set_qmodel()
  */
 QMetaObject::Connection
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/video/video_widget.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/video/video_widget.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/video/video_widget.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/video/video_widget.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -393,7 +393,7 @@
 
     /* only play the first selection */
     if (uris && *uris){
-        if (auto out_media = call->firstMedia<Media::Video>(Media::Media::Direction::OUT))
+        if (auto out_media = call->firstMedia<media::Video>(media::Media::Direction::OUT))
             out_media->sourceModel()->setFile(QUrl(*uris));
     }
 
@@ -407,7 +407,7 @@
     g_return_if_fail(data);
     Call *call = (Call*)data;
 
-    if (auto out_media = call->firstMedia<Media::Video>(Media::Media::Direction::OUT))
+    if (auto out_media = call->firstMedia<media::Video>(media::Media::Direction::OUT))
         out_media->sourceModel()->switchTo(device);
 }
 
@@ -440,7 +440,7 @@
         height = gdk_screen_height();
     }
 
-    if (auto out_media = call->firstMedia<Media::Video>(Media::Media::Direction::OUT))
+    if (auto out_media = call->firstMedia<media::Video>(media::Media::Direction::OUT))
         out_media->sourceModel()->setDisplay(display, QRect(x,y,width,height));
 }
 
@@ -467,7 +467,7 @@
     width = gdk_screen_width();
     height = gdk_screen_height();
 
-    if (auto out_media = call->firstMedia<Media::Video>(Media::Media::Direction::OUT))
+    if (auto out_media = call->firstMedia<media::Video>(media::Media::Direction::OUT))
         out_media->sourceModel()->setDisplay(display, QRect(x,y,width,height));
 }
 
@@ -503,7 +503,7 @@
 
         uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
 
-        if (auto out_media = call->firstMedia<Media::Video>(Media::Media::Direction::OUT))
+        if (auto out_media = call->firstMedia<media::Video>(media::Media::Direction::OUT))
             out_media->sourceModel()->setFile(QUrl(uri));
     }
 
@@ -537,7 +537,7 @@
             call = activeCall;
 
     if (call) {
-        if (auto out_media = call->firstMedia<Media::Video>(Media::Media::Direction::OUT)) {
+        if (auto out_media = call->firstMedia<media::Video>(media::Media::Direction::OUT)) {
             sourcemodel = out_media->sourceModel();
             active = sourcemodel->activeIndex();
         }
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/src/webkitchatcontainer.cpp ring-20180816.2.e26b79f~ds1/client-gnome/src/webkitchatcontainer.cpp
--- ring-20180712.2.f3b87a6~ds1/client-gnome/src/webkitchatcontainer.cpp	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/src/webkitchatcontainer.cpp	2018-08-16 15:09:41.000000000 +0000
@@ -154,6 +154,19 @@
     return false;
 }
 
+static void
+webkit_chat_container_execute_js(WebKitChatContainer *view, gchar* function_call)
+{
+    WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
+    webkit_web_view_run_javascript(
+        WEBKIT_WEB_VIEW(priv->webview_chat),
+        function_call,
+        NULL,
+        NULL,
+        NULL
+    );
+}
+
 QJsonObject
 build_interaction_json(lrc::api::ConversationModel& conversation_model,
                        const uint64_t msgId,
@@ -584,46 +597,24 @@
 void
 webkit_chat_container_set_display_links(WebKitChatContainer *view, bool display)
 {
-    WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
     gchar* function_call = g_strdup_printf("setDisplayLinks(%s);",
       display ? "true" : "false");
-
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        function_call,
-        NULL,
-        NULL,
-        NULL
-    );
+    webkit_chat_container_execute_js(view, function_call);
+    g_free(function_call);
 }
 
 void
 webkit_chat_disable_send_interaction(WebKitChatContainer *view, bool isDisabled)
 {
-    auto priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
     gchar* function_call = g_strdup_printf("disableSendMessage(%s);", isDisabled ? "true" : "false");
-
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        function_call,
-        NULL,
-        NULL,
-        NULL
-    );
+    webkit_chat_container_execute_js(view, function_call);
+    g_free(function_call);
 }
 
 void
 webkit_chat_container_clear_sender_images(WebKitChatContainer *view)
 {
-    WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
-
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        "clearSenderImages()",
-        NULL,
-        NULL,
-        NULL
-    );
+    webkit_chat_container_execute_js(view, "clearSenderImages()");
 }
 
 void
@@ -631,14 +622,7 @@
 {
     WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
 
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        "clearMessages()",
-        NULL,
-        NULL,
-        NULL
-    );
-
+    webkit_chat_container_execute_js(view, "clearMessages()");
     webkit_chat_container_clear_sender_images(view);
 }
 
@@ -648,33 +632,17 @@
                                          uint64_t msgId,
                                          const lrc::api::interaction::Info& interaction)
 {
-    WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
-
     auto interaction_object = interaction_to_json_interaction_object(conversation_model, msgId, interaction).toUtf8();
     gchar* function_call = g_strdup_printf("updateMessage(%s);", interaction_object.constData());
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        function_call,
-        NULL,
-        NULL,
-        NULL
-    );
+    webkit_chat_container_execute_js(view, function_call);
     g_free(function_call);
 }
 
 void
 webkit_chat_container_remove_interaction(WebKitChatContainer *view, uint64_t interactionId)
 {
-    WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
-
     gchar* function_call = g_strdup_printf("removeInteraction(%lu);", interactionId);
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        function_call,
-        NULL,
-        NULL,
-        NULL
-    );
+    webkit_chat_container_execute_js(view, function_call);
     g_free(function_call);
 }
 
@@ -685,17 +653,9 @@
                                             uint64_t msgId,
                                             const lrc::api::interaction::Info& interaction)
 {
-    WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
-
     auto interaction_object = interaction_to_json_interaction_object(conversation_model, msgId, interaction).toUtf8();
     gchar* function_call = g_strdup_printf("addMessage(%s);", interaction_object.constData());
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        function_call,
-        NULL,
-        NULL,
-        NULL
-    );
+    webkit_chat_container_execute_js(view, function_call);
     g_free(function_call);
 }
 
@@ -704,17 +664,9 @@
                                     lrc::api::ConversationModel& conversation_model,
                                     const std::map<uint64_t, lrc::api::interaction::Info> interactions)
 {
-    WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
-
     auto interactions_str = interactions_to_json_array_object(conversation_model, interactions).toUtf8();
     gchar* function_call = g_strdup_printf("printHistory(%s)", interactions_str.constData());
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        function_call,
-        NULL,
-        NULL,
-        NULL
-    );
+    webkit_chat_container_execute_js(view, function_call);
     g_free(function_call);
 }
 
@@ -722,19 +674,9 @@
 webkit_chat_container_set_invitation(WebKitChatContainer *view, bool show,
                                      const std::string& contactUri)
 {
-    auto priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
-    gchar* function_call = nullptr;
-
     // TODO better escape names
-    function_call = g_strdup_printf(show ? "showInvitation(\"%s\")" : "showInvitation()", contactUri.c_str());
-
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        function_call,
-        NULL,
-        NULL,
-        NULL
-    );
+    gchar* function_call = g_strdup_printf(show ? "showInvitation(\"%s\")" : "showInvitation()", contactUri.c_str());
+    webkit_chat_container_execute_js(view, function_call);
     g_free(function_call);
 }
 
@@ -764,35 +706,17 @@
 void
 webkit_chat_set_header_visible(WebKitChatContainer *view, bool isVisible)
 {
-    WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
-
     gchar* function_call = g_strdup_printf("displayNavbar(%s)", isVisible ? "true" : "false");
-
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        function_call,
-        NULL,
-        NULL,
-        NULL
-    );
+    webkit_chat_container_execute_js(view, function_call);
     g_free(function_call);
 }
 
 void
 webkit_chat_update_chatview_frame(WebKitChatContainer *view, bool accountEnabled, bool isBanned, bool isTemporary, const gchar* alias, const gchar* bestId)
 {
-    WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(view);
-
     gchar* function_call = g_strdup_printf("update_chatview_frame(%s, %s, %s, \"%s\", \"%s\")",
                                            accountEnabled ? "true" : "false",
                                            isBanned ? "true" : "false", isTemporary ? "true" : "false", alias, bestId);
-
-    webkit_web_view_run_javascript(
-        WEBKIT_WEB_VIEW(priv->webview_chat),
-        function_call,
-        NULL,
-        NULL,
-        NULL
-    );
+    webkit_chat_container_execute_js(view, function_call);
     g_free(function_call);
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/ui/accountcreationwizard.ui ring-20180816.2.e26b79f~ds1/client-gnome/ui/accountcreationwizard.ui
--- ring-20180712.2.f3b87a6~ds1/client-gnome/ui/accountcreationwizard.ui	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/ui/accountcreationwizard.ui	2018-08-16 15:09:41.000000000 +0000
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.10"/>
-  <template class="AccountCreationWizard" parent="GtkBox">
+  <template class="AccountCreationWizard" parent="GtkScrolledWindow">
     <child>
-      <object class="GtkBox">
+      <object class="GtkScrolledWindow">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">15</property>
-        <property name="valign">center</property>
-        <property name="halign">center</property>
         <child>
           <object class="GtkStack" id="stack_account_creation">
             <property name="visible">True</property>
@@ -111,7 +107,7 @@
             <!-- Existing account wizard -->
             <child>
               <object class="GtkBox" id="existing_account">
-                <property name="visible">True</property>
+                <property name="visible">False</property>
                 <property name="valign">center</property>
                 <property name="border_width">10</property>
                 <property name="orientation">vertical</property>
@@ -142,12 +138,14 @@
                   <object class="GtkBox" id="vbox_existing_account_entry">
                     <property name="visible">True</property>
                     <property name="valign">center</property>
+                    <property name="halign">center</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">10</property>
                     <child>
                       <object class="GtkBox" id="import_hbox">
                         <property name="visible">True</property>
                         <property name="valign">center</property>
+                        <property name="halign">center</property>
                         <property name="border_width">10</property>
                         <property name="orientation">horizontal</property>
                         <property name="spacing">15</property>
@@ -225,26 +223,26 @@
                         <property name="visibility">False</property>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButtonBox">
-                    <property name="visible">True</property>
                     <child>
-                      <object class="GtkButton" id="button_existing_account_previous">
-                        <property name="label" translatable="yes">Previous</property>
+                      <object class="GtkButtonBox">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="halign">start</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="button_existing_account_next">
-                        <property name="label" translatable="yes">Next</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="halign">end</property>
+                        <child>
+                          <object class="GtkButton" id="button_existing_account_previous">
+                            <property name="label" translatable="yes">Previous</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="halign">start</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="button_existing_account_next">
+                            <property name="label" translatable="yes">Next</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="halign">end</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -255,7 +253,7 @@
             <!-- account creation wizard -->
             <child>
               <object class="GtkBox" id="account_creation">
-                <property name="visible">True</property>
+                <property name="visible">False</property>
                 <property name="valign">center</property>
                 <property name="halign">center</property>
                 <property name="border_width">10</property>
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/ui/generalsettingsview.ui ring-20180816.2.e26b79f~ds1/client-gnome/ui/generalsettingsview.ui
--- ring-20180712.2.f3b87a6~ds1/client-gnome/ui/generalsettingsview.ui	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/ui/generalsettingsview.ui	2018-08-16 15:09:41.000000000 +0000
@@ -90,6 +90,14 @@
                       </object>
                     </child>
                     <child>
+                      <object class="GtkCheckButton" id="checkbutton_pendingnotifications">
+                        <property name="label" translatable="yes">Enable notifications for pending requests.</property>
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkCheckButton" id="checkbutton_chatnotifications">
                         <property name="label" translatable="yes">Enable notifications for new chat messages.</property>
                         <property name="visible">True</property>
diff -Nru ring-20180712.2.f3b87a6~ds1/client-gnome/web/chatview.html ring-20180816.2.e26b79f~ds1/client-gnome/web/chatview.html
--- ring-20180712.2.f3b87a6~ds1/client-gnome/web/chatview.html	2018-07-12 21:48:31.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/client-gnome/web/chatview.html	2018-08-16 15:09:41.000000000 +0000
@@ -10,8 +10,8 @@
           <div id="navbar">
             <div id="backButton" class="nav-button non-action-button nav-left" onmouseover="addBackButtonHoverProperty()" onclick="backToWelcomeView()" title="Hide chat view">
                 <svg class="svgicon" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24">
-                    <path d="M11.67 3.87L9.9 2.1 0 12l9.9 9.9 1.77-1.77L3.54 12z"/>
-                    <path fill="none" d="M0 0h24v24H0z"/>
+                    <path d="M0 0h24v24H0z" fill="none"/>
+                    <path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"/>
                 </svg>
             </div>
             <div id="nav-contactid" class="nav-left">
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/bin/dbus/cx.ring.Ring.CallManager.xml ring-20180816.2.e26b79f~ds1/daemon/bin/dbus/cx.ring.Ring.CallManager.xml
--- ring-20180712.2.f3b87a6~ds1/daemon/bin/dbus/cx.ring.Ring.CallManager.xml	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/bin/dbus/cx.ring.Ring.CallManager.xml	2018-08-16 15:09:51.000000000 +0000
@@ -178,7 +178,7 @@
             </tp:docstring>
             <arg type="s" name="transferID" direction="in">
               <tp:docstring>
-                The callID of the call to be transfered.
+                The callID of the call to be transferred.
               </tp:docstring>
             </arg>
             <arg type="s" name="targetID" direction="in">
@@ -271,7 +271,7 @@
             <tp:docstring>
                 Detach local participant from the conference.
                 Remote participants are placed in hold.
-                The signal <tp:member-ref>conferenceChanged</tp:member-ref> is emited.
+                The signal <tp:member-ref>conferenceChanged</tp:member-ref> is emitted.
             </tp:docstring>
             <arg type="b" name="detachSucceeded" direction="out"/>
         </method>
@@ -279,7 +279,7 @@
         <method name="detachParticipant" tp:name-for-bindings="detachParticipant">
             <tp:added version="0.9.7"/>
             <tp:docstring>
-              Detach the given call from the conference. If only one participant is left, the conference is deleted and the signal <tp:member-ref>conferenceRemoved</tp:member-ref> is emited.
+              Detach the given call from the conference. If only one participant is left, the conference is deleted and the signal <tp:member-ref>conferenceRemoved</tp:member-ref> is emitted.
             </tp:docstring>
             <arg type="s" name="callID" direction="in">
               <tp:docstring>
@@ -342,7 +342,7 @@
         <method name="getConferenceId" tp:name-for-bindings="getConferenceId">
             <tp:added version="1.1.0"/>
             <tp:docstring>
-                If thsi call participate to a conference, return the conference id.
+                If this call participate to a conference, return the conference id.
                 Return an empty string elsewhere.
             </tp:docstring>
             <arg type="s" name="callID" direction="in">
@@ -415,7 +415,7 @@
 
         <signal name="recordPlaybackFilepath" tp:name-for-bindings="recordPlaybackFilepath">
             <tp:docstring>
-              Once after starting recording for the first time, this signal is emited to
+              Once after starting recording for the first time, this signal is emitted to
               provide the recorded file path to client application.
             </tp:docstring>
             <arg type="s" name="callID" />
@@ -650,7 +650,7 @@
         <signal name="conferenceCreated" tp:name-for-bindings="conferenceCreated">
             <tp:added version="0.9.7"/>
             <tp:docstring>
-              Emited when a new conference is created. Ring-client is reponsible for storing the confID and call <tp:member-ref>getParticipantList</tp:member-ref> to update the display.
+              Emitted when a new conference is created. Ring-client is responsible for storing the confID and call <tp:member-ref>getParticipantList</tp:member-ref> to update the display.
             </tp:docstring>
             <arg type="s" name="confID">
               <tp:docstring>
@@ -662,7 +662,7 @@
         <signal name="conferenceRemoved" tp:name-for-bindings="conferenceRemoved">
             <tp:added version="0.9.7"/>
             <tp:docstring>
-              Emited when a new conference is remove. Ring-client should have kept a list of current participant in order to display modification.
+              Emitted when a new conference is remove. Ring-client should have kept a list of current participant in order to display modification.
             </tp:docstring>
             <arg type="s" name="confID">
               <tp:docstring>
@@ -727,7 +727,7 @@
         <signal name="transferSucceeded" tp:name-for-bindings="transferSucceeded">
             <tp:docstring>
               <p>Transfer has been successfully
-              processed. Client should remove transfered
+              processed. Client should remove transferred
               call from call list as it is no longer
               accessible in Ring-daemon (dring).</p>
             </tp:docstring>
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/bin/dbus/cx.ring.Ring.ConfigurationManager.xml ring-20180816.2.e26b79f~ds1/daemon/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
--- ring-20180712.2.f3b87a6~ds1/daemon/bin/dbus/cx.ring.Ring.ConfigurationManager.xml	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/bin/dbus/cx.ring.Ring.ConfigurationManager.xml	2018-08-16 15:09:51.000000000 +0000
@@ -32,7 +32,7 @@
                         <li>CONFIG_ACCOUNT_ENABLE:    True or False (Default: True)</li>
                         <li>CONFIG_ACCOUNT_RESOLVE_ONCE</li>
                         <li>CONFIG_ACCOUNT_TYPE: SIP or RING</li>
-                        <li>HOSTNAME: The IP adress or hostname of the registrar</li>
+                        <li>HOSTNAME: The IP address or hostname of the registrar</li>
                         <li>USERNAME: The username (or extension) of the account</li>
                         <li>PASSWORD: The password associated to the account</li>
                         <li>REALM</li>
@@ -93,7 +93,7 @@
             <tp:docstring>
                 Send new account parameters, or account parameters changes, to the core. The hash table is not required to be complete, only the updated parameters may be specified.
                 <tp:rationale>Account settings are written to the configuration file when ring properly quits.</tp:rationale>
-                <tp:rationale>After calling this method, the core will emit the signal <tp:member-ref>accountsChanged</tp:member-ref> with the updated data. The client must subscribe to this signal and use it to update its internal data structure.</tp:rationale>
+                <tp:rationale>After calling this method, the core will emit the signal <tp:member-ref>accountDetailsChanged</tp:member-ref> with the updated data. The client must subscribe to this signal and use it to update its internal data structure.</tp:rationale>
             </tp:docstring>
             <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="MapStringString"/>
             <arg type="s" name="accountID" direction="in">
@@ -1183,7 +1183,7 @@
            </arg>
            <arg type="b" name="success" direction="out">
                <tp:docstring>
-                   <p>True if the certificate state was succesfully set.</p>
+                   <p>True if the certificate state was successfully set.</p>
                </tp:docstring>
            </arg>
        </method>
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/bin/restcpp/restclient.cpp ring-20180816.2.e26b79f~ds1/daemon/bin/restcpp/restclient.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/bin/restcpp/restclient.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/bin/restcpp/restclient.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -103,7 +103,7 @@
 
     // Configuration event handlers
 
-    // This is a short example of a callbakc using a lambda. In this case, this displays the incomming messages
+    // This is a short example of a callback using a lambda. In this case, this displays the incoming messages
     const std::map<std::string, SharedCallback> configEvHandlers = {
         exportable_callback<ConfigurationSignal::IncomingAccountMessage>([]
             (const std::string& accountID, const std::string& from, const std::map<std::string, std::string>& payloads){
@@ -146,7 +146,7 @@
     // This is the function that initiates the resources.
     // Each resources is defined by a route and a void function with a shared pointer to the session as argument
 
-    // In this case, here's an example of the default route. It will list all the managers availables
+    // In this case, here's an example of the default route. It will list all the managers available
     auto default_res = std::make_shared<restbed::Resource>();
     default_res->set_path("/");
     default_res->set_method_handler("GET", [](const std::shared_ptr<restbed::Session> session){
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/configure.ac ring-20180816.2.e26b79f~ds1/daemon/configure.ac
--- ring-20180712.2.f3b87a6~ds1/daemon/configure.ac	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/configure.ac	2018-08-16 15:09:51.000000000 +0000
@@ -351,13 +351,6 @@
 AC_DEFINE_UNQUOTED([HAVE_JACK], `if test "x$have_jack" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have jack])
 AM_CONDITIONAL(BUILD_JACK, test "x$have_jack" = "xyes")
 
-dnl Check for the samplerate development package - name: libsamplerate0-dev
-LIBSAMPLERATE_MIN_VERSION=0.1.2
-PKG_CHECK_MODULES(SAMPLERATE, samplerate >= ${LIBSAMPLERATE_MIN_VERSION},, AC_MSG_ERROR([Missing libsamplerate development files]))
-
-dnl Check for the sndfile development package - name: libsndfile-dev
-PKG_CHECK_MODULES(SNDFILE, sndfile,, AC_MSG_ERROR([Missing sndfile development files]))
-
 dnl Coverage is default-disabled
 AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage], [Enable coverage]))
 
@@ -453,6 +446,8 @@
 
 PKG_CHECK_MODULES(LIBSWSCALE, libswscale >= 3.1.101,, AC_MSG_ERROR([Missing libswscale development files]))
 
+PKG_CHECK_MODULES(LIBSWRESAMPLE, libswresample >= 1.2.101,, AC_MSG_ERROR([Missing libswresample development files]))
+
 dnl Video is default-enabled
 AC_ARG_ENABLE([video], AS_HELP_STRING([--disable-video], [Disable video]))
 
@@ -541,27 +536,6 @@
 PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}, AM_CONDITIONAL(BUILD_TEST, test 1 = 1 ), AM_CONDITIONAL(BUILD_TEST, test 0 = 1 ))
 
 
-if test "${SYS}" != "mingw32"; then
-# GSM CODEC
-# required dependency(ies): libgsm
-dnl check for libgsm1 (doesn't use pkg-config)
-dnl Check for libgsm
-AC_ARG_WITH([gsm], [AS_HELP_STRING([--without-gsm],
-            [disable support for gsm codec])], [], [with_gsm=yes])
-
-LIBGSM=
-AS_IF([test "x$with_gsm" != xno],
-        [AC_CHECK_HEADER([gsm/gsm.h], , AC_MSG_FAILURE([Unable to find the libgsm1 headers (you may need to install the dev package).  You may use --without-gsm to compile without gsm codec support.]))]
-        [AC_CHECK_LIB([gsm], [gsm_decode], [], [
-            AC_MSG_FAILURE([libgsm link test failed. You may use --without-gsm to compile without gsm codec support.])
-        ])
-    ])
-
-AC_DEFINE_UNQUOTED([HAVE_GSM], `if test "x$with_gsm" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have libgsm])
-fi
-AM_CONDITIONAL(BUILD_GSM, test "x$with_gsm" = "xyes" )
-
-
 # SPEEX CODEC
 # required dependency(ies): libspeex
 dnl Check for libspeex
@@ -590,18 +564,6 @@
 AC_DEFINE_UNQUOTED([HAVE_SPEEXDSP], `if test "x$with_speexdsp" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have libspeexdsp])
 AM_CONDITIONAL(BUILD_SPEEXDSP, test "x$with_speexdsp" = "xyes" )
 
-dnl iLBC is enabled if it's installed
-AC_ARG_WITH([libilbc],
-  [AS_HELP_STRING([--with-libilbc],
-    [support ilbc audio @<:@default=check@:>@])],
-  [],
-  [with_libilbc=check])
-AS_CASE(["$with_libilbc"],
-  [yes], [PKG_CHECK_MODULES([libilbc], [libilbc], [HAVE_LIBILBC=1])],
-  [no], [HAVE_LIBILBC=0],
-  [PKG_CHECK_MODULES([libilbc], [libilbc], [HAVE_LIBILBC=1], [HAVE_LIBILBC=0])])
-AM_CONDITIONAL([BUILD_ILBC], [test "$HAVE_LIBILBC" -eq 1])
-
 dnl opus is enabled if it's installed
 AC_ARG_WITH([opus],
   [AS_HELP_STRING([--with-opus], [support opus audio @<:@default=check@:>@])], [], [with_opus=check])
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/build_all.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/build_all.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/build_all.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/build_all.bat	2018-08-16 15:09:51.000000000 +0000
@@ -1,14 +1,126 @@
 @echo off
-setlocal EnableDelayedExpansion
+@setlocal EnableDelayedExpansion
 
-set SRC=%~dp0
+set CONTRIB_DIR=%~dp0
 
+set platform=win32
+set arch=64
+if "%1"=="uwp" (
+    set platform=x86
+    if "%2"=="x86" (
+        set arch=x86
+        goto arch_x86
+    ) else if "%2"=="x64" (
+        set arch=x64
+        goto arch_x64
+    ) else (
+        goto parameterError
+    )
+) else if "%1"=="win32" (
+    if "%2"=="x86" (
+        set arch=x86
+        goto arch_x86
+    ) else if "%2"=="x64" (
+        set arch=x64
+        goto arch_x64
+    ) else (
+        goto parameterError
+    )
+) else (
+    goto parameterError
+)
+
+:arch_x86
+set MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=Release /p:Platform=Win32 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+if "%1"=="uwp" (
+    set DAEMON_MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=ReleaseLib /p:Platform=Win32 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+    goto uwpProjs
+) else if "%1"=="win32" (
+    set DAEMON_MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=ReleaseLib_win32 /p:Platform=Win32 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+    goto win32Projs
+)
+
+:arch_x64
 set MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=Release /p:Platform=x64 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+if "%1"=="uwp" (
+    set DAEMON_MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=ReleaseLib /p:Platform=x64 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+    goto uwpProjs
+) else if "%1"=="win32" (
+    set DAEMON_MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=ReleaseLib_win32 /p:Platform=x64 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+    goto win32Projs
+)
+
+:uwpProjs
+set TOBUILD=( ^
+build\jsoncpp\makefiles\vs2017\lib_json.vcxproj, ^
+build\argon2\vs2015\Argon2Ref\Argon2Ref.vcxproj, ^
+build\gmp\SMP\libgmp.vcxproj, ^
+build\iconv\SMP\libiconv.vcxproj, ^
+build\zlib\SMP\libzlib.vcxproj, ^
+build\nettle\SMP\libnettle.vcxproj, ^
+build\nettle\SMP\libhogweed.vcxproj, ^
+build\gnutls\SMP\libgnutls.vcxproj, ^
+build\msgpack-c\vs2017\msgpackc-static.vcxproj, ^
+build\opendht\MSVC\opendht_vs2017.vcxproj, ^
+build\pjproject\pjlib-util\build\pjlib_util.vcxproj, ^
+build\pjproject\pjmedia\build\pjmedia.vcxproj, ^
+build\pjproject\pjmedia\build\pjmedia_codec.vcxproj, ^
+build\pjproject\pjlib\build\pjlib.vcxproj, ^
+build\pjproject\pjsip\build\pjsip_core.vcxproj, ^
+build\pjproject\pjsip\build\pjsip_simple.vcxproj, ^
+build\pjproject\pjsip\build\pjsua_lib.vcxproj, ^
+build\pjproject\pjsip\build\pjsua2_lib.vcxproj, ^
+build\pjproject\pjsip\build\pjsip_ua.vcxproj, ^
+build\pjproject\pjnath\build\pjnath.vcxproj, ^
+build\pthreads\MSVC\pthreads.vcxproj, ^
+build\libupnp\build\vs2017\ixml.vcxproj, ^
+build\libupnp\build\vs2017\threadutil.vcxproj, ^
+build\libupnp\build\vs2017\libupnp.vcxproj, ^
+build\secp256k1\MSVC\secp256k1.vcxproj, ^
+build\portaudio\msvc\uwp\portaudio.vcxproj, ^
+build\yaml-cpp\msvc\yaml-cpp.vcxproj, ^
+build\pcre\msvc\pcre.vcxproj, ^
+)
+goto startBuild
+
+:win32Projs
+set TOBUILD=( ^
+build\jsoncpp\makefiles\vs2017\lib_json.vcxproj, ^
+build\argon2\vs2015\Argon2Ref\Argon2Ref.vcxproj, ^
+build\gmp\SMP\libgmp.vcxproj, ^
+build\iconv\SMP\libiconv.vcxproj, ^
+build\zlib\SMP\libzlib.vcxproj, ^
+build\nettle\SMP\libnettle.vcxproj, ^
+build\nettle\SMP\libhogweed.vcxproj, ^
+build\gnutls\SMP\libgnutls.vcxproj, ^
+build\msgpack-c\vs2017\msgpackc-static.vcxproj, ^
+build\opendht\MSVC\opendht_vs2017.vcxproj, ^
+build\pjproject\pjlib-util\build\pjlib_util.vcxproj, ^
+build\pjproject\pjmedia\build\pjmedia.vcxproj, ^
+build\pjproject\pjmedia\build\pjmedia_codec.vcxproj, ^
+build\pjproject\pjlib\build\pjlib.vcxproj, ^
+build\pjproject\pjsip\build\pjsip_core.vcxproj, ^
+build\pjproject\pjsip\build\pjsip_simple.vcxproj, ^
+build\pjproject\pjsip\build\pjsua_lib.vcxproj, ^
+build\pjproject\pjsip\build\pjsua2_lib.vcxproj, ^
+build\pjproject\pjsip\build\pjsip_ua.vcxproj, ^
+build\pjproject\pjnath\build\pjnath.vcxproj, ^
+build\pthreads\MSVC\pthreads.vcxproj, ^
+build\libupnp\build\vs2017\ixml.vcxproj, ^
+build\libupnp\build\vs2017\threadutil.vcxproj, ^
+build\libupnp\build\vs2017\libupnp.vcxproj, ^
+build\secp256k1\MSVC\secp256k1.vcxproj, ^
+build\portaudio\msvc\portaudio.vcxproj, ^
+build\yaml-cpp\msvc\yaml-cpp.vcxproj, ^
+build\pcre\msvc\pcre.vcxproj, ^
+)
+goto startBuild
 
+:startBuild
 @setlocal
 
-set VSInstallerFolder="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
-if %PROCESSOR_ARCHITECTURE%==x86 set VSInstallerFolder="%ProgramFiles%\Microsoft Visual Studio\Installer"
+set VSInstallerFolder="%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer"
+if %PROCESSOR_ARCHITECTURE%==x86 set VSInstallerFolder="%ProgramFiles%\\Microsoft Visual Studio\\Installer"
 
 pushd %VSInstallerFolder%
 for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
@@ -18,20 +130,35 @@
 
 echo VS Installation folder: %VSLATESTDIR%
 
-if not exist "%VSLATESTDIR%\VC\Auxiliary\Build\vcvarsall.bat" (
+if not exist "%VSLATESTDIR%\\VC\\Auxiliary\\Build\\vcvarsall.bat" (
     echo:
     echo VSInstallDir not found or not installed correctly.
     goto cleanup
 )
 
 if %PROCESSOR_ARCHITECTURE%==x86 (
-    set Comp_x86=x86 uwp 10.0.15063.0
-    set Comp_x64=x86_amd64 uwp 10.0.15063.0
-    set Comp_ARM=x86_arm uwp 10.0.15063.0
+    if "%1"=="uwp" (
+        set Comp_x86=x86 uwp 10.0.15063.0
+        set Comp_x64=x86_amd64 uwp 10.0.15063.0
+    ) else (
+        set Comp_x86=x86 10.0.15063.0
+        set Comp_x64=x86_amd64 10.0.15063.0
+    )
 ) else (
-    set Comp_x86=amd64_x86 uwp 10.0.15063.0
-    set Comp_x64=amd64 uwp 10.0.15063.0
-    set Comp_ARM=amd64_arm uwp 10.0.15063.0
+    if "%1"=="uwp" (
+        set Comp_x86=amd64_x86 uwp 10.0.15063.0
+        set Comp_x64=amd64 uwp 10.0.15063.0
+    ) else (
+        set Comp_x86=amd64_x86 10.0.15063.0
+        set Comp_x64=amd64 10.0.15063.0
+    )
+)
+
+set path=%path:"=%
+if "%2"=="x86" (
+    call "%VSLATESTDIR%"\\VC\\Auxiliary\\Build\\vcvarsall.bat %Comp_x86%
+) else if "%2"=="x64" (
+    call "%VSLATESTDIR%"\\VC\\Auxiliary\\Build\\vcvarsall.bat %Comp_x64%
 )
 
 set MSYS2_PATH_TYPE=inherit
@@ -43,75 +170,54 @@
     if exist C:\msys\usr\bin\bash.exe set MSYS2_BIN="C:\msys\usr\bin\bash.exe"
 )
 
-echo building ffmpeg for uwp x64...
-set path=%path:"=%
-call "%VSLATESTDIR%"\\VC\\Auxiliary\\Build\\vcvarsall.bat %Comp_x64%
-
-rem * build libx264 *
-call :build build\x264\SMP\libx264.vcxproj
-
-rem * build libopus *
-call :build build\opus\SMP\libopus.vcxproj
-
-rem * build ffmpeg *
-%MSYS2_BIN% --login -x %~dp0src/ffmpeg/windows-uwp-x64-configure-make.sh
-
-rem * build openssl *
-cd build\restbed\dependency\openssl
-call perl Configure no-asm no-hw no-dso VC-WINUNIVERSAL
-call ms\do_winuniversal
-call ms\setVSvars universal10.0x64
+if "%1"=="win32" (
+    :: build livpx
+    call :build %CONTRIB_DIR%build\vpx\SMP\libvpx.vcxproj
+)
+:: build libx264
+call :build %CONTRIB_DIR%build\x264\SMP\libx264.vcxproj
+:: build libopus
+call :build %CONTRIB_DIR%build\opus\SMP\libopus.vcxproj
+:: build ffmpeg
+%MSYS2_BIN% --login -x %CONTRIB_DIR%src/ffmpeg/windows-configure-make.sh %1 %2
+
+:: build openssl
+cd %CONTRIB_DIR%build\restbed\dependency\openssl
+if "%1"=="win32" (
+    call perl Configure VC-WIN64A
+    call ms\do_win64a
+) else if "%1"=="uwp" (
+    call perl Configure no-asm no-hw no-dso VC-WINUNIVERSAL
+    call ms\do_winuniversal
+    call ms\setVSvars universal10.0x64
+)
 call nmake -f ms\ntdll.mak
 set PATH=restbed\dependency\openssl\out32dll;%PATH%
 
-rem * build restbed w/asio *
+:: build restbed w/asio
 cd ..\..
 mkdir build
 cd build
 setlocal
 set PATH=C:\\Program Files\\CMake\\bin\\;%PATH%
-cmake -DBUILD_SSL=ON -G "Visual Studio 15 2017 Win64" ..
+if "%2"=="x86" (
+    cmake -DBUILD_SSL=ON -G "Visual Studio 15 2017 Win32" ..
+) else if "%2"=="x64" (
+    cmake -DBUILD_SSL=ON -G "Visual Studio 15 2017 Win64" ..
+)
 cmake --build . --target ALL_BUILD --config Release
 cd ..\..
 
-set DEPENDENCIES=( ^
-build\jsoncpp\makefiles\vs2017\lib_json.vcxproj, ^
-build\argon2\vs2015\Argon2Ref\Argon2Ref.vcxproj, ^
-build\gmp\SMP\libgmp.vcxproj, ^
-build\iconv\SMP\libiconv.vcxproj, ^
-build\zlib\SMP\libzlib.vcxproj, ^
-build\nettle\SMP\libnettle.vcxproj, ^
-build\nettle\SMP\libhogweed.vcxproj, ^
-build\gnutls\SMP\libgnutls.vcxproj, ^
-build\msgpack-c\vs2017\msgpackc-static.vcxproj, ^
-build\opendht\MSVC\opendht_vs2017.vcxproj, ^
-build\pjproject\pjlib-util\build\pjlib_util.vcxproj, ^
-build\pjproject\pjmedia\build\pjmedia.vcxproj, ^
-build\pjproject\pjmedia\build\pjmedia_audiodev.vcxproj, ^
-build\pjproject\pjmedia\build\pjmedia_codec.vcxproj, ^
-build\pjproject\pjmedia\build\pjmedia_videodev.vcxproj, ^
-build\pjproject\pjlib\build\pjlib.vcxproj, ^
-build\pjproject\pjsip\build\pjsip_core.vcxproj, ^
-build\pjproject\pjsip\build\pjsip_simple.vcxproj, ^
-build\pjproject\pjsip\build\pjsua_lib.vcxproj, ^
-build\pjproject\pjsip\build\pjsua2_lib.vcxproj, ^
-build\pjproject\pjsip\build\pjsip_ua.vcxproj, ^
-build\pjproject\pjnath\build\pjnath.vcxproj, ^
-build\pthreads\MSVC\pthreads.vcxproj, ^
-build\libupnp\build\vs2017\ixml.vcxproj, ^
-build\libupnp\build\vs2017\threadutil.vcxproj, ^
-build\libupnp\build\vs2017\libupnp.vcxproj, ^
-build\secp256k1\MSVC\secp256k1.vcxproj, ^
-build\portaudio\msvc\uwp\portaudio.vcxproj, ^
-build\yaml-cpp\msvc\yaml-cpp.vcxproj, ^
-build\pcre\msvc\pcre.vcxproj, ^
-build\libsamplerate\msvc\libsamplerate.vcxproj, ^
+:: build the list
+for %%I in %TOBUILD% do (
+    call :build "%CONTRIB_DIR%%%I"
 )
 
-rem * build the rest *
-for %%I in %DEPENDENCIES% do (
-	call :build "%SRC%%%I"
-)
+goto cleanup
+
+:parameterError
+echo "parameter error"
+goto cleanup
 
 :cleanup
 endlocal
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/argon2/argon2-uwp.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/argon2/argon2-uwp.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/argon2/argon2-uwp.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/argon2/argon2-uwp.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
---- a/vs2015/Argon2Ref/Argon2Ref.vcxproj
-+++ b/vs2015/Argon2Ref/Argon2Ref.vcxproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <ItemGroup Label="ProjectConfigurations">
-     <ProjectConfiguration Include="Debug|Win32">
-       <Configuration>Debug</Configuration>
-@@ -29,46 +29,46 @@
-   <PropertyGroup Label="Globals">
-     <ProjectGuid>{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}</ProjectGuid>
-     <RootNamespace>Argon2Ref</RootNamespace>
--    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
-     <UseDebugLibraries>true</UseDebugLibraries>
--    <PlatformToolset>v140</PlatformToolset>
-+    <PlatformToolset>v141</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
-     <UseDebugLibraries>false</UseDebugLibraries>
--    <PlatformToolset>v140</PlatformToolset>
-+    <PlatformToolset>v141</PlatformToolset>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
-     <UseDebugLibraries>false</UseDebugLibraries>
--    <PlatformToolset>v140</PlatformToolset>
-+    <PlatformToolset>v141</PlatformToolset>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
-     <UseDebugLibraries>true</UseDebugLibraries>
--    <PlatformToolset>v140</PlatformToolset>
-+    <PlatformToolset>v141</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
--    <ConfigurationType>Application</ConfigurationType>
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-     <UseDebugLibraries>false</UseDebugLibraries>
--    <PlatformToolset>v140</PlatformToolset>
-+    <PlatformToolset>v141</PlatformToolset>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
-     <UseDebugLibraries>false</UseDebugLibraries>
--    <PlatformToolset>v140</PlatformToolset>
-+    <PlatformToolset>v141</PlatformToolset>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-@@ -132,6 +132,7 @@
-       <Optimization>Disabled</Optimization>
-       <SDLCheck>true</SDLCheck>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include</AdditionalIncludeDirectories>
-     </ClCompile>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-@@ -140,6 +141,7 @@
-       <Optimization>Disabled</Optimization>
-       <SDLCheck>true</SDLCheck>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include</AdditionalIncludeDirectories>
-     </ClCompile>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-@@ -150,6 +152,7 @@
-       <IntrinsicFunctions>true</IntrinsicFunctions>
-       <SDLCheck>true</SDLCheck>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include</AdditionalIncludeDirectories>
-     </ClCompile>
-     <Link>
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-@@ -179,6 +182,7 @@
-       <IntrinsicFunctions>true</IntrinsicFunctions>
-       <SDLCheck>true</SDLCheck>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include</AdditionalIncludeDirectories>
-     </ClCompile>
-     <Link>
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
--- 
-2.10.2.windows.1
-
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/argon2/argon2-vs2017.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/argon2/argon2-vs2017.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/argon2/argon2-vs2017.patch	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/argon2/argon2-vs2017.patch	2018-08-16 15:09:51.000000000 +0000
@@ -0,0 +1,99 @@
+--- a/vs2015/Argon2Ref/Argon2Ref.vcxproj
++++ b/vs2015/Argon2Ref/Argon2Ref.vcxproj
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+   <ItemGroup Label="ProjectConfigurations">
+     <ProjectConfiguration Include="Debug|Win32">
+       <Configuration>Debug</Configuration>
+@@ -29,46 +29,46 @@
+   <PropertyGroup Label="Globals">
+     <ProjectGuid>{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}</ProjectGuid>
+     <RootNamespace>Argon2Ref</RootNamespace>
+-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
++    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
+-    <PlatformToolset>v140</PlatformToolset>
++    <PlatformToolset>v141</PlatformToolset>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
+-    <PlatformToolset>v140</PlatformToolset>
++    <PlatformToolset>v141</PlatformToolset>
+     <WholeProgramOptimization>true</WholeProgramOptimization>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
+-    <PlatformToolset>v140</PlatformToolset>
++    <PlatformToolset>v141</PlatformToolset>
+     <WholeProgramOptimization>true</WholeProgramOptimization>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
+-    <PlatformToolset>v140</PlatformToolset>
++    <PlatformToolset>v141</PlatformToolset>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+-    <ConfigurationType>Application</ConfigurationType>
++    <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
+-    <PlatformToolset>v140</PlatformToolset>
++    <PlatformToolset>v141</PlatformToolset>
+     <WholeProgramOptimization>true</WholeProgramOptimization>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="Configuration">
+     <ConfigurationType>Application</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
+-    <PlatformToolset>v140</PlatformToolset>
++    <PlatformToolset>v141</PlatformToolset>
+     <WholeProgramOptimization>true</WholeProgramOptimization>
+     <CharacterSet>MultiByte</CharacterSet>
+   </PropertyGroup>
+@@ -132,6 +132,7 @@
+       <Optimization>Disabled</Optimization>
+       <SDLCheck>true</SDLCheck>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include</AdditionalIncludeDirectories>
+     </ClCompile>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+@@ -140,6 +141,7 @@
+       <Optimization>Disabled</Optimization>
+       <SDLCheck>true</SDLCheck>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include</AdditionalIncludeDirectories>
+     </ClCompile>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+@@ -150,6 +152,7 @@
+       <IntrinsicFunctions>true</IntrinsicFunctions>
+       <SDLCheck>true</SDLCheck>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include</AdditionalIncludeDirectories>
+     </ClCompile>
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+@@ -179,6 +182,7 @@
+       <IntrinsicFunctions>true</IntrinsicFunctions>
+       <SDLCheck>true</SDLCheck>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include</AdditionalIncludeDirectories>
+     </ClCompile>
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+-- 
+2.10.2.windows.1
+
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/argon2/fetch_and_patch.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/argon2/fetch_and_patch.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/argon2/fetch_and_patch.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/argon2/fetch_and_patch.bat	2018-08-16 15:09:51.000000000 +0000
@@ -17,6 +17,6 @@
 
 cd %BUILD%\argon2
 
-git apply --reject --whitespace=fix %SRC%\argon2\argon2-uwp.patch
+%APPLY_CMD% %SRC%\argon2\argon2-vs2017.patch
 
 cd %SRC%
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/asio/no_tests_examples.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/asio/no_tests_examples.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/asio/no_tests_examples.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/asio/no_tests_examples.patch	2018-08-16 15:09:51.000000000 +0000
@@ -3,14 +3,22 @@
 
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1,9 +1,1 @@
--if STANDALONE
--SUBDIRS = examples/cpp11 tests
--else
--SUBDIRS = examples/cpp03 tests
+@@ -1,17 +1,1 @@
+-if !STANDALONE
+-EXAMPLES_CPP03 = examples/cpp03
 -endif
 -
--DIST_SUBDIRS = examples/cpp03 examples/cpp11 examples/cpp14 tests
+-if HAVE_CXX11
+-EXAMPLES_CPP11 = examples/cpp11
+-endif
+-
+-if HAVE_CXX14
+-EXAMPLES_CPP14 = examples/cpp14
+-endif
+-
+-SUBDIRS = $(EXAMPLES_CPP03) $(EXAMPLES_CPP11) $(EXAMPLES_CPP14) tests
+-
+-DIST_SUBDIRS = examples/cpp03 examples/cpp11 examples/cpp14 examples/cpp17 tests
 -
  EXTRA_DIST = \
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/asio/revert_pthread_condattr_setclock.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/asio/revert_pthread_condattr_setclock.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/asio/revert_pthread_condattr_setclock.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/asio/revert_pthread_condattr_setclock.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-From 96147deb227697c9942ff6c6b47efa63fabd7ca9 Mon Sep 17 00:00:00 2001
-From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
-Date: Wed, 19 Jul 2017 14:00:20 -0400
-Subject: [PATCH] revert: Android API level 21 or later is required for
- pthread_condattr_setclock.
-
-partial revert from commit ca6aa0cd38ee801e54935371bd11b503edb926e8
----
- asio/include/asio/detail/impl/posix_event.ipp | 5 +----
- 1 files changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/include/asio/detail/posix_event.hpp b/include/asio/detail/posix_event.hpp
-index 57acc6da..62d04257 100644
---- a/include/asio/detail/posix_event.hpp
-+++ b/include/asio/detail/posix_event.hpp
-@@ -116,14 +116,12 @@ public:
-     {
-       state_ += 2;
-       timespec ts;
--#if (defined(__MACH__) && defined(__APPLE__)) \
--      || (defined(__ANDROID__) && (__ANDROID_API__ < 21))
-+#if (defined(__MACH__) && defined(__APPLE__))
-       ts.tv_sec = usec / 1000000;
-       ts.tv_nsec = (usec % 1000000) * 1000;
-       ::pthread_cond_timedwait_relative_np(
-           &cond_, &lock.mutex().mutex_, &ts); // Ignore EINVAL.
- #else // (defined(__MACH__) && defined(__APPLE__))
--      // || (defined(__ANDROID__) && (__ANDROID_API__ < 21))
-       if (::clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
-       {
-         ts.tv_sec += usec / 1000000;
-@@ -134,7 +132,6 @@ public:
-             &lock.mutex().mutex_, &ts); // Ignore EINVAL.
-       }
- #endif // (defined(__MACH__) && defined(__APPLE__))
--       // || (defined(__ANDROID__) && (__ANDROID_API__ < 21))
-       state_ -= 2;
-     }
-     return (state_ & 1) != 0;
--- 
-2.11.0
-
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/asio/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/asio/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/asio/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/asio/rules.mak	2018-08-16 15:09:51.000000000 +0000
@@ -18,7 +18,7 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
 #
 
-ASIO_VERSION := 631c4f89dafc771fcaf9ee7aa565ab33168459a6
+ASIO_VERSION := b0926b61b057ce563241d609cae5768ed3a4e1b1
 ASIO_URL := https://github.com/hlysunnaram/asio/archive/$(ASIO_VERSION).tar.gz
 
 # Pure dependency of restbed: do not add to PKGS.
@@ -29,7 +29,6 @@
 asio: asio-$(ASIO_VERSION).tar.gz
 	$(UNPACK)
 	mv asio-$(ASIO_VERSION)/asio/* asio-$(ASIO_VERSION)/ && rm -rf asio-$(ASIO_VERSION)/asio
-	$(APPLY) $(SRC)/asio/revert_pthread_condattr_setclock.patch
 	$(APPLY) $(SRC)/asio/no_tests_examples.patch
 	$(MOVE)
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/asio/SHA512SUMS ring-20180816.2.e26b79f~ds1/daemon/contrib/src/asio/SHA512SUMS
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/asio/SHA512SUMS	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/asio/SHA512SUMS	2018-08-16 15:09:51.000000000 +0000
@@ -1 +1 @@
-cde4a043e24268ffbcea08c6cb5d669fc983631213fe5e7640d0ef58902f6ee2332a4e777accd2a42456eb7c65c1da9c6c0d219f54c407e190ee593d66d8a731  asio-631c4f89dafc771fcaf9ee7aa565ab33168459a6.tar.gz
+76ee04cbd221bcc2f2fd0a2fc1a2f37e4b4c9996d606d6a70a437ecc77b682f0f649802bff06374dc07bc9c0213f604ec1d37ac1fca184baaf50a60e5bfedafa  asio-b0926b61b057ce563241d609cae5768ed3a4e1b1.tar.gz
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/fetch_all.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/fetch_all.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/fetch_all.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/fetch_all.bat	2018-08-16 15:09:51.000000000 +0000
@@ -1,5 +1,7 @@
-@echo OFF
-SETLOCAL EnableDelayedExpansion
+@echo off
+@setlocal enabledelayedexpansion
+
+echo fetching and patching contrib for %1
 
 if "%USE_CACHE%"=="" (
     set USE_CACHE=0
@@ -7,6 +9,17 @@
 
 set SRC=%~dp0
 
+set WGET_CMD=wget --no-check-certificate --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries=4
+set PATCH_CMD=patch -flp1 -i
+set APPLY_CMD=git apply --reject --ignore-whitespace --whitespace=fix
+
+if "%1"=="uwp" (
+    goto uwpDeps
+) else if "%1"=="win32" (
+    goto win32Deps
+)
+
+:uwpDeps
 set DEPENDENCIES=( ^
 ffmpeg, ^
 argon2, ^
@@ -24,17 +37,42 @@
 portaudio, ^
 pthreads, ^
 restbed, ^
-samplerate, ^
 secp256k1, ^
 upnp, ^
 x264, ^
 yaml-cpp, ^
 )
+goto fetch
 
-set WGET_CMD=wget --no-check-certificate --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries=4
-set PATCH_CMD=patch -flp1 -i
-set APPLY_CMD=git apply --reject --ignore-whitespace --whitespace=fix
+:win32Deps
+set DEPENDENCIES=( ^
+ffmpeg, ^
+argon2, ^
+zlib ^
+gmp, ^
+iconv, ^
+jsoncpp, ^
+msgpack, ^
+nettle, ^
+gnutls, ^
+opendht, ^
+opus, ^
+pcre, ^
+pjproject, ^
+portaudio, ^
+pthreads, ^
+restbed, ^
+secp256k1, ^
+upnp, ^
+vpx, ^
+x264, ^
+yaml-cpp, ^
+)
+goto fetch
 
+:fetch
 for %%I in %DEPENDENCIES% do (
-    call %SRC%\%%I\fetch_and_patch.bat
-)
\ No newline at end of file
+    call %SRC%\%%I\fetch_and_patch.bat %1 %2
+)
+
+@endlocal
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ffmpeg/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ffmpeg/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ffmpeg/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ffmpeg/rules.mak	2018-08-16 15:09:51.000000000 +0000
@@ -3,7 +3,7 @@
 
 PKGS+=ffmpeg
 
-ifeq ($(call need_pkg,"libavutil >= 55.75.100 libavcodec >= 57.106.101 libavformat >= 57.82.100 libavdevice >= 57.8.101 libavfilter >= 6.105.100 libswscale >= 4.7.103"),)
+ifeq ($(call need_pkg,"libavutil >= 55.75.100 libavcodec >= 57.106.101 libavformat >= 57.82.100 libavdevice >= 57.8.101 libavfilter >= 6.105.100 libswscale >= 4.7.103 libswresample >= 2.9.100"),)
 PKGS_FOUND += ffmpeg
 endif
 
@@ -70,6 +70,38 @@
 	--enable-encoder=libopus \
 	--enable-decoder=libopus
 
+# decoders for ringtones and audio streaming
+FFMPEGCONF += \
+	--enable-decoder=flac \
+	--enable-decoder=vorbis \
+	--enable-decoder=pcm_u24be \
+	--enable-decoder=pcm_u24le \
+	--enable-decoder=pcm_u32be \
+	--enable-decoder=pcm_u32le \
+	--enable-decoder=pcm_u8 \
+	--enable-decoder=pcm_f16le \
+	--enable-decoder=pcm_f24le \
+	--enable-decoder=pcm_f32be \
+	--enable-decoder=pcm_f32le \
+	--enable-decoder=pcm_f64be \
+	--enable-decoder=pcm_f64le \
+	--enable-decoder=pcm_s16be \
+	--enable-decoder=pcm_s16be_planar \
+	--enable-decoder=pcm_s16le \
+	--enable-decoder=pcm_s16le_planar \
+	--enable-decoder=pcm_s24be \
+	--enable-decoder=pcm_s24le \
+	--enable-decoder=pcm_s24le_planar \
+	--enable-decoder=pcm_s32be \
+	--enable-decoder=pcm_s32le \
+	--enable-decoder=pcm_s32le_planar \
+	--enable-decoder=pcm_s64be \
+	--enable-decoder=pcm_s64le \
+	--enable-decoder=pcm_s8 \
+	--enable-decoder=pcm_s8_planar \
+	--enable-decoder=pcm_u16be \
+	--enable-decoder=pcm_u16le
+
 #encoders/decoders for images
 FFMPEGCONF += \
 	--enable-encoder=gif \
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ffmpeg/windows-configure-make.sh ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ffmpeg/windows-configure-make.sh
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ffmpeg/windows-configure-make.sh	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ffmpeg/windows-configure-make.sh	2018-08-16 15:09:51.000000000 +0000
@@ -0,0 +1,113 @@
+#!/bin/bash
+set +x
+set +e
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+cd $DIR/../../build/ffmpeg
+FFMPEGCONF='
+            --toolchain=msvc
+            --target-os=win32'
+
+FFMPEGCONF+='
+            --disable-everything
+            --disable-programs
+            --disable-d3d11va
+            --disable-dxva2
+            --disable-postproc
+            --disable-filters'
+
+FFMPEGCONF+='
+            --enable-shared
+            --enable-cross-compile
+            --enable-gpl
+            --enable-swscale
+            --enable-protocols
+            --enable-bsfs'
+
+FFMPEGCONF+='
+            --enable-demuxers
+            --enable-muxers'
+
+FFMPEGCONF+='
+            --enable-parser=h263
+            --enable-parser=h264
+            --enable-parser=mpeg4video
+            --enable-parser=vp8
+            --enable-parser=vp9
+            --enable-parser=opus'
+
+FFMPEGCONF+='
+            --enable-libopus
+            --enable-encoder=libopus
+            --enable-decoder=libopus
+            --enable-encoder=adpcm_g722
+            --enable-decoder=adpcm_g722
+            --enable-encoder=pcm_alaw
+            --enable-decoder=pcm_alaw
+            --enable-encoder=pcm_mulaw
+            --enable-decoder=pcm_mulaw'
+
+FFMPEGCONF+='
+            --enable-libx264
+            --enable-encoder=libx264
+            --enable-decoder=h264
+            --enable-encoder=rawvideo
+            --enable-decoder=rawvideo
+            --enable-encoder=mpeg4
+            --enable-decoder=mpeg4
+            --enable-encoder=h263
+            --enable-encoder=h263p
+            --enable-decoder=h263
+            --enable-encoder=mjpeg
+            --enable-decoder=mjpeg
+            --enable-decoder=mjpegb'
+
+if [ "$1" == "uwp" ]; then
+    EXTRACFLAGS='-MD -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_WIN32_WINNT=0x0A00 -I../../../../../msvc/include -I../../../../../msvc/include/opus'
+    if [ "$2" == "x64" ]; then
+        echo "configure and make ffmpeg for UWP-x64..."
+            EXTRALDFLAGS='-APPCONTAINER WindowsApp.lib libopus.lib libx264.lib -LIBPATH:../../../../../msvc/lib/x64'
+            FFMPEGCONF+=' --arch=x86_64'
+            PREFIX=../../../Build/Windows10/x64
+            OUTDIR=Output/Windows10/x64
+    elif [ "$2" == "x86" ]; then
+        echo "configure and make ffmpeg for UWP-x86..."
+            EXTRALDFLAGS='-APPCONTAINER WindowsApp.lib libopus.lib libx264.lib -LIBPATH:../../../../../msvc/lib/x86'
+            FFMPEGCONF+=' --arch=x86'
+            PREFIX=../../../Build/Windows10/x86
+            OUTDIR=Output/Windows10/x86
+    fi
+elif [ "$1" == "win32" ]; then
+    EXTRACFLAGS='-MD -D_WINDLL -I../../../../../msvc/include -I../../../../../msvc/include/opus -I../../../../../msvc/include/vpx'
+    FFMPEGCONF+='
+                --enable-libvpx
+                --enable-encoder=libvpx_vp8
+                --enable-decoder=vp8
+                --enable-decoder=vp9'
+    FFMPEGCONF+='
+                --enable-indev=dshow
+                --enable-indev=gdigrab
+                --enable-dxva2'
+    if [ "$2" == "x64" ]; then
+        echo "configure and make ffmpeg for win32-x64..."
+        EXTRALDFLAGS='-APPCONTAINER:NO -MACHINE:x64 Ole32.lib Kernel32.lib Gdi32.lib User32.lib Strmiids.lib OleAut32.lib Shlwapi.lib Vfw32.lib Secur32.lib libopus.lib libx264.lib libvpx.lib -LIBPATH:../../../../../msvc/lib/x64'
+        FFMPEGCONF+=' --arch=x86_64'
+        PREFIX=../../../Build/win32/x64
+        OUTDIR=Output/win32/x64
+    elif [ "$2" == "x86" ]; then
+        echo "configure and make ffmpeg for win32-x86..."
+        EXTRALDFLAGS='-APPCONTAINER:NO -MACHINE:x86 Ole32.lib Kernel32.lib Gdi32.lib User32.lib Strmiids.lib OleAut32.lib Shlwapi.lib Vfw32.lib Secur32.lib libopus.lib libx264.lib libvpx.lib -LIBPATH:../../../../../msvc/lib/x86'
+        FFMPEGCONF+=' --arch=x86'
+        PREFIX=../../../Build/win32/x86
+        OUTDIR=Output/win32/x86
+    fi
+fi
+rm -rf $OUTDIR
+mkdir -p $OUTDIR
+cd $OUTDIR
+pwd
+FFMPEGCONF=$(echo $FFMPEGCONF | sed -e "s/[[:space:]]\+/ /g")
+set -x
+set -e
+../../../configure $FFMPEGCONF --extra-cflags="${EXTRACFLAGS}" --extra-ldflags="${EXTRALDFLAGS}" --prefix="${PREFIX}"
+make -j8 install
+cd ../../..
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ffmpeg/windows-configure.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ffmpeg/windows-configure.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ffmpeg/windows-configure.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ffmpeg/windows-configure.patch	2018-08-16 15:09:51.000000000 +0000
@@ -27,6 +27,37 @@
  for linkunit in $LIBRARY_LIST $PROGRAM_LIST $EXTRALIBS_LIST; do
      eval ${linkunit}_extralibs=\$\(flatten_extralibs_wrapper ${linkunit}_extralibs\)
  done
+@@ -6068,29 +6068,7 @@ enabled libvo_amrwbenc    && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_in
+ enabled libvorbis         && require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init &&
+                              require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init
+ 
+-enabled libvpx            && {
+-    enabled libvpx_vp8_decoder && {
+-        check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx ||
+-            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
+-                die "ERROR: libvpx decoder version must be >=1.4.0";
+-    }
+-    enabled libvpx_vp8_encoder && {
+-        check_pkg_config libvpx_vp8_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx ||
+-            check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
+-                die "ERROR: libvpx encoder version must be >=1.4.0";
+-    }
+-    enabled libvpx_vp9_decoder && {
+-        check_pkg_config libvpx_vp9_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx ||
+-            check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs"
+-    }
+-    enabled libvpx_vp9_encoder && {
+-        check_pkg_config libvpx_vp9_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx ||
+-            check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs"
+-    }
+-    if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then
+-        die "libvpx enabled but no supported decoders found"
+-    fi
+-}
++
+ 
+ enabled libwavpack        && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput  -lwavpack
+ enabled libwebp           && {
 -- 
 2.10.2.windows.1
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ffmpeg/windows-uwp-x64-configure-make.sh ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ffmpeg/windows-uwp-x64-configure-make.sh
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ffmpeg/windows-uwp-x64-configure-make.sh	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ffmpeg/windows-uwp-x64-configure-make.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-#!/bin/bash
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-echo "configure and make ffmpeg for UWP-x64..."
-cd $DIR/../../build/ffmpeg
-rm -rf Output/Windows10/x64
-mkdir -p Output/Windows10/x64
-cd Output/Windows10/x64
-../../../configure \
---toolchain=msvc \
---enable-gpl \
---disable-programs \
---disable-d3d11va \
---disable-dxva2 \
---disable-debug \
---disable-postproc \
---arch=x86_64 \
---enable-shared \
---enable-cross-compile \
---target-os=win32 \
---enable-libopus \
---enable-encoder=libopus \
---enable-decoder=libopus \
---enable-encoder=libx264 \
---enable-decoder=h264 \
---enable-parser=h264 \
---enable-libx264 \
---extra-cflags="-MD -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_WIN32_WINNT=0x0A00 -I../../../../../msvc/include -I../../../../../msvc/include/opus" \
---extra-ldflags="-APPCONTAINER WindowsApp.lib libopus.lib libx264.lib -LIBPATH:../../../../../msvc/lib/x64" \
---prefix=../../../Build/Windows10/x64
-make -j8 install
-cd ../../..
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/flac/libFLAC-pc.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/flac/libFLAC-pc.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/flac/libFLAC-pc.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/flac/libFLAC-pc.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
---- flac/src/libFLAC/flac.pc.in.orig	2013-05-05 14:05:30.059024229 +0200
-+++ flac/src/libFLAC/flac.pc.in	2013-05-05 14:06:25.529822137 +0200
-@@ -7,6 +7,6 @@
- Description: Free Lossless Audio Codec Library
- Version: @VERSION@
- Requires.private: @OGG_PACKAGE@
--Libs: -L${libdir} -lFLAC
-+Libs: -L${libdir} -lFLAC -logg
- Libs.private: -lm
- Cflags: -I${includedir}
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/flac/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/flac/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/flac/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/flac/rules.mak	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-# FLAC
-
-FLAC_VERSION := 1.3.0
-FLAC_URL := https://downloads.xiph.org/releases/flac/flac-$(FLAC_VERSION).tar.xz
-
-PKGS += flac
-ifeq ($(call need_pkg,"flac"),)
-PKGS_FOUND += flac
-endif
-
-$(TARBALLS)/flac-$(FLAC_VERSION).tar.xz:
-	$(call download,$(FLAC_URL))
-
-.sum-flac: flac-$(FLAC_VERSION).tar.xz
-
-flac: flac-$(FLAC_VERSION).tar.xz .sum-flac
-	$(UNPACK)
-	$(APPLY) $(SRC)/flac/libFLAC-pc.patch
-ifdef HAVE_DARWIN_OS
-	cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' -i.orig configure
-endif
-ifdef HAVE_ANDROID
-ifeq ($(ANDROID_ABI), x86)
-	# cpu.c:130:29: error: sys/ucontext.h: No such file or directory
-	# defining USE_OBSOLETE_SIGCONTEXT_FLAVOR allows us to bypass that
-	cd $(UNPACK_DIR) && sed -i.orig -e s/"#  undef USE_OBSOLETE_SIGCONTEXT_FLAVOR"/"#define USE_OBSOLETE_SIGCONTEXT_FLAVOR"/g src/libFLAC/cpu.c
-endif
-endif
-	$(UPDATE_AUTOCONFIG)
-	$(MOVE)
-
-FLACCONF := $(HOSTCONF) \
-	--disable-thorough-tests \
-	--disable-doxygen-docs \
-	--disable-xmms-plugin \
-	--disable-cpplibs \
-	--disable-oggtest
-# TODO? --enable-sse
-ifdef HAVE_DARWIN_OS
-ifneq ($(findstring $(ARCH),i386 x86_64),)
-FLACCONF += --disable-asm-optimizations
-endif
-endif
-ifdef HAVE_ANDROID
-ifeq ($(ANDROID_ABI), x86)
-FLACCONF += --disable-asm-optimizations
-endif
-endif
-
-DEPS_flac = ogg
-
-.flac: flac
-	cd $< && $(HOSTVARS) ./configure $(FLACCONF)
-	cd $</include && $(MAKE) install
-	cd $</src && $(MAKE) -C share install && $(MAKE) -C libFLAC install
-	touch $@
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/flac/SHA512SUMS ring-20180816.2.e26b79f~ds1/daemon/contrib/src/flac/SHA512SUMS
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/flac/SHA512SUMS	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/flac/SHA512SUMS	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-9f62a83c2041ec6f02c0df65b796a920a0cd6ba6c2c034bb69535bca5df57ed69f96fe4bb41c0d5ccc229241d90efd2c7ec3785662b5a582a8e20e2e991e6477  flac-1.3.0.tar.xz
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/gnutls/fetch_and_patch.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/gnutls/fetch_and_patch.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/gnutls/fetch_and_patch.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/gnutls/fetch_and_patch.bat	2018-08-16 15:09:51.000000000 +0000
@@ -19,6 +19,11 @@
 
 %APPLY_CMD% %SRC%\gnutls\gnutls-no-egd.patch
 %APPLY_CMD% %SRC%\gnutls\read-file-limits.h.patch
-%APPLY_CMD% %SRC%\gnutls\gnutls-uwp.patch
+
+if "%1"=="uwp" (
+    %APPLY_CMD% %SRC%\gnutls\gnutls-uwp.patch
+)
+
+%APPLY_CMD% %SRC%\gnutls\gnutls-mscver.patch
 
 cd %SRC%
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/gnutls/gnutls-mscver.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/gnutls/gnutls-mscver.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/gnutls/gnutls-mscver.patch	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/gnutls/gnutls-mscver.patch	2018-08-16 15:09:51.000000000 +0000
@@ -0,0 +1,244 @@
+--- a/SMP/libgnutls.vcxproj
++++ b/SMP/libgnutls.vcxproj
+@@ -768,6 +768,7 @@
+   <PropertyGroup Label="Globals">
+     <ProjectGuid>{6F610EE8-7F59-4191-AB88-F63843267C02}</ProjectGuid>
+     <RootNamespace>libgnutls</RootNamespace>
++    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+@@ -1020,7 +1021,7 @@
+       <WarningLevel>Level3</WarningLevel>
+       <Optimization>Disabled</Optimization>
+       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
+@@ -1137,7 +1138,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <WarningLevel>Level3</WarningLevel>
+       <Optimization>Disabled</Optimization>
+       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
+@@ -1150,7 +1151,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+       <TargetMachine>MachineX64</TargetMachine>
+       <SubSystem>Windows</SubSystem>
+-      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;libzlibd.lib;libhogweedd.lib;libgmpd.lib;libnettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>Crypt32.lib;bcrypt.lib;Ws2_32.lib;libzlibd.lib;libhogweedd.lib;libgmpd.lib;libnettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
+     </Lib>
+@@ -1254,7 +1255,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <WarningLevel>Level3</WarningLevel>
+       <Optimization>Disabled</Optimization>
+       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <BufferSecurityCheck>true</BufferSecurityCheck>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+@@ -1375,7 +1376,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <WarningLevel>Level3</WarningLevel>
+       <Optimization>Disabled</Optimization>
+       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <BufferSecurityCheck>true</BufferSecurityCheck>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+@@ -1496,7 +1497,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <WarningLevel>Level3</WarningLevel>
+       <Optimization>Disabled</Optimization>
+       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+@@ -1509,7 +1510,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <ImportLibrary>$(OutDir)\lib\x64\$(TargetName).lib</ImportLibrary>
+       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
+       <ModuleDefinitionFile>libgnutls.def</ModuleDefinitionFile>
+-      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;zlibd.lib;hogweedd.lib;gmpd.lib;nettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>Crypt32.lib;bcrypt.lib;Ws2_32.lib;zlibd.lib;hogweedd.lib;gmpd.lib;nettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
+@@ -1615,7 +1616,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <WarningLevel>Level3</WarningLevel>
+       <Optimization>Disabled</Optimization>
+       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+@@ -1628,7 +1629,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <ImportLibrary>$(OutDir)\lib\x64\$(TargetName).lib</ImportLibrary>
+       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
+       <ModuleDefinitionFile>libgnutls.def</ModuleDefinitionFile>
+-      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;libzlibd.lib;libhogweedd.lib;libgmpd.lib;libnettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>Crypt32.lib;bcrypt.lib;Ws2_32.lib;libzlibd.lib;libhogweedd.lib;libgmpd.lib;libnettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
+@@ -1741,7 +1742,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+       <OmitFramePointers>true</OmitFramePointers>
+       <StringPooling>true</StringPooling>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
+@@ -1866,7 +1867,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+       <OmitFramePointers>true</OmitFramePointers>
+       <StringPooling>true</StringPooling>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
+@@ -1991,7 +1992,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+       <OmitFramePointers>true</OmitFramePointers>
+       <StringPooling>true</StringPooling>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
+@@ -2006,7 +2007,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+       <TargetMachine>MachineX64</TargetMachine>
+       <SubSystem>Windows</SubSystem>
+-      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>Crypt32.lib;bcrypt.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
+     </Lib>
+@@ -2116,7 +2117,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+       <OmitFramePointers>true</OmitFramePointers>
+       <StringPooling>true</StringPooling>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
+@@ -2131,7 +2132,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+       <TargetMachine>MachineX64</TargetMachine>
+       <SubSystem>Windows</SubSystem>
+-      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>Crypt32.lib;bcrypt.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
+     </Lib>
+@@ -2241,7 +2242,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+       <OmitFramePointers>true</OmitFramePointers>
+       <StringPooling>true</StringPooling>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+@@ -2368,7 +2369,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+       <OmitFramePointers>true</OmitFramePointers>
+       <StringPooling>true</StringPooling>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+@@ -2495,7 +2496,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+       <OmitFramePointers>true</OmitFramePointers>
+       <StringPooling>true</StringPooling>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+@@ -2509,7 +2510,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <ImportLibrary>$(OutDir)\lib\x64\$(TargetName).lib</ImportLibrary>
+       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
+       <ModuleDefinitionFile>libgnutls.def</ModuleDefinitionFile>
+-      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;zlib.lib;hogweed.lib;gmp.lib;nettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>Crypt32.lib;bcrypt.lib;Ws2_32.lib;zlib.lib;hogweed.lib;gmp.lib;nettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+@@ -2621,7 +2622,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+       <OmitFramePointers>true</OmitFramePointers>
+       <StringPooling>true</StringPooling>
+-      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+@@ -2635,7 +2636,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
+       <ImportLibrary>$(OutDir)\lib\x64\$(TargetName).lib</ImportLibrary>
+       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
+       <ModuleDefinitionFile>libgnutls.def</ModuleDefinitionFile>
+-      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>Crypt32.lib;bcrypt.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+--- a/lib/algorithms/ciphersuites.c
++++ b/lib/algorithms/ciphersuites.c
+@@ -1327,7 +1327,7 @@ _gnutls_remove_unwanted_ciphersuites(gnutls_session_t session,
+ 	    session->security_parameters.entity == GNUTLS_SERVER ? 1 : 0;
+ 	gnutls_kx_algorithm_t alg[MAX_ALGOS];
+ 	int alg_size = MAX_ALGOS;
+-#if defined(_MSC_VER) && (_MSC_VER <= 1913)
++#if defined(_MSC_VER) && (_MSC_VER <= 1914)
+     uint8_t * new_list = (uint8_t *)_alloca(cipher_suites_size*sizeof(uint8_t));
+ #else
+     uint8_t new_list[cipher_suites_size]; /* it's safe to use that size because it's provided by _gnutls_supported_ciphersuites() */
+--- a/lib/nettle/int/provable-prime.c
++++ b/lib/nettle/int/provable-prime.c
+@@ -1129,7 +1129,7 @@ st_provable_prime(mpz_t p,
+ 	uint8_t tseed[MAX_PVP_SEED_SIZE+1];
+ 	int ret;
+ 	unsigned pseed_length, iterations;
+-#if defined(_MSC_VER) && (_MSC_VER <= 1913)
++#if defined(_MSC_VER) && (_MSC_VER <= 1914)
+ 	uint8_t * pseed = (uint8_t *)_alloca((seed_length + 2) * sizeof(uint8_t));
+ #else
+ 	uint8_t pseed[seed_length + 2];
+--- a/lib/x509.c
++++ b/lib/x509.c
+@@ -1682,7 +1682,7 @@ gnutls_certificate_set_x509_trust(gnutls_certificate_credentials_t res,
+ 				  int ca_list_size)
+ {
+ 	int ret, i, j;
+-#if defined(_MSC_VER) && (_MSC_VER <= 1913)
++#if defined(_MSC_VER) && (_MSC_VER <= 1914)
+     gnutls_x509_crt_t * new_list = (gnutls_x509_crt_t *)_alloca(ca_list_size*sizeof(gnutls_x509_crt_t));
+ #else
+     gnutls_x509_crt_t new_list[ca_list_size];
+@@ -1862,7 +1862,7 @@ gnutls_certificate_set_x509_crl(gnutls_certificate_credentials_t res,
+ 				int crl_list_size)
+ {
+ 	int ret, i, j;
+-#if defined(_MSC_VER) && (_MSC_VER <= 1913)
++#if defined(_MSC_VER) && (_MSC_VER <= 1914)
+     gnutls_x509_crl_t * new_crl = (gnutls_x509_crl_t *)_alloca(crl_list_size*sizeof(gnutls_x509_crl_t));
+ #else
+     gnutls_x509_crl_t new_crl[crl_list_size];
+-- 
+2.10.2.windows.1
+
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/gnutls/gnutls-uwp.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/gnutls/gnutls-uwp.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/gnutls/gnutls-uwp.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/gnutls/gnutls-uwp.patch	2018-08-16 15:09:51.000000000 +0000
@@ -1,224 +1,3 @@
---- a/SMP/libgnutls.vcxproj
-+++ b/SMP/libgnutls.vcxproj
-@@ -768,6 +768,7 @@
-   <PropertyGroup Label="Globals">
-     <ProjectGuid>{6F610EE8-7F59-4191-AB88-F63843267C02}</ProjectGuid>
-     <RootNamespace>libgnutls</RootNamespace>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-@@ -1020,7 +1021,7 @@
-       <WarningLevel>Level3</WarningLevel>
-       <Optimization>Disabled</Optimization>
-       <MultiProcessorCompilation>true</MultiProcessorCompilation>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
-@@ -1137,7 +1138,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <WarningLevel>Level3</WarningLevel>
-       <Optimization>Disabled</Optimization>
-       <MultiProcessorCompilation>true</MultiProcessorCompilation>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
-@@ -1150,7 +1151,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-       <TargetMachine>MachineX64</TargetMachine>
-       <SubSystem>Windows</SubSystem>
--      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;libzlibd.lib;libhogweedd.lib;libgmpd.lib;libnettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>bcrypt.lib;Ws2_32.lib;libzlibd.lib;libhogweedd.lib;libgmpd.lib;libnettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
-     </Lib>
-@@ -1254,7 +1255,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <WarningLevel>Level3</WarningLevel>
-       <Optimization>Disabled</Optimization>
-       <MultiProcessorCompilation>true</MultiProcessorCompilation>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <BufferSecurityCheck>true</BufferSecurityCheck>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-@@ -1375,7 +1376,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <WarningLevel>Level3</WarningLevel>
-       <Optimization>Disabled</Optimization>
-       <MultiProcessorCompilation>true</MultiProcessorCompilation>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <BufferSecurityCheck>true</BufferSecurityCheck>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-@@ -1496,7 +1497,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <WarningLevel>Level3</WarningLevel>
-       <Optimization>Disabled</Optimization>
-       <MultiProcessorCompilation>true</MultiProcessorCompilation>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-@@ -1509,7 +1510,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <ImportLibrary>$(OutDir)\lib\x64\$(TargetName).lib</ImportLibrary>
-       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-       <ModuleDefinitionFile>libgnutls.def</ModuleDefinitionFile>
--      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;zlibd.lib;hogweedd.lib;gmpd.lib;nettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>bcrypt.lib;Ws2_32.lib;zlibd.lib;hogweedd.lib;gmpd.lib;nettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
-       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
-@@ -1615,7 +1616,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <WarningLevel>Level3</WarningLevel>
-       <Optimization>Disabled</Optimization>
-       <MultiProcessorCompilation>true</MultiProcessorCompilation>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;_DEBUG;DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-@@ -1628,7 +1629,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <ImportLibrary>$(OutDir)\lib\x64\$(TargetName).lib</ImportLibrary>
-       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-       <ModuleDefinitionFile>libgnutls.def</ModuleDefinitionFile>
--      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;libzlibd.lib;libhogweedd.lib;libgmpd.lib;libnettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>bcrypt.lib;Ws2_32.lib;libzlibd.lib;libhogweedd.lib;libgmpd.lib;libnettled.lib;%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
-       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
-@@ -1741,7 +1742,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-       <OmitFramePointers>true</OmitFramePointers>
-       <StringPooling>true</StringPooling>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
-@@ -1866,7 +1867,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-       <OmitFramePointers>true</OmitFramePointers>
-       <StringPooling>true</StringPooling>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
-@@ -1991,7 +1992,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-       <OmitFramePointers>true</OmitFramePointers>
-       <StringPooling>true</StringPooling>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
-@@ -2006,7 +2007,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-       <TargetMachine>MachineX64</TargetMachine>
-       <SubSystem>Windows</SubSystem>
--      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>bcrypt.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
-     </Lib>
-@@ -2116,7 +2117,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-       <OmitFramePointers>true</OmitFramePointers>
-       <StringPooling>true</StringPooling>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
-@@ -2131,7 +2132,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-       <TargetMachine>MachineX64</TargetMachine>
-       <SubSystem>Windows</SubSystem>
--      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>bcrypt.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
-     </Lib>
-@@ -2241,7 +2242,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-       <OmitFramePointers>true</OmitFramePointers>
-       <StringPooling>true</StringPooling>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-@@ -2368,7 +2369,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-       <OmitFramePointers>true</OmitFramePointers>
-       <StringPooling>true</StringPooling>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_32;_WIN32_WINNT=0x0502;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-@@ -2495,7 +2496,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-       <OmitFramePointers>true</OmitFramePointers>
-       <StringPooling>true</StringPooling>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-@@ -2509,7 +2510,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <ImportLibrary>$(OutDir)\lib\x64\$(TargetName).lib</ImportLibrary>
-       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-       <ModuleDefinitionFile>libgnutls.def</ModuleDefinitionFile>
--      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;zlib.lib;hogweed.lib;gmp.lib;nettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>bcrypt.lib;Ws2_32.lib;zlib.lib;hogweed.lib;gmp.lib;nettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
-@@ -2621,7 +2622,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-       <OmitFramePointers>true</OmitFramePointers>
-       <StringPooling>true</StringPooling>
--      <PreprocessorDefinitions>HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86;ASM_X86_64;_WIN32_WINNT=0x0600;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>HAVE_WIN32_LOCKS;HAVE_CONFIG_H;inline=__inline;ASN1_BUILDING;ASN1_STATIC;LOCALEDIR=".";__func__=__FUNCTION__;ASM_X86_64;_WIN32_WINNT=0x0A00;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <AdditionalIncludeDirectories>.\;.\lib;..\lib;..\lib\accelerated;..\lib\auth;..\lib\ext;..\lib\extras;..\lib\minitasn1;..\lib\nettle;..\lib\nettle\int;..\lib\openpgp;..\lib\opencdk;..\lib\x509;..\lib\includes;..\gl;$(OutDir)\include;..\lib\accelerated\x86;.\lib\unistring;..\lib\unistring;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4996;4244;4018;4146;4267;4028;4101;4020;4047;4024;4005;4311;4312;4334;4116;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-@@ -2635,7 +2636,7 @@ del /f /q $(OutDir)\licenses\gnutls.txt
-       <ImportLibrary>$(OutDir)\lib\x64\$(TargetName).lib</ImportLibrary>
-       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-       <ModuleDefinitionFile>libgnutls.def</ModuleDefinitionFile>
--      <AdditionalDependencies>Crypt32.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>bcrypt.lib;Ws2_32.lib;libzlib.lib;libhogweed.lib;libgmp.lib;libnettle.lib;%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <AdditionalOptions>/IGNORE:4006,4221,4042 %(AdditionalOptions)</AdditionalOptions>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
---- a/lib/algorithms/ciphersuites.c
-+++ b/lib/algorithms/ciphersuites.c
-@@ -1327,7 +1327,7 @@ _gnutls_remove_unwanted_ciphersuites(gnutls_session_t session,
- 	    session->security_parameters.entity == GNUTLS_SERVER ? 1 : 0;
- 	gnutls_kx_algorithm_t alg[MAX_ALGOS];
- 	int alg_size = MAX_ALGOS;
--#if defined(_MSC_VER) && (_MSC_VER <= 1913)
-+#if defined(_MSC_VER) && (_MSC_VER <= 1914)
-     uint8_t * new_list = (uint8_t *)_alloca(cipher_suites_size*sizeof(uint8_t));
- #else
-     uint8_t new_list[cipher_suites_size]; /* it's safe to use that size because it's provided by _gnutls_supported_ciphersuites() */
---- a/lib/nettle/int/provable-prime.c
-+++ b/lib/nettle/int/provable-prime.c
-@@ -1129,7 +1129,7 @@ st_provable_prime(mpz_t p,
- 	uint8_t tseed[MAX_PVP_SEED_SIZE+1];
- 	int ret;
- 	unsigned pseed_length, iterations;
--#if defined(_MSC_VER) && (_MSC_VER <= 1913)
-+#if defined(_MSC_VER) && (_MSC_VER <= 1914)
- 	uint8_t * pseed = (uint8_t *)_alloca((seed_length + 2) * sizeof(uint8_t));
- #else
- 	uint8_t pseed[seed_length + 2];
 --- a/lib/nettle/sysrng-windows.c
 +++ b/lib/nettle/sysrng-windows.c
 @@ -46,19 +46,19 @@
@@ -412,24 +191,6 @@
  #endif
  
  /*
-@@ -1682,7 +1682,7 @@ gnutls_certificate_set_x509_trust(gnutls_certificate_credentials_t res,
- 				  int ca_list_size)
- {
- 	int ret, i, j;
--#if defined(_MSC_VER) && (_MSC_VER <= 1913)
-+#if defined(_MSC_VER) && (_MSC_VER <= 1914)
-     gnutls_x509_crt_t * new_list = (gnutls_x509_crt_t *)_alloca(ca_list_size*sizeof(gnutls_x509_crt_t));
- #else
-     gnutls_x509_crt_t new_list[ca_list_size];
-@@ -1862,7 +1862,7 @@ gnutls_certificate_set_x509_crl(gnutls_certificate_credentials_t res,
- 				int crl_list_size)
- {
- 	int ret, i, j;
--#if defined(_MSC_VER) && (_MSC_VER <= 1913)
-+#if defined(_MSC_VER) && (_MSC_VER <= 1914)
-     gnutls_x509_crl_t * new_crl = (gnutls_x509_crl_t *)_alloca(crl_list_size*sizeof(gnutls_x509_crl_t));
- #else
-     gnutls_x509_crl_t new_crl[crl_list_size];
 -- 
 2.10.2.windows.1
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/gsm/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/gsm/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/gsm/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/gsm/rules.mak	2018-08-16 15:09:51.000000000 +0000
@@ -2,7 +2,7 @@
 GSM_VERSION := 1.0.13
 GSM_URL := $(CONTRIB_VIDEOLAN)/libgsm_$(GSM_VERSION).tar.gz
 
-PKGS += gsm
+#PKGS += gsm
 
 $(TARBALLS)/libgsm_$(GSM_VERSION).tar.gz:
 	$(call download,$(GSM_URL))
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/libressl/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/libressl/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/libressl/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/libressl/rules.mak	2018-08-16 15:09:51.000000000 +0000
@@ -52,11 +52,11 @@
 else ifdef HAVE_WIN64
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) && $(MAKE) && $(MAKE) install
 else ifeq ($(IOS_TARGET_PLATFORM),iPhoneOS)
-	cd $< && mkdir build && cd build && $(CMAKE) -DDESTDIR=$(PREFIX) -DCMAKE_C_FLAGS='-miphoneos-version-min=9.3 -fembed-bitcode -arch arm64' .. && $(MAKE) && $(MAKE) install
+	cd $< && mkdir build && cd build && $(CMAKE) -DLIBRESSL_TESTS=Off -DLIBRESSL_APPS=Off -DDESTDIR=$(PREFIX) -DCMAKE_C_FLAGS='-miphoneos-version-min=9.3 -fembed-bitcode -arch arm64' .. && $(MAKE) && $(MAKE) install
 else ifeq ($(IOS_TARGET_PLATFORM),iPhoneSimulator)
-	cd $< && mkdir build && cd build && $(CMAKE) -DDESTDIR=$(PREFIX) -DCMAKE_C_FLAGS='-miphoneos-version-min=9.3 -fembed-bitcode -arch x86_64' .. && $(MAKE) && $(MAKE) install
+	cd $< && mkdir build && cd build && $(CMAKE) -DLIBRESSL_TESTS=Off -DLIBRESSL_APPS=Off -DDESTDIR=$(PREFIX) -DCMAKE_C_FLAGS='-miphoneos-version-min=9.3 -fembed-bitcode -arch x86_64' .. && $(MAKE) && $(MAKE) install
 else
-	cd $< && mkdir build && cd build && $(CMAKE) -DDESTDIR=$(PREFIX) .. && $(MAKE) && $(MAKE) install
+	cd $< && mkdir build && cd build && $(CMAKE) -DLIBRESSL_TESTS=Off -DLIBRESSL_APPS=Off -DDESTDIR=$(PREFIX) .. && $(MAKE) && $(MAKE) install
 endif
 	rm -rf $(PREFIX)/lib/*.so $(PREFIX)/lib/*.so.*
 	touch $@
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/main.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/main.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/main.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/main.mak	2018-08-16 15:09:51.000000000 +0000
@@ -362,7 +362,7 @@
 	$(foreach f,$(filter %.tar.xz,$^), && tar xJf $(f) $(if ${BATCH_MODE},,-v)) \
 	$(foreach f,$(filter %.zip,$^), && unzip $(if ${BATCH_MODE},-q) $(f))
 UNPACK_DIR = $(basename $(basename $(notdir $<)))
-APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
+APPLY = (cd $(UNPACK_DIR) && patch -flp1) <
 APPLY_BIN = (cd $(UNPACK_DIR) && patch --binary -flp1) <
 pkg_static = (cd $(UNPACK_DIR) && ../../../contrib/src/pkg-static.sh $(1))
 MOVE = mv $(UNPACK_DIR) $@ && touch $@
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ogg/libogg-1.1.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ogg/libogg-1.1.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ogg/libogg-1.1.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ogg/libogg-1.1.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
---- libogg/configure.in	2010-11-01 21:13:42.000000000 +0100
-+++ libogg.new/configure.in	2010-11-03 23:59:54.267733114 +0100
-@@ -28,17 +28,17 @@
-         case $host in 
-         *-*-irix*)
-                 DEBUG="-g -signed" 
--                CFLAGS="-O2 -w -signed"
-+                EXTRA_CFLAGS="-O2 -w -signed"
-                 PROFILE="-p -g3 -O2 -signed"
- 		;;
-         sparc-sun-solaris*)
-                 DEBUG="-v -g"
--                CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-+                EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-                 PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
- 		;;
-         *)
-                 DEBUG="-g"
--                CFLAGS="-O"
-+                EXTRA_CFLAGS="-O"
-                 PROFILE="-g -p" 
- 		;;
-         esac
-@@ -46,27 +46,27 @@
-         case $host in 
-         *-*-linux*)
-                 DEBUG="-g -Wall -fsigned-char"
--                CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
-+                EXTRA_CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
-                 PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
- 		;;
-         sparc-sun-*)
-                 DEBUG="-g -Wall -fsigned-char"
--                CFLAGS="-O20 -ffast-math -fsigned-char"
-+                EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char"
-                 PROFILE="-pg -g -O20 -fsigned-char" 
- 		;;
- 	*-*-darwin*)
- 		DEBUG="-fno-common -g -Wall -fsigned-char"
--		CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
-+		EXTRA_CFLAGS="-fno-common -O3 -Wall -fsigned-char -ffast-math"
- 		PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
- 		;;
-         *)
-                 DEBUG="-g -Wall -fsigned-char"
--                CFLAGS="-O20 -fsigned-char"
-+                EXTRA_CFLAGS="-O20 -fsigned-char"
-                 PROFILE="-O20 -g -pg -fsigned-char" 
- 		;;
-         esac
- fi
--CFLAGS="$CFLAGS $cflags_save"
-+CFLAGS="$EXTRA_CFLAGS $cflags_save"
- DEBUG="$DEBUG $cflags_save"
- PROFILE="$PROFILE $cflags_save"
- 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ogg/libogg-disable-check.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ogg/libogg-disable-check.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ogg/libogg-disable-check.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ogg/libogg-disable-check.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-diff -ru libogg/src/Makefile.am libogg/src/Makefile.am
---- libogg/src/Makefile.am	2011-08-04 19:07:42.000000000 +0200
-+++ libogg-f/src/Makefile.am	2012-03-21 13:05:23.000000000 +0100
-@@ -9,7 +9,7 @@
- 
- # build and run the self tests on 'make check'
- 
--noinst_PROGRAMS = test_bitwise test_framing
-+noinst_PROGRAMS =
- 
- test_bitwise_SOURCES = bitwise.c
- test_bitwise_CFLAGS = -D_V_SELFTEST
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ogg/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ogg/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ogg/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ogg/rules.mak	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-# libogg
-
-OGG_VERSION := 1.3.1
-
-OGG_URL := https://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.xz
-#OGG_URL := $(CONTRIB_VIDEOLAN)/libogg-$(OGG_VERSION).tar.xz
-
-PKGS += ogg
-ifeq ($(call need_pkg,"ogg >= 1.0"),)
-PKGS_FOUND += ogg
-endif
-
-$(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
-	$(call download,$(OGG_URL))
-
-.sum-ogg: libogg-$(OGG_VERSION).tar.xz
-
-ogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
-	$(UNPACK)
-	$(APPLY) $(SRC)/ogg/libogg-1.1.patch
-	$(APPLY) $(SRC)/ogg/libogg-disable-check.patch
-	$(UPDATE_AUTOCONFIG)
-	$(MOVE)
-
-.ogg: ogg
-	$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
-	cd $< && $(MAKE) install
-	touch $@
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ogg/SHA512SUMS ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ogg/SHA512SUMS
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/ogg/SHA512SUMS	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/ogg/SHA512SUMS	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-980d8916b5d6bf22376105869a9b9d5312cee81f0ff1f6aa9f34359e92a93b7b34555a4c4f124922d87ef7e48a4b9451e35d9b536929b9144fcc22bcf6debbf0  libogg-1.3.1.tar.xz
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/opendht/fetch_and_patch.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/opendht/fetch_and_patch.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/opendht/fetch_and_patch.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/opendht/fetch_and_patch.bat	2018-08-16 15:09:51.000000000 +0000
@@ -1,6 +1,6 @@
 set BUILD=%SRC%..\build
 
-set OPENDHT_VERSION=1.7.3rc2
+set OPENDHT_VERSION=7a961ffc517e7c5673aede79301ece2719ed3b45
 set OPENDHT_URL=https://github.com/savoirfairelinux/opendht/archive/%OPENDHT_VERSION%.tar.gz
 
 mkdir %BUILD%
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/opendht/opendht-vs2017.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/opendht/opendht-vs2017.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/opendht/opendht-vs2017.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/opendht/opendht-vs2017.patch	2018-08-16 15:09:51.000000000 +0000
@@ -160,7 +160,7 @@
 +      <Optimization>Disabled</Optimization>
 +      <SDLCheck>true</SDLCheck>
 +      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\argon2\include;..\..\msgpack-c\include;..\..\..\msvc\include;..\..\jsoncpp\include;..\..\restbed\source</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>OPENDHT_JSONCPP;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
 +      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
 +      <SuppressStartupBanner>false</SuppressStartupBanner>
@@ -183,7 +183,7 @@
 +      <Optimization>Disabled</Optimization>
 +      <SDLCheck>true</SDLCheck>
 +      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\argon2\include;..\..\msgpack-c\include;..\..\..\msvc\include;..\..\jsoncpp\include;..\..\restbed\source</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
 +      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
 +    </ClCompile>
@@ -207,7 +207,7 @@
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <SDLCheck>true</SDLCheck>
 +      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\argon2\include;..\..\msgpack-c\include;..\..\..\msvc\include;..\..\jsoncpp\include;..\..\restbed\source</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>OPENDHT_JSONCPP;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
 +      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
 +      <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
@@ -237,7 +237,7 @@
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <SDLCheck>true</SDLCheck>
 +      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\argon2\include;..\..\msgpack-c\include;..\..\..\msvc\include;..\..\jsoncpp\include;..\..\restbed\source</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;4273;</DisableSpecificWarnings>
 +      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
 +      <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/opendht/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/opendht/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/opendht/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/opendht/rules.mak	2018-08-16 15:09:51.000000000 +0000
@@ -1,5 +1,5 @@
 # OPENDHT
-OPENDHT_VERSION := 1.7.3rc4
+OPENDHT_VERSION := 1.7.4
 OPENDHT_URL := https://github.com/savoirfairelinux/opendht/archive/$(OPENDHT_VERSION).tar.gz
 
 PKGS += opendht
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/opendht/SHA512SUMS ring-20180816.2.e26b79f~ds1/daemon/contrib/src/opendht/SHA512SUMS
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/opendht/SHA512SUMS	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/opendht/SHA512SUMS	2018-08-16 15:09:51.000000000 +0000
@@ -1 +1 @@
-894499d4a49b664fb5372e36453fcd03f0aa5600be3e58eb03304422725de8caddbf03251d7c02d0a98c2bb82d7c31029d09fb244f24afe8cca03994cf9fd959  opendht-1.7.3rc4.tar.gz
\ No newline at end of file
+be526c696f51471f58278ed53b0167311c2c0dca1db87da711bad9987922a6b5608a71508bd36011da27b3438964a3ee2406439c17c77db8c157c65222faa04e  opendht-1.7.4.tar.gz
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/pjproject/fetch_and_patch.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/pjproject/fetch_and_patch.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/pjproject/fetch_and_patch.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/pjproject/fetch_and_patch.bat	2018-08-16 15:09:51.000000000 +0000
@@ -17,7 +17,6 @@
 
 cd %BUILD%\pjproject
 
-echo off
 for /F "tokens=* usebackq" %%F in (`bash -c "pwd | grep /mnt/c/"`) do (
     set NO_AUTO=%%F
 )
@@ -42,6 +41,8 @@
 %APPLY_CMD% %SRC%\pjproject\pj_vs_config.patch
 %APPLY_CMD% %SRC%\pjproject\pj_vs2017_props.patch
 
-%APPLY_CMD% %SRC%\pjproject\pj_uwp.patch
+if "%1"=="uwp" (
+    %APPLY_CMD% %SRC%\pjproject\pj_uwp.patch
+)
 
 cd %SRC%
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/pjproject/ice_config.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/pjproject/ice_config.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/pjproject/ice_config.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/pjproject/ice_config.patch	2018-08-16 15:09:51.000000000 +0000
@@ -42,5 +42,5 @@
 @@ -325,3 +325,3 @@
  #ifndef PJ_ICE_MAX_CHECKS
 -#   define PJ_ICE_MAX_CHECKS			    32
-+#   define PJ_ICE_MAX_CHECKS			    150
++#   define PJ_ICE_MAX_CHECKS			    1024
  #endif
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/pjproject/rfc2466.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/pjproject/rfc2466.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/pjproject/rfc2466.patch	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/pjproject/rfc2466.patch	2018-08-16 15:09:51.000000000 +0000
@@ -0,0 +1,199 @@
+From 2c4a267fbd68f394630acbab0a0e358d0c905464 Mon Sep 17 00:00:00 2001
+From: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
+Date: Wed, 18 Jul 2018 12:12:04 -0400
+Subject: [PATCH 1/1] RFC 2466: ignore deprecated candidates for new ICE
+ candidates
+
+---
+ pjnath/src/pjnath/ice_session.c | 162 ++++++++++++++++++++++++++++++++
+ 1 file changed, 162 insertions(+)
+
+diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c
+index 63a0d1c9..6cae6b2e 100644
+--- a/pjnath/src/pjnath/ice_session.c
++++ b/pjnath/src/pjnath/ice_session.c
+@@ -29,6 +29,21 @@
+ #include <pj/rand.h>
+ #include <pj/string.h>
+
++#if defined(_WIN32) || defined(__APPLE__)
++/* TODO(sblin): find an alternative for these paltforms */
++#else
++/* The following headers are used to get DEPRECATED addresses
++ * as specified in RFC 2462 Section 5.5.4
++ * https://tools.ietf.org/html/rfc2462#section-5.5.4
++ */
++#include <arpa/inet.h>
++#include <asm/types.h>
++#include <linux/netlink.h>
++#include <linux/rtnetlink.h>
++#include <sys/socket.h>
++#include <unistd.h>
++#endif
++
+ /* String names for candidate types */
+ static const char *cand_type_names[] =
+ {
+@@ -701,6 +716,128 @@ static pj_uint32_t CALC_CAND_PRIO(pj_ice_sess *ice,
+ #endif
+ }
+
++/* retrieve invalid addresses and store it in a string */
++static PJ_DEF(void) get_invalid_addresses(char** addresses, size_t* size)
++{
++#if defined(_WIN32) || defined(__APPLE__)
++  /* TODO(sblin): find an alternative for these paltforms */
++#else
++    struct {
++        struct nlmsghdr        nlmsg_info;
++        struct ifaddrmsg    ifaddrmsg_info;
++    } netlink_req;
++
++    int fd;
++
++    long pagesize = sysconf(_SC_PAGESIZE);
++
++    if (!pagesize)
++        pagesize = 4096; /* Assume pagesize is 4096 if sysconf() failed */
++
++    fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
++    if(fd < 0) {
++        perror("socket initialization error: abort");
++        return;
++    }
++
++    int rtn;
++
++    bzero(&netlink_req, sizeof(netlink_req));
++
++    netlink_req.nlmsg_info.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
++    netlink_req.nlmsg_info.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
++    netlink_req.nlmsg_info.nlmsg_type = RTM_GETADDR;
++    netlink_req.nlmsg_info.nlmsg_pid = getpid();
++
++    netlink_req.ifaddrmsg_info.ifa_family = AF_INET6;
++
++    rtn = send(fd, &netlink_req, netlink_req.nlmsg_info.nlmsg_len, 0);
++    if(rtn < 0) {
++        perror("send error: abort");
++        return;
++    }
++
++    char read_buffer[pagesize];
++    struct nlmsghdr *nlmsg_ptr;
++    int nlmsg_len;
++
++    size_t idx = 0;
++    // Will store all deprecated addresses into a string
++    char* deprecatedAddrs = malloc(256*sizeof(char)*PJ_INET6_ADDRSTRLEN);
++    if (!deprecatedAddrs) {
++      perror("malloc error: abort");
++      return;
++    }
++
++    while(1) {
++        int rtn;
++
++        bzero(read_buffer, pagesize);
++        rtn = recv(fd, read_buffer, pagesize, 0);
++        if(rtn < 0) {
++            perror ("recv(): ");
++            return;
++        }
++
++        nlmsg_ptr = (struct nlmsghdr *) read_buffer;
++        nlmsg_len = rtn;
++
++        if (nlmsg_len < sizeof (struct nlmsghdr)) {
++            perror ("Received an uncomplete netlink packet");
++            return;
++        }
++
++        if (nlmsg_ptr->nlmsg_type == NLMSG_DONE)
++            break;
++
++        for(; NLMSG_OK(nlmsg_ptr, nlmsg_len); nlmsg_ptr = NLMSG_NEXT(nlmsg_ptr, nlmsg_len)) {
++            struct ifaddrmsg *ifaddrmsg_ptr;
++            struct rtattr *rtattr_ptr;
++            int ifaddrmsg_len;
++
++            ifaddrmsg_ptr = (struct ifaddrmsg *) NLMSG_DATA(nlmsg_ptr);
++
++            if (ifaddrmsg_ptr->ifa_flags & IFA_F_DEPRECATED || ifaddrmsg_ptr->ifa_flags & IFA_F_TENTATIVE) {
++                rtattr_ptr = (struct rtattr *) IFA_RTA(ifaddrmsg_ptr);
++                ifaddrmsg_len = IFA_PAYLOAD(nlmsg_ptr);
++
++                for(;RTA_OK(rtattr_ptr, ifaddrmsg_len); rtattr_ptr = RTA_NEXT(rtattr_ptr, ifaddrmsg_len)) {
++                    switch(rtattr_ptr->rta_type) {
++                    case IFA_ADDRESS:
++                        // Any 256 obsolete ips (should not happen), resize the array.
++                        if (idx > 0 && idx % 256 == 0) {
++                          char* newDeprecated = realloc(deprecatedAddrs, (idx + 256)*sizeof(char)*PJ_INET6_ADDRSTRLEN);
++                          if (!newDeprecated) {
++                            perror("realloc error: abort");
++                            return;
++                          }
++                          deprecatedAddrs = newDeprecated;
++                        }
++                        // Store deprecated IP
++                        inet_ntop(ifaddrmsg_ptr->ifa_family, RTA_DATA(rtattr_ptr), &deprecatedAddrs[idx*PJ_INET6_ADDRSTRLEN], sizeof(char)*PJ_INET6_ADDRSTRLEN);
++                        ++idx;
++                        break;
++                    default:
++                        break;
++                    }
++                }
++            }
++        }
++    }
++
++    close(fd);
++    *size = idx;
++    char *final = realloc(deprecatedAddrs, idx*sizeof(char)*PJ_INET6_ADDRSTRLEN);
++    if (!final) {
++      perror("realloc error: abort");
++      return;
++    } else {
++      *addresses = final;
++    }
++#endif
++}
++
++
+
+ /*
+  * Add ICE candidate
+@@ -717,6 +854,31 @@ PJ_DEF(pj_status_t) pj_ice_sess_add_cand(pj_ice_sess *ice,
+ 					 int addr_len,
+ 					 unsigned *p_cand_id)
+ {
++
++
++  /**
++   * RFC 2466: an ip address can have the status DEPRECATED and SHOULD NOT
++   * be used by new by applications unless they already use it.
++   * So, we should ignore these addresses.
++   * Also, ips with the TENTATIVE state are not ready and SHOULD NOT be
++   * used for now. Ignore these addresses too.
++   */
++  char* deprecatedAddrs = NULL;
++  size_t size = 0;
++  get_invalid_addresses(&deprecatedAddrs, &size);
++  if (deprecatedAddrs != NULL) {
++    char tmpAddrStr[PJ_INET6_ADDRSTRLEN];
++    pj_sockaddr_print(addr, tmpAddrStr, sizeof(tmpAddrStr), 0);
++    for (int i = 0; i < size * PJ_INET6_ADDRSTRLEN; i += PJ_INET6_ADDRSTRLEN) {
++      if (strncmp(tmpAddrStr, &deprecatedAddrs[i], PJ_INET6_ADDRSTRLEN) == 0) {
++        free(deprecatedAddrs);
++        // This address is considered as deprecated so, we can ignore this one.
++        return PJ_SUCCESS;
++      }
++    }
++    free(deprecatedAddrs);
++  }
++
+     pj_ice_sess_cand *lcand;
+     pj_status_t status = PJ_SUCCESS;
+     char address[PJ_INET6_ADDRSTRLEN];
+--
+2.17.1
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/pjproject/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/pjproject/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/pjproject/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/pjproject/rules.mak	2018-08-16 15:09:51.000000000 +0000
@@ -34,8 +34,8 @@
 PJPROJECT_OPTIONS += --with-ssl=$(PREFIX)
 endif
 
-PJPROJECT_EXTRA_CFLAGS = -g -DPJ_ENABLE_EXTRA_CHECK=1 -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000 -DPJ_ICE_ST_MAX_CAND=32
-PJPROJECT_EXTRA_CXXFLAGS = -g -DPJ_ENABLE_EXTRA_CHECK=1 -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000 -DPJ_ICE_ST_MAX_CAND=32 -std=gnu++11
+PJPROJECT_EXTRA_CFLAGS = -g -DPJ_ENABLE_EXTRA_CHECK=1 -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=1024 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000 -DPJ_ICE_ST_MAX_CAND=32
+PJPROJECT_EXTRA_CXXFLAGS = -g -DPJ_ENABLE_EXTRA_CHECK=1 -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=1024 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000 -DPJ_ICE_ST_MAX_CAND=32 -std=gnu++11
 
 ifdef HAVE_WIN64
 PJPROJECT_EXTRA_CFLAGS += -DPJ_WIN64=1
@@ -69,6 +69,7 @@
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/pjproject/android.patch
 endif
+	$(APPLY) $(SRC)/pjproject/rfc2466.patch
 	$(APPLY) $(SRC)/pjproject/ipv6.patch
 	$(APPLY) $(SRC)/pjproject/ice_config.patch
 	$(APPLY) $(SRC)/pjproject/multiple_listeners.patch
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/portaudio/fetch_and_patch.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/portaudio/fetch_and_patch.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/portaudio/fetch_and_patch.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/portaudio/fetch_and_patch.bat	2018-08-16 15:09:51.000000000 +0000
@@ -17,6 +17,9 @@
 cd %BUILD%\portaudio
 
 %APPLY_CMD% %SRC%\portaudio\pa-vs2017.patch
-%APPLY_CMD% %SRC%\portaudio\pa-uwp.patch
+
+if "%1"=="uwp" (
+    %APPLY_CMD% %SRC%\portaudio\pa-uwp.patch
+)
 
 cd %SRC%
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/pthreads/fetch_and_patch.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/pthreads/fetch_and_patch.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/pthreads/fetch_and_patch.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/pthreads/fetch_and_patch.bat	2018-08-16 15:09:51.000000000 +0000
@@ -19,7 +19,11 @@
 cd %BUILD%\pthreads
 
 %APPLY_CMD% %SRC%\pthreads\pthreads-windows.patch
-%APPLY_CMD% %SRC%\pthreads\pthreads-uwp.patch
+
+if "%1"=="uwp" (
+    %APPLY_CMD% %SRC%\pthreads\pthreads-uwp.patch
+)
+
 %APPLY_CMD% %SRC%\pthreads\pthreads-vs2017.patch
 
 cd %SRC%
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/restbed/fetch_and_patch.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/restbed/fetch_and_patch.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/restbed/fetch_and_patch.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/restbed/fetch_and_patch.bat	2018-08-16 15:09:51.000000000 +0000
@@ -43,7 +43,11 @@
 rename asio-dependency-%ASIO_VERSION% asio
 
 cd asio
-%APPLY_CMD% %SRC%\restbed\asio-uwp.patch
+
+if "%1"=="uwp" (
+    %APPLY_CMD% %SRC%\restbed\asio-uwp.patch
+)
+    
 cd ..
 
 rem ------------ catch ------------
@@ -77,7 +81,11 @@
 rename openssl-%OPENSSL_VERSION% openssl
 
 cd openssl
-%APPLY_CMD% %SRC%\restbed\openssl-uwp.patch
+
+if "%1"=="uwp" (
+    %APPLY_CMD% %SRC%\restbed\openssl-uwp.patch
+)
+
 cd ..
 
 rem ------------ kashmir ------------
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/carbon.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/carbon.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/carbon.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/carbon.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
---- a/examples/audio_out.c.orig	2014-06-26 21:09:44.000000000 -0400
-+++ b/examples/audio_out.c	2014-06-26 21:09:58.000000000 -0400
-@@ -172,7 +172,6 @@
- 
- #if (defined (__MACH__) && defined (__APPLE__)) /* MacOSX */
- 
--#include <Carbon.h>
- #include <CoreAudio/AudioHardware.h>
- 
- #define	MACOSX_MAGIC	MAKE_MAGIC ('M', 'a', 'c', ' ', 'O', 'S', ' ', 'X')
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/disable_assembler.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/disable_assembler.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/disable_assembler.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/disable_assembler.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
---- a/src/float_cast.h	2011-01-19 05:39:36.000000000 -0500
-+++ b/src/float_cast.h	2016-05-30 17:09:20.000000000 -0400
-@@ -230,38 +230,12 @@
- 	#undef lrint
- 	#undef lrintf
-
--	#define lrint	double2int
--	#define lrintf	float2int
-+	#warning "Don't have the functions lrint() and lrintf()."
-+	#warning "Replacing these functions with a standard C cast."
-
--	inline static long
--	float2int (register float in)
--	{	int res [2] ;
--
--		__asm__ __volatile__
--		(	"fctiw	%1, %1\n\t"
--			"stfd	%1, %0"
--			: "=m" (res)	/* Output */
--			: "f" (in)		/* Input */
--			: "memory"
--			) ;
--
--		return res [1] ;
--	} /* lrintf */
--
--	inline static long
--	double2int (register double in)
--	{	int res [2] ;
--
--		__asm__ __volatile__
--		(	"fctiw	%1, %1\n\t"
--			"stfd	%1, %0"
--			: "=m" (res)	/* Output */
--			: "f" (in)		/* Input */
--			: "memory"
--			) ;
-+	#define	lrint(dbl)		((long) (dbl))
-+	#define	lrintf(flt)		((long) (flt))
-
--		return res [1] ;
--	} /* lrint */
-
- #else
- 	#ifndef __sgi
-@@ -278,4 +252,3 @@
-
-
- #endif /* FLOAT_CAST_HEADER */
--
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/disable_tests.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/disable_tests.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/disable_tests.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/disable_tests.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-From 4188b5b9e553911f562e2ae147c8d2ae17bc2500 Mon Sep 17 00:00:00 2001
-From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
-Date: Wed, 2 Aug 2017 16:42:36 -0400
-Subject: [PATCH] don't build example, doc, tests
-
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 1295c92..47bd97d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,7 @@
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
- 
--SUBDIRS = M4 src doc examples tests
-+SUBDIRS = M4 src
- DIST_SUBDIRS = Win32 $(SUBDIRS)
- 
- EXTRA_DIST = autogen.sh libsamplerate.spec.in samplerate.pc.in Make.bat
--- 
-2.11.0
-
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/fetch_and_patch.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/fetch_and_patch.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/fetch_and_patch.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/fetch_and_patch.bat	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-set BUILD=%SRC%..\build
-
-set SAMPLERATE_VERSION=0.1.8
-set SAMPLERATE_URL="http://www.mega-nerd.com/SRC/libsamplerate-%SAMPLERATE_VERSION%.tar.gz"
-
-mkdir %BUILD%
-
-if %USE_CACHE%==1 (
-    copy %CACHE_DIR%\libsamplerate-%SAMPLERATE_VERSION%.tar.gz %cd%
-) else (
-    %WGET_CMD% %SAMPLERATE_URL%
-)
-
-7z -y e libsamplerate-%SAMPLERATE_VERSION%.tar.gz  && 7z -y x libsamplerate-%SAMPLERATE_VERSION%.tar -o%BUILD%
-del libsamplerate-%SAMPLERATE_VERSION%.tar && del libsamplerate-%SAMPLERATE_VERSION%.tar.gz
-rename %BUILD%\libsamplerate-%SAMPLERATE_VERSION% libsamplerate
-
-cd %BUILD%\libsamplerate
-
-%APPLY_CMD% %SRC%\samplerate\samplerate-vs2017.patch
-
-cd %SRC%
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/rules.mak	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# SAMPLERATE
-SAMPLERATE_VERSION := 0.1.8
-SAMPLERATE_URL := http://www.mega-nerd.com/SRC/libsamplerate-$(SAMPLERATE_VERSION).tar.gz
-
-PKGS += samplerate
-ifeq ($(call need_pkg,"samplerate"),)
-PKGS_FOUND += samplerate
-endif
-
-$(TARBALLS)/libsamplerate-$(SAMPLERATE_VERSION).tar.gz:
-	$(call download,$(SAMPLERATE_URL))
-
-.sum-samplerate: libsamplerate-$(SAMPLERATE_VERSION).tar.gz
-
-samplerate: libsamplerate-$(SAMPLERATE_VERSION).tar.gz .sum-samplerate
-	$(UNPACK)
-	$(APPLY) $(SRC)/samplerate/disable_tests.patch
-	$(APPLY) $(SRC)/samplerate/soundcard.patch
-	$(APPLY) $(SRC)/samplerate/carbon.patch
-ifdef HAVE_IOS
-ifeq ($(IOS_TARGET_PLATFORM),iPhoneSimulator)
-#warning assembler double / int conversion disabled
-	$(APPLY) $(SRC)/samplerate/disable_assembler.patch
-endif
-endif
-	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub Cfg
-	$(MOVE)
-
-.samplerate: samplerate
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
-	cd $< && $(MAKE) install
-	touch $@
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/samplerate-vs2017.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/samplerate-vs2017.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/samplerate-vs2017.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/samplerate-vs2017.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,218 +0,0 @@
---- /dev/null
-+++ b/msvc/libsamplerate.vcxproj
-@@ -0,0 +1,211 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+  <ItemGroup Label="ProjectConfigurations">
-+    <ProjectConfiguration Include="Debug|Win32">
-+      <Configuration>Debug</Configuration>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|Win32">
-+      <Configuration>Release</Configuration>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug|x64">
-+      <Configuration>Debug</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|x64">
-+      <Configuration>Release</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+  </ItemGroup>
-+  <PropertyGroup Label="Globals">
-+    <ProjectGuid>{0DC9504B-4FF5-4590-97B3-FFD4C04F2893}</ProjectGuid>
-+    <RootNamespace>libsamplerate</RootNamespace>
-+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <UseDebugLibraries>true</UseDebugLibraries>
-+    <PlatformToolset>v141</PlatformToolset>
-+    <CharacterSet>MultiByte</CharacterSet>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <UseDebugLibraries>false</UseDebugLibraries>
-+    <PlatformToolset>v141</PlatformToolset>
-+    <WholeProgramOptimization>true</WholeProgramOptimization>
-+    <CharacterSet>MultiByte</CharacterSet>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <UseDebugLibraries>true</UseDebugLibraries>
-+    <PlatformToolset>v141</PlatformToolset>
-+    <CharacterSet>MultiByte</CharacterSet>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <UseDebugLibraries>false</UseDebugLibraries>
-+    <PlatformToolset>v141</PlatformToolset>
-+    <WholeProgramOptimization>true</WholeProgramOptimization>
-+    <CharacterSet>MultiByte</CharacterSet>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+  <ImportGroup Label="ExtensionSettings">
-+  </ImportGroup>
-+  <ImportGroup Label="Shared">
-+  </ImportGroup>
-+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-+  <PropertyGroup Label="UserMacros" />
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-+    <TargetExt>.lib</TargetExt>
-+    <TargetName>$(ProjectName)d</TargetName>
-+    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
-+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-+    <TargetExt>.lib</TargetExt>
-+    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
-+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+    <TargetExt>.lib</TargetExt>
-+    <TargetName>$(ProjectName)d</TargetName>
-+    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+    <TargetExt>.lib</TargetExt>
-+    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
-+  </PropertyGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-+    <ClCompile>
-+      <WarningLevel>Level3</WarningLevel>
-+      <Optimization>Disabled</Optimization>
-+      <SDLCheck>true</SDLCheck>
-+      <DisableSpecificWarnings>4244;4305;</DisableSpecificWarnings>
-+      <ProgramDataBaseFileName>$(OutDir)lib\x86\$(ProjectName).pdb</ProgramDataBaseFileName>
-+    </ClCompile>
-+    <PreBuildEvent>
-+      <Command>copy /y $(ProjectDir)..\Win32\config.h $(ProjectDir)..\src\config.h
-+copy /y $(ProjectDir)..\Win32\unistd.h $(ProjectDir)..\examples\unistd.h</Command>
-+    </PreBuildEvent>
-+    <PostBuildEvent>
-+      <Command>mkdir "$(OutDir)"include
-+
-+xcopy /s /y $(ProjectDir)..\src\*.h "$(OutDir)"include
-+</Command>
-+    </PostBuildEvent>
-+    <Lib>
-+      <OutputFile>$(OutDir)lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-+    </Lib>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+    <ClCompile>
-+      <WarningLevel>Level3</WarningLevel>
-+      <Optimization>Disabled</Optimization>
-+      <SDLCheck>true</SDLCheck>
-+      <DisableSpecificWarnings>4244;4305;</DisableSpecificWarnings>
-+      <ProgramDataBaseFileName>$(OutDir)lib\x64\$(ProjectName).pdb</ProgramDataBaseFileName>
-+    </ClCompile>
-+    <PreBuildEvent>
-+      <Command>copy /y $(ProjectDir)..\Win32\config.h $(ProjectDir)..\src\config.h
-+copy /y $(ProjectDir)..\Win32\unistd.h $(ProjectDir)..\examples\unistd.h</Command>
-+    </PreBuildEvent>
-+    <PostBuildEvent>
-+      <Command>mkdir "$(OutDir)"include
-+
-+xcopy /s /y $(ProjectDir)..\src\*.h "$(OutDir)"include
-+</Command>
-+    </PostBuildEvent>
-+    <Lib>
-+      <OutputFile>$(OutDir)lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-+    </Lib>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-+    <ClCompile>
-+      <WarningLevel>Level3</WarningLevel>
-+      <Optimization>MaxSpeed</Optimization>
-+      <FunctionLevelLinking>true</FunctionLevelLinking>
-+      <IntrinsicFunctions>true</IntrinsicFunctions>
-+      <SDLCheck>true</SDLCheck>
-+      <DisableSpecificWarnings>4244;4305;</DisableSpecificWarnings>
-+      <WholeProgramOptimization>false</WholeProgramOptimization>
-+      <ProgramDataBaseFileName>$(OutDir)lib\x86\$(ProjectName).pdb</ProgramDataBaseFileName>
-+    </ClCompile>
-+    <Link>
-+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+      <OptimizeReferences>true</OptimizeReferences>
-+    </Link>
-+    <PostBuildEvent>
-+      <Command>mkdir "$(OutDir)"include
-+
-+xcopy /s /y $(ProjectDir)..\src\*.h "$(OutDir)"include
-+</Command>
-+    </PostBuildEvent>
-+    <PreBuildEvent>
-+      <Command>copy /y $(ProjectDir)..\Win32\config.h $(ProjectDir)..\src\config.h
-+copy /y $(ProjectDir)..\Win32\unistd.h $(ProjectDir)..\examples\unistd.h</Command>
-+    </PreBuildEvent>
-+    <Lib>
-+      <OutputFile>$(OutDir)lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-+    </Lib>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+    <ClCompile>
-+      <WarningLevel>Level3</WarningLevel>
-+      <Optimization>MaxSpeed</Optimization>
-+      <FunctionLevelLinking>true</FunctionLevelLinking>
-+      <IntrinsicFunctions>true</IntrinsicFunctions>
-+      <SDLCheck>true</SDLCheck>
-+      <DisableSpecificWarnings>4244;4305;</DisableSpecificWarnings>
-+      <WholeProgramOptimization>false</WholeProgramOptimization>
-+      <ProgramDataBaseFileName>$(OutDir)lib\x64\$(ProjectName).pdb</ProgramDataBaseFileName>
-+    </ClCompile>
-+    <Link>
-+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+      <OptimizeReferences>true</OptimizeReferences>
-+    </Link>
-+    <PostBuildEvent>
-+      <Command>mkdir "$(OutDir)"include
-+
-+xcopy /s /y $(ProjectDir)..\src\*.h "$(OutDir)"include
-+</Command>
-+    </PostBuildEvent>
-+    <PreBuildEvent>
-+      <Command>copy /y $(ProjectDir)..\Win32\config.h $(ProjectDir)..\src\config.h
-+copy /y $(ProjectDir)..\Win32\unistd.h $(ProjectDir)..\examples\unistd.h</Command>
-+    </PreBuildEvent>
-+    <Lib>
-+      <OutputFile>$(OutDir)lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-+    </Lib>
-+  </ItemDefinitionGroup>
-+  <ItemGroup>
-+    <ClCompile Include="..\src\samplerate.c" />
-+    <ClCompile Include="..\src\src_linear.c" />
-+    <ClCompile Include="..\src\src_sinc.c" />
-+    <ClCompile Include="..\src\src_zoh.c" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ClInclude Include="..\src\common.h" />
-+    <ClInclude Include="..\src\config.h" />
-+    <ClInclude Include="..\src\fastest_coeffs.h" />
-+    <ClInclude Include="..\src\float_cast.h" />
-+    <ClInclude Include="..\src\high_qual_coeffs.h" />
-+    <ClInclude Include="..\src\mid_qual_coeffs.h" />
-+    <ClInclude Include="..\src\samplerate.h" />
-+  </ItemGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+  <ImportGroup Label="ExtensionTargets">
-+  </ImportGroup>
-+</Project>
-\ No newline at end of file
--- 
-2.10.2.windows.1
-
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/SHA512SUMS ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/SHA512SUMS
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/SHA512SUMS	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/SHA512SUMS	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-85d93df24d9d62e7803a5d0ac5d268b2085214adcb160e32fac316b12ee8a0ce36ccfb433a3c0a08f6e3ec418a5962bdb84f8a11262286a9b347436983029a7d  libsamplerate-0.1.8.tar.gz
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/soundcard.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/soundcard.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/samplerate/soundcard.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/samplerate/soundcard.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
---- a/examples/audio_out.c.orig	2014-06-18 16:52:04.269479958 -0400
-+++ b/examples/audio_out.c	2014-06-18 16:52:36.789478998 -0400
-@@ -44,7 +44,11 @@
- 
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#if defined (__ANDROID__)
-+#include <linux/soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
- 
- #define	LINUX_MAGIC		MAKE_MAGIC ('L', 'i', 'n', 'u', 'x', 'O', 'S', 'S')
- 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/autotools.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/autotools.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/autotools.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/autotools.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-From ca790066b639ea570067afb3cb2a36c9e3383ae8 Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date: Sat, 13 Jul 2013 17:04:45 +1000
-Subject: [PATCH] configure.ac : Fix for current versions of autotools.
-
-Patch from Cristian Rodriguez.
----
- configure.ac | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index bef0c18..3b32cb7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
- AC_LANG([C])
- 
--AC_PROG_CC
-+AC_PROG_CC_STDC
-+AC_USE_SYSTEM_EXTENSIONS
- AM_PROG_CC_C_O
- AC_PROG_CXX
- AC_PROG_SED
-@@ -331,8 +332,8 @@ if test -n "$PKG_CONFIG" ; then
- 		HAVE_EXTERNAL_LIBS=1
- 		enable_external_libs=yes
- 
--		EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS"
--		EXTERNAL_LIBS="$FLAC_LIBS $VORBISENC_LIBS $SPEEX_LIBS"
-+		EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS"
-+		EXTERNAL_LIBS="$FLAC_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS "
- 	else
- 		echo
- 		AC_MSG_WARN([[*** One or more of the external libraries (ie libflac, libogg and]])
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/carbon.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/carbon.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/carbon.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/carbon.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
---- a/programs/sndfile-play.c.orig	2014-06-26 18:33:49.000000000 -0400
-+++ b/programs/sndfile-play.c	2014-06-26 18:33:52.000000000 -0400
-@@ -63,7 +63,6 @@
- 	#include 	<sys/soundcard.h>
- 
- #elif (defined (__MACH__) && defined (__APPLE__))
--	#include <Carbon.h>
- 	#include <CoreAudio/AudioHardware.h>
- 
- #elif defined (HAVE_SNDIO_H)
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/disable_programs.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/disable_programs.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/disable_programs.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/disable_programs.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
---- a/Makefile.am	2016-05-30 11:59:21.000000000 -0400
-+++ b/Makefile.am	2016-05-30 11:59:28.000000000 -0400
-@@ -6,8 +6,8 @@
- octave_dir = Octave
- endif
-
--SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs
--DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs
-+SUBDIRS = M4 man doc Win32 src $(octave_dir)
-+DIST_SUBDIRS = M4 man doc Win32 src Octave
-
- EXTRA_DIST = libsndfile.spec.in sndfile.pc.in
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/rules.mak	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# SNDFILE
-SNDFILE_VERSION := 1.0.25
-SNDFILE_URL := http://www.mega-nerd.com/libsndfile/files/libsndfile-$(SNDFILE_VERSION).tar.gz
-
-PKGS += sndfile
-ifeq ($(call need_pkg,"sndfile"),)
-PKGS_FOUND += sndfile
-endif
-
-DEPS_sndfile = ogg vorbis flac
-
-$(TARBALLS)/libsndfile-$(SNDFILE_VERSION).tar.gz:
-	$(call download,$(SNDFILE_URL))
-
-.sum-sndfile: libsndfile-$(SNDFILE_VERSION).tar.gz
-
-sndfile: libsndfile-$(SNDFILE_VERSION).tar.gz .sum-sndfile
-	$(UNPACK)
-	$(APPLY) $(SRC)/sndfile/soundcard.patch
-	$(APPLY) $(SRC)/sndfile/carbon.patch
-	$(APPLY) $(SRC)/sndfile/autotools.patch
-	$(APPLY) $(SRC)/sndfile/disable_programs.patch
-	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub Cfg && autoreconf -fi
-ifdef HAVE_IOS
-	rm -Rf examples
-endif
-	$(MOVE)
-
-.sndfile: sndfile
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
-	cd $< && $(MAKE) install
-	touch $@
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/SHA512SUMS ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/SHA512SUMS
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/SHA512SUMS	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/SHA512SUMS	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-4ca9780ed0a915aca8a10ef91bf4bf48b05ecb85285c2c3fe7eef1d46d3e0747e61416b6bddbef369bd69adf4b796ff5f61380e0bc998906b170a93341ba6f78  libsndfile-1.0.25.tar.gz
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/soundcard.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/soundcard.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/sndfile/soundcard.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/sndfile/soundcard.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
---- a/programs/sndfile-play.c.orig	2014-06-12 16:00:39.348060215 -0400
-+++ b/programs/sndfile-play.c	2014-06-12 16:01:05.660059438 -0400
-@@ -52,7 +52,12 @@
- 	#include <sys/time.h>
- #endif
- 
--#if defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__FreeBSD__)
-+#if defined(__ANDROID__)
-+	#include 	<fcntl.h>
-+	#include 	<sys/ioctl.h>
-+	#include 	<linux/soundcard.h>
-+
-+#elif defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__FreeBSD__)
- 	#include 	<fcntl.h>
- 	#include 	<sys/ioctl.h>
- 	#include 	<sys/soundcard.h>
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/upnp/fetch_and_patch.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/upnp/fetch_and_patch.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/upnp/fetch_and_patch.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/upnp/fetch_and_patch.bat	2018-08-16 15:09:51.000000000 +0000
@@ -17,7 +17,7 @@
 
 cd %BUILD%\libupnp
 
-%APPLY_CMD% %SRC%\upnp\libupnp-uwp.patch
+%APPLY_CMD% %SRC%\upnp\libupnp-windows.patch
 %APPLY_CMD% %SRC%\upnp\libupnp-vs2017.patch
 
 cd %SRC%
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/upnp/libupnp-uwp.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/upnp/libupnp-uwp.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/upnp/libupnp-uwp.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/upnp/libupnp-uwp.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,731 +0,0 @@
---- /dev/null
-+++ b/build/inc/upnpconfig.h
-@@ -0,0 +1,136 @@
-+/* upnp/inc/upnpconfig.h.  Generated from upnpconfig.h.in by configure.  */
-+/* -*- C -*- */
-+/*******************************************************************************
-+ *
-+ * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
-+ * All rights reserved. 
-+ *
-+ * Redistribution and use in source and binary forms, with or without 
-+ * modification, are permitted provided that the following conditions are met: 
-+ *
-+ * * Redistributions of source code must retain the above copyright notice, 
-+ * this list of conditions and the following disclaimer. 
-+ * * Redistributions in binary form must reproduce the above copyright notice, 
-+ * this list of conditions and the following disclaimer in the documentation 
-+ * and/or other materials provided with the distribution. 
-+ * * Neither name of Intel Corporation nor the names of its contributors 
-+ * may be used to endorse or promote products derived from this software 
-+ * without specific prior written permission.
-+ * 
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ ******************************************************************************/
-+
-+#ifndef UPNP_CONFIG_H
-+#define UPNP_CONFIG_H 
-+
-+
-+/***************************************************************************
-+ * Library version 
-+ ***************************************************************************/ 
-+
-+/** The library version (string) e.g. "1.3.0" */
-+#define UPNP_VERSION_STRING "1.6.19"
-+
-+/** Major version of the library */
-+#define UPNP_VERSION_MAJOR 1
-+
-+/** Minor version of the library */
-+#define UPNP_VERSION_MINOR 6
-+
-+/** Patch version of the library */
-+#define UPNP_VERSION_PATCH 19
-+
-+/** The library version (numeric) e.g. 10300 means version 1.3.0 */
-+#define UPNP_VERSION	\
-+  ((UPNP_VERSION_MAJOR * 100 + UPNP_VERSION_MINOR) * 100 + UPNP_VERSION_PATCH)
-+
-+
-+
-+/***************************************************************************
-+ * Large file support
-+ ***************************************************************************/
-+
-+/** File Offset size */
-+#define _FILE_OFFSET_BITS 64
-+
-+/** Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-+/* #undef _LARGEFILE_SOURCE */
-+
-+/** Large files support */
-+#define _LARGE_FILE_SOURCE /**/
-+
-+/***************************************************************************
-+ * Library optional features
-+ ***************************************************************************/
-+
-+/*
-+ * The following defines can be tested in order to know which 
-+ * optional features have been included in the installed library.
-+ */
-+
-+
-+/** Defined to 1 if the library has been compiled with DEBUG enabled 
-+ *  (i.e. configure --enable-debug) : <upnp/upnpdebug.h> file is available */
-+/* #undef UPNP_HAVE_DEBUG */
-+
-+
-+/** Defined to 1 if the library has been compiled with client API enabled 
-+ *  (i.e. configure --enable-client) */
-+#define UPNP_HAVE_CLIENT 1
-+
-+
-+/** Defined to 1 if the library has been compiled with device API enabled 
-+ *  (i.e. configure --enable-device) */
-+#define UPNP_HAVE_DEVICE 1
-+
-+
-+/** Defined to 1 if the library has been compiled with integrated web server
-+ *  (i.e. configure --enable-webserver --enable-device) */
-+#define UPNP_HAVE_WEBSERVER 1
-+
-+
-+/** Defined to 1 if the library has been compiled with the SSDP part enabled
-+ *  (i.e. configure --enable-ssdp) */
-+#define UPNP_HAVE_SSDP 1
-+
-+
-+/** Defined to 1 if the library has been compiled with optional SSDP headers
-+ *  support (i.e. configure --enable-optssdp) */
-+#define UPNP_HAVE_OPTSSDP 1
-+
-+
-+/** Defined to 1 if the library has been compiled with the SOAP part enabled
-+ *  (i.e. configure --enable-soap) */
-+#define UPNP_HAVE_SOAP 1
-+
-+
-+/** Defined to 1 if the library has been compiled with the GENA part enabled
-+ *  (i.e. configure --enable-gena) */
-+#define UPNP_HAVE_GENA 1
-+
-+
-+/** Defined to 1 if the library has been compiled with helper API
-+ *  (i.e. configure --enable-tools) : <upnp/upnptools.h> file is available */
-+#define UPNP_HAVE_TOOLS 1
-+
-+/** Defined to 1 if the library has been compiled with ipv6 support
-+ *  (i.e. configure --enable-ipv6) */
-+/* #undef UPNP_ENABLE_IPV6 */
-+
-+/** Defined to 1 if the library has been compiled with unspecified SERVER
-+ * header (i.e. configure --enable-unspecified_server) */
-+/* #undef UPNP_ENABLE_UNSPECIFIED_SERVER */
-+
-+#endif /* UPNP_CONFIG_H */
-+
---- /dev/null
-+++ b/build/inc/autoconfig.h
-@@ -0,0 +1,202 @@
-+/* autoconfig.h.  Generated from autoconfig.h.in by configure.  */
-+/* autoconfig.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* Define to 1 to compile debug code */
-+/* #undef DEBUG */
-+
-+/* Define to 1 if you have the <arpa/inet.h> header file. */
-+#define HAVE_ARPA_INET_H 1
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#define HAVE_DLFCN_H 1
-+
-+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-+/* #undef HAVE_DOPRNT */
-+
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#define HAVE_FCNTL_H 1
-+
-+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-+#define HAVE_FSEEKO 1
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#define HAVE_INTTYPES_H 1
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#define HAVE_LIMITS_H 1
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the <netdb.h> header file. */
-+#define HAVE_NETDB_H 1
-+
-+/* Define to 1 if you have the <netinet/in.h> header file. */
-+#define HAVE_NETINET_IN_H 1
-+
-+/* Define if you have POSIX threads libraries and header files. */
-+#define HAVE_PTHREAD 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define HAVE_STDINT_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#define HAVE_STRINGS_H 1
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Defines if strndup is available on your system */
-+#define HAVE_STRNDUP 1
-+
-+/* Defines if strnlen is available on your system */
-+#define HAVE_STRNLEN 1
-+
-+/* Define to 1 if you have the <syslog.h> header file. */
-+#define HAVE_SYSLOG_H 1
-+
-+/* Define to 1 if you have the <sys/ioctl.h> header file. */
-+#define HAVE_SYS_IOCTL_H 1
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#define HAVE_SYS_SOCKET_H 1
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#define HAVE_SYS_TIME_H 1
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#define HAVE_UNISTD_H 1
-+
-+/* Define to 1 if you have the `vprintf' function. */
-+#define HAVE_VPRINTF 1
-+
-+/* Define to 1 if you have the <ws2tcpip.h> header file. */
-+/* #undef HAVE_WS2TCPIP_H */
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#define LT_OBJDIR ".libs/"
-+
-+/* Define to 1 to prevent compilation of assert() */
-+#define NDEBUG 1
-+
-+/* Define to 1 to prevent some debug code */
-+#define NO_DEBUG 1
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+/* #undef NO_MINUS_C_MINUS_O */
-+
-+/* Name of package */
-+#define PACKAGE "libupnp"
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT "mroberto@users.sourceforge.net"
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME "libupnp"
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "libupnp 1.6.19"
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME "libupnp"
-+
-+/* Define to the home page for this package. */
-+#define PACKAGE_URL ""
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "1.6.19"
-+
-+/* Define to necessary symbol if this constant uses a non-standard name on
-+   your system. */
-+/* #undef PTHREAD_CREATE_JOINABLE */
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* see upnpconfig.h */
-+#define UPNP_ENABLE_BLOCKING_TCP_CONNECTIONS 1
-+
-+/* see upnpconfig.h */
-+/* #undef UPNP_ENABLE_IPV6 */
-+
-+/* see upnpconfig.h */
-+#define UPNP_ENABLE_NOTIFICATION_REORDERING 1
-+
-+/* see upnpconfig.h */
-+/* #undef UPNP_ENABLE_UNSPECIFIED_SERVER */
-+
-+/* see upnpconfig.h */
-+#define UPNP_HAVE_CLIENT 1
-+
-+/* see upnpconfig.h */
-+/* #undef UPNP_HAVE_DEBUG */
-+
-+/* see upnpconfig.h */
-+#define UPNP_HAVE_DEVICE 1
-+
-+/* see upnpconfig.h */
-+#define UPNP_HAVE_GENA 1
-+
-+/* see upnpconfig.h */
-+#define UPNP_HAVE_OPTSSDP 1
-+
-+/* see upnpconfig.h */
-+#define UPNP_HAVE_SOAP 1
-+
-+/* see upnpconfig.h */
-+#define UPNP_HAVE_SSDP 1
-+
-+/* see upnpconfig.h */
-+#define UPNP_HAVE_TOOLS 1
-+
-+/* see upnpconfig.h */
-+#define UPNP_HAVE_WEBSERVER 1
-+
-+/* Do not use pthread_rwlock_t */
-+#define UPNP_USE_RWLOCK 1
-+
-+/* see upnpconfig.h */
-+#define UPNP_VERSION_MAJOR 1
-+
-+/* see upnpconfig.h */
-+#define UPNP_VERSION_MINOR 6
-+
-+/* see upnpconfig.h */
-+#define UPNP_VERSION_PATCH 19
-+
-+/* see upnpconfig.h */
-+#define UPNP_VERSION_STRING "1.6.19"
-+
-+/* Version number of package */
-+#define VERSION "1.6.19"
-+
-+/* File Offset size */
-+#define _FILE_OFFSET_BITS 64
-+
-+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-+#define _LARGEFILE_SOURCE 1
-+
-+/* Large files support */
-+#define _LARGE_FILE_SOURCE /**/
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+/* #undef const */
-+
-+/* Define to `long int' if <sys/types.h> does not define. */
-+/* #undef off_t */
-+
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
-+/* #undef size_t */
-+
-+/* Type for storing the length of struct sockaddr */
-+/* #undef socklen_t */
---- a/threadutil/inc/ThreadPool.h
-+++ b/threadutil/inc/ThreadPool.h
-@@ -46,6 +46,7 @@
- #include <errno.h>
- 
- #ifdef WIN32
-+#ifndef _TIMEZONE_DEFINED
- 	#include <time.h>
- 	struct timezone
- 	{
-@@ -53,6 +54,7 @@
- 		int  tz_dsttime;     /* type of dst correction */
- 	};
- 	int gettimeofday(struct timeval *tv, struct timezone *tz);
-+#endif
- #else /* WIN32 */
- 	#include <sys/param.h>
- 	#include <sys/time.h> /* for gettimeofday() */
---- a/upnp/src/api/upnpapi.c
-+++ b/upnp/src/api/upnpapi.c
-@@ -357,8 +357,8 @@ static int UpnpInitPreamble(void)
- 
- #ifdef UPNP_HAVE_OPTSSDP
- 	/* Create the NLS uuid. */
--	uuid_create(&nls_uuid);
--	uuid_unpack(&nls_uuid, gUpnpSdkNLSuuid);
-+    uuid_upnp_create(&nls_uuid);
-+    uuid_upnp_unpack(&nls_uuid, gUpnpSdkNLSuuid);
- #endif /* UPNP_HAVE_OPTSSDP */
- 
- 	/* Initializes the handle list. */
-@@ -374,13 +374,13 @@ static int UpnpInitPreamble(void)
- 		return retVal;
- 	}
- 
-+#ifdef INTERNAL_WEB_SERVER
- #ifdef INCLUDE_DEVICE_APIS
- #if EXCLUDE_SOAP == 0
- 	SetSoapCallback(soap_device_callback);
- #endif
- #endif /* INCLUDE_DEVICE_APIS */
- 
--#ifdef INTERNAL_WEB_SERVER
- #if EXCLUDE_GENA == 0
- 	SetGenaCallback(genaCallback);
- #endif
---- a/upnp/src/api/upnptools.c
-+++ b/upnp/src/api/upnptools.c
-@@ -57,7 +57,9 @@
- #define HEADER_LENGTH 2000
- 
- #ifdef WIN32
--	#define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #endif
- 
- /*!
---- a/upnp/src/gena/gena_ctrlpt.c
-+++ b/upnp/src/gena/gena_ctrlpt.c
-@@ -53,7 +53,9 @@
- #include "upnpapi.h"
- 
- #ifdef WIN32
--	#define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #endif
- 
- extern ithread_mutex_t GlobalClientSubscribeMutex;
-@@ -561,8 +563,8 @@ int genaSubscribe(
- 	}
- 
- 	/* generate client SID */
--	uuid_create(&uid );
--	uuid_unpack(&uid, temp_sid);
-+    uuid_upnp_create(&uid );
-+    uuid_upnp_unpack(&uid, temp_sid);
- 	rc = snprintf(temp_sid2, sizeof(temp_sid2), "uuid:%s", temp_sid);
- 	if (rc < 0 || (unsigned int) rc >= sizeof(temp_sid2)) {
- 		return_code = UPNP_E_OUTOF_MEMORY;
---- a/upnp/src/gena/gena_device.c
-+++ b/upnp/src/gena/gena_device.c
-@@ -53,7 +53,9 @@
- #include "uuid.h"
- 
- #ifdef WIN32
--	#define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #endif
- 
- #define STALE_JOBID (INVALID_JOB_ID -1)
-@@ -1271,8 +1273,8 @@ void gena_process_subscription_request(
- 	}
- 
- 	/* generate SID */
--	uuid_create(&uid);
--	uuid_unpack(&uid, temp_sid);
-+    uuid_upnp_create(&uid);
-+    uuid_upnp_unpack(&uid, temp_sid);
- 	rc = snprintf(sub->sid, sizeof(sub->sid), "uuid:%s", temp_sid);
- 
- 	/* respond OK */
---- a/upnp/src/genlib/miniserver/miniserver.c
-+++ b/upnp/src/genlib/miniserver/miniserver.c
-@@ -68,6 +68,13 @@
- /*! . */
- #define APPLICATION_LISTENING_PORT 49152
- 
-+/* IPV6_V6ONLY is missing from MinGW, hack taken from
-+ * http://svn.apache.org/repos/asf/apr/apr/trunk/network_io/win32/sockopt.c
-+ */
-+#ifndef IPV6_V6ONLY
-+#define IPV6_V6ONLY 27
-+#endif
-+
- struct mserv_request_t {
- 	/*! Connection handle. */
- 	SOCKET connfd;
---- a/upnp/src/genlib/net/http/httpreadwrite.c
-+++ b/upnp/src/genlib/net/http/httpreadwrite.c
-@@ -59,7 +59,9 @@
- #ifdef WIN32
- 	#include <malloc.h>
- 	#define fseeko fseek
--	#define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #else
- 	#include <arpa/inet.h>
- 	#include <sys/types.h>
-@@ -2165,6 +2167,7 @@ void get_sdk_info(OUT char *info, IN size_t infoSize)
- 	OSVERSIONINFO versioninfo;
- 	versioninfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- 
-+#if (WINAPI_FAMILY_APP != WINAPI_FAMILY_PC_APP)
- 	if (GetVersionEx(&versioninfo) != 0)
- 		snprintf(info, infoSize,
- 			"%d.%d.%d %d/%s, UPnP/1.0, Portable SDK for UPnP devices/"
-@@ -2174,6 +2177,10 @@ void get_sdk_info(OUT char *info, IN size_t infoSize)
- 	else
- 		*info = '\0';
- #else
-+        snprintf(info, infoSize, "%d.%d.%d %d/%s, UPnP/1.0, Portable SDK for UPnP devices/" PACKAGE_VERSION "\r\n",
-+            0, 0, 0, 0, 0);
-+    #endif
-+    #else
- 	int ret_code;
- 	struct utsname sys_info;
- 
---- a/upnp/src/genlib/net/http/webserver.c
-+++ b/upnp/src/genlib/net/http/webserver.c
-@@ -63,7 +63,9 @@
- #include <sys/stat.h>
- 
- #ifdef WIN32
--	 #define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #endif
- 
- /*!
---- a/upnp/src/genlib/net/uri/uri.c
-+++ b/upnp/src/genlib/net/uri/uri.c
-@@ -45,7 +45,9 @@
- 	#endif
- #endif
- #ifdef WIN32
--	#define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #endif
- #include <assert.h>
- 
---- a/upnp/src/inc/upnputil.h
-+++ b/upnp/src/inc/upnputil.h
-@@ -130,7 +130,7 @@ void linecopylen(
- 		#define strncasecmp		strnicmp
- 		#define sleep(a)		Sleep((a)*1000)
- 		#define usleep(a)		Sleep((a)/1000)
--		#define strerror_r(a,b,c)	(strerror_s((b),(c),(a)))
-+        #define strerror_r(a,b,c) strncpy( b, strerror(a), c)
- 	#else
- 		#define max(a, b)   (((a)>(b))? (a):(b))
- 		#define min(a, b)   (((a)<(b))? (a):(b))
---- a/upnp/src/inc/uuid.h
-+++ b/upnp/src/inc/uuid.h
-@@ -41,14 +41,14 @@ typedef struct _uuid_upnp {
- /*!
-  * \brief Generate a UUID.
-  */
--int uuid_create(
-+int uuid_upnp_create(
- 	/*! . */
- 	uuid_upnp * id);
- 
- /*!
-  * \brief Out will be xxxx-xx-xx-xx-xxxxxx format.
-  */
--void uuid_unpack(
-+void uuid_upnp_unpack(
- 	/*! . */
- 	uuid_upnp * u,
- 	/*! . */
-@@ -57,7 +57,7 @@ void uuid_unpack(
- /*!
-  * \brief Create a UUID using a "name" from a "name space"
-  */
--void uuid_create_from_name(
-+void uuid_upnp_create_from_name(
- 	/*! Resulting UUID. */
- 	uuid_upnp * uid,
- 	/*! UUID to serve as context, so identical names from different name
-@@ -78,7 +78,7 @@ void uuid_create_from_name(
-  *
-  * \note Lexical ordering is not temporal ordering!
-  */
--int uuid_compare(
-+int uuid_upnp_compare(
- 	/*! . */
- 	uuid_upnp * u1,
- 	/*! . */
---- a/upnp/src/soap/soap_device.c
-+++ b/upnp/src/soap/soap_device.c
-@@ -52,7 +52,9 @@
- #include <string.h>
- 
- #ifdef WIN32
--	#define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #endif
- 
- /*! timeout duration in secs for transmission/reception */
---- a/upnp/src/ssdp/ssdp_ctrlpt.c
-+++ b/upnp/src/ssdp/ssdp_ctrlpt.c
-@@ -59,7 +59,9 @@
- 
- #ifdef WIN32
- #include <string.h>
--#define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #endif /* WIN32 */
- 
- /*!
---- a/upnp/src/ssdp/ssdp_device.c
-+++ b/upnp/src/ssdp/ssdp_device.c
-@@ -57,7 +57,9 @@
- #include <string.h>
- 
- #ifdef WIN32
--	#define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #endif
- 
- #define MSGTYPE_SHUTDOWN	0
---- a/upnp/src/ssdp/ssdp_server.c
-+++ b/upnp/src/ssdp/ssdp_server.c
-@@ -41,7 +41,9 @@
- #ifndef WIN32
- 	#include <sys/param.h>
- #else
--	#define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #endif /* WIN32 */
- 
- #include "config.h"
-@@ -69,6 +71,13 @@
- 	#endif /* UPNP_ENABLE_IPV6 */
- #endif /* INCLUDE_CLIENT_APIS */
- 
-+/* IPV6_V6ONLY is missing from MinGW, hack taken from
-+ * http://svn.apache.org/repos/asf/apr/apr/trunk/network_io/win32/sockopt.c
-+ */
-+#ifndef IPV6_V6ONLY
-+#define IPV6_V6ONLY 27
-+#endif
-+
- void RequestHandler();
- 
- enum Listener {
---- a/upnp/src/urlconfig/urlconfig.c
-+++ b/upnp/src/urlconfig/urlconfig.c
-@@ -50,7 +50,9 @@
- #include <stdio.h>
- 
- #ifdef WIN32
--	#define snprintf _snprintf
-+    #if _MSC_VER < 1900
-+        #define snprintf _snprintf
-+    #endif
- #else
- 	#include <sys/types.h>
- #endif
---- a/upnp/src/uuid/sysdep.c
-+++ b/upnp/src/uuid/sysdep.c
-@@ -30,6 +30,8 @@
- #include <string.h>
- #include <stdio.h>
- 
-+#include <Winsock2.h>
-+
- /*!
-  * \brief System dependent call to get IEEE node ID.
-  *
-@@ -93,7 +95,9 @@ void get_random_info(unsigned char seed[16])
- 	/* Initialize memory area so that valgrind does not complain */
- 	memset(&r, 0, sizeof r);
- 	/* memory usage stats */
--	GlobalMemoryStatus( &r.m );
-+#if (WINAPI_FAMILY_APP != WINAPI_FAMILY_PC_APP)
-+    GlobalMemoryStatus(&r.m);
-+#endif
- 	/* random system stats */
- 	GetSystemInfo( &r.s );
- 	/* 100ns resolution (nominally) time of day */
-@@ -101,9 +105,13 @@ void get_random_info(unsigned char seed[16])
- 	/* high resolution performance counter */
- 	QueryPerformanceCounter( &r.pc );
- 	/* milliseconds since last boot */
--	r.tc = GetTickCount();
-+	r.tc = GetTickCount64();
- 	r.l = MAX_COMPUTERNAME_LENGTH + 1;
--	GetComputerName( r.hostname, &r.l );
-+#if (WINAPI_FAMILY_APP != WINAPI_FAMILY_PC_APP)
-+    GetComputerName(r.hostname, &r.l);
-+#else
-+    GetHostNameW(r.hostname, &r.l);
-+#endif
- 	/* MD5 it */
- 	MD5Init(&c);
- 	MD5Update(&c, (unsigned char *)(&r), sizeof r);
---- a/upnp/src/uuid/uuid.c
-+++ b/upnp/src/uuid/uuid.c
-@@ -50,7 +50,7 @@ static uint16_t true_random(void);
- /*!
-  * \brief Generator of a UUID.
-  */
--int uuid_create(uuid_upnp * uid)
-+int uuid_upnp_create(uuid_upnp * uid)
- {
- 	uuid_time_t timestamp;
- 	uuid_time_t last_time;
-@@ -82,7 +82,7 @@ int uuid_create(uuid_upnp * uid)
- 	return 1;
- };
- 
--void uuid_unpack(uuid_upnp * u, char *out)
-+void uuid_upnp_unpack(uuid_upnp * u, char *out)
- {
- 	sprintf(out,
- 		"%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
-@@ -221,7 +221,7 @@ static uint16_t true_random(void)
- /*!
-  * \brief Create a UUID using a "name" from a "name space".
-  */
--void uuid_create_from_name(
-+void uuid_upnp_create_from_name(
- 	/*! resulting UUID. */
- 	uuid_upnp *uid,
- 	/*! UUID to serve as context, so identical names from different name
-@@ -280,7 +280,7 @@ void format_uuid_v3(uuid_upnp *uid, unsigned char hash[16])
-  *
-  * Note: Lexical ordering is not temporal ordering!
-  */
--int uuid_compare(uuid_upnp *u1, uuid_upnp *u2)
-+int uuid_upnp_compare(uuid_upnp *u1, uuid_upnp *u2)
- {
- 	int i;
- 
--- 
-2.10.2.windows.1
-
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/upnp/libupnp-windows.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/upnp/libupnp-windows.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/upnp/libupnp-windows.patch	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/upnp/libupnp-windows.patch	2018-08-16 15:09:51.000000000 +0000
@@ -0,0 +1,731 @@
+--- /dev/null
++++ b/build/inc/upnpconfig.h
+@@ -0,0 +1,136 @@
++/* upnp/inc/upnpconfig.h.  Generated from upnpconfig.h.in by configure.  */
++/* -*- C -*- */
++/*******************************************************************************
++ *
++ * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
++ * All rights reserved. 
++ *
++ * Redistribution and use in source and binary forms, with or without 
++ * modification, are permitted provided that the following conditions are met: 
++ *
++ * * Redistributions of source code must retain the above copyright notice, 
++ * this list of conditions and the following disclaimer. 
++ * * Redistributions in binary form must reproduce the above copyright notice, 
++ * this list of conditions and the following disclaimer in the documentation 
++ * and/or other materials provided with the distribution. 
++ * * Neither name of Intel Corporation nor the names of its contributors 
++ * may be used to endorse or promote products derived from this software 
++ * without specific prior written permission.
++ * 
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
++ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ ******************************************************************************/
++
++#ifndef UPNP_CONFIG_H
++#define UPNP_CONFIG_H 
++
++
++/***************************************************************************
++ * Library version 
++ ***************************************************************************/ 
++
++/** The library version (string) e.g. "1.3.0" */
++#define UPNP_VERSION_STRING "1.6.19"
++
++/** Major version of the library */
++#define UPNP_VERSION_MAJOR 1
++
++/** Minor version of the library */
++#define UPNP_VERSION_MINOR 6
++
++/** Patch version of the library */
++#define UPNP_VERSION_PATCH 19
++
++/** The library version (numeric) e.g. 10300 means version 1.3.0 */
++#define UPNP_VERSION	\
++  ((UPNP_VERSION_MAJOR * 100 + UPNP_VERSION_MINOR) * 100 + UPNP_VERSION_PATCH)
++
++
++
++/***************************************************************************
++ * Large file support
++ ***************************************************************************/
++
++/** File Offset size */
++#define _FILE_OFFSET_BITS 64
++
++/** Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
++/* #undef _LARGEFILE_SOURCE */
++
++/** Large files support */
++#define _LARGE_FILE_SOURCE /**/
++
++/***************************************************************************
++ * Library optional features
++ ***************************************************************************/
++
++/*
++ * The following defines can be tested in order to know which 
++ * optional features have been included in the installed library.
++ */
++
++
++/** Defined to 1 if the library has been compiled with DEBUG enabled 
++ *  (i.e. configure --enable-debug) : <upnp/upnpdebug.h> file is available */
++/* #undef UPNP_HAVE_DEBUG */
++
++
++/** Defined to 1 if the library has been compiled with client API enabled 
++ *  (i.e. configure --enable-client) */
++#define UPNP_HAVE_CLIENT 1
++
++
++/** Defined to 1 if the library has been compiled with device API enabled 
++ *  (i.e. configure --enable-device) */
++#define UPNP_HAVE_DEVICE 1
++
++
++/** Defined to 1 if the library has been compiled with integrated web server
++ *  (i.e. configure --enable-webserver --enable-device) */
++#define UPNP_HAVE_WEBSERVER 1
++
++
++/** Defined to 1 if the library has been compiled with the SSDP part enabled
++ *  (i.e. configure --enable-ssdp) */
++#define UPNP_HAVE_SSDP 1
++
++
++/** Defined to 1 if the library has been compiled with optional SSDP headers
++ *  support (i.e. configure --enable-optssdp) */
++#define UPNP_HAVE_OPTSSDP 1
++
++
++/** Defined to 1 if the library has been compiled with the SOAP part enabled
++ *  (i.e. configure --enable-soap) */
++#define UPNP_HAVE_SOAP 1
++
++
++/** Defined to 1 if the library has been compiled with the GENA part enabled
++ *  (i.e. configure --enable-gena) */
++#define UPNP_HAVE_GENA 1
++
++
++/** Defined to 1 if the library has been compiled with helper API
++ *  (i.e. configure --enable-tools) : <upnp/upnptools.h> file is available */
++#define UPNP_HAVE_TOOLS 1
++
++/** Defined to 1 if the library has been compiled with ipv6 support
++ *  (i.e. configure --enable-ipv6) */
++/* #undef UPNP_ENABLE_IPV6 */
++
++/** Defined to 1 if the library has been compiled with unspecified SERVER
++ * header (i.e. configure --enable-unspecified_server) */
++/* #undef UPNP_ENABLE_UNSPECIFIED_SERVER */
++
++#endif /* UPNP_CONFIG_H */
++
+--- /dev/null
++++ b/build/inc/autoconfig.h
+@@ -0,0 +1,202 @@
++/* autoconfig.h.  Generated from autoconfig.h.in by configure.  */
++/* autoconfig.h.in.  Generated from configure.ac by autoheader.  */
++
++/* Define to 1 to compile debug code */
++/* #undef DEBUG */
++
++/* Define to 1 if you have the <arpa/inet.h> header file. */
++#define HAVE_ARPA_INET_H 1
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#define HAVE_DLFCN_H 1
++
++/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
++/* #undef HAVE_DOPRNT */
++
++/* Define to 1 if you have the <fcntl.h> header file. */
++#define HAVE_FCNTL_H 1
++
++/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
++#define HAVE_FSEEKO 1
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* Define to 1 if you have the <limits.h> header file. */
++#define HAVE_LIMITS_H 1
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the <netdb.h> header file. */
++#define HAVE_NETDB_H 1
++
++/* Define to 1 if you have the <netinet/in.h> header file. */
++#define HAVE_NETINET_IN_H 1
++
++/* Define if you have POSIX threads libraries and header files. */
++#define HAVE_PTHREAD 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Defines if strndup is available on your system */
++#define HAVE_STRNDUP 1
++
++/* Defines if strnlen is available on your system */
++#define HAVE_STRNLEN 1
++
++/* Define to 1 if you have the <syslog.h> header file. */
++#define HAVE_SYSLOG_H 1
++
++/* Define to 1 if you have the <sys/ioctl.h> header file. */
++#define HAVE_SYS_IOCTL_H 1
++
++/* Define to 1 if you have the <sys/socket.h> header file. */
++#define HAVE_SYS_SOCKET_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define HAVE_SYS_TIME_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Define to 1 if you have the `vprintf' function. */
++#define HAVE_VPRINTF 1
++
++/* Define to 1 if you have the <ws2tcpip.h> header file. */
++/* #undef HAVE_WS2TCPIP_H */
++
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
++#define LT_OBJDIR ".libs/"
++
++/* Define to 1 to prevent compilation of assert() */
++#define NDEBUG 1
++
++/* Define to 1 to prevent some debug code */
++#define NO_DEBUG 1
++
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++/* #undef NO_MINUS_C_MINUS_O */
++
++/* Name of package */
++#define PACKAGE "libupnp"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "mroberto@users.sourceforge.net"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "libupnp"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "libupnp 1.6.19"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "libupnp"
++
++/* Define to the home page for this package. */
++#define PACKAGE_URL ""
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "1.6.19"
++
++/* Define to necessary symbol if this constant uses a non-standard name on
++   your system. */
++/* #undef PTHREAD_CREATE_JOINABLE */
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* see upnpconfig.h */
++#define UPNP_ENABLE_BLOCKING_TCP_CONNECTIONS 1
++
++/* see upnpconfig.h */
++/* #undef UPNP_ENABLE_IPV6 */
++
++/* see upnpconfig.h */
++#define UPNP_ENABLE_NOTIFICATION_REORDERING 1
++
++/* see upnpconfig.h */
++/* #undef UPNP_ENABLE_UNSPECIFIED_SERVER */
++
++/* see upnpconfig.h */
++#define UPNP_HAVE_CLIENT 1
++
++/* see upnpconfig.h */
++/* #undef UPNP_HAVE_DEBUG */
++
++/* see upnpconfig.h */
++#define UPNP_HAVE_DEVICE 1
++
++/* see upnpconfig.h */
++#define UPNP_HAVE_GENA 1
++
++/* see upnpconfig.h */
++#define UPNP_HAVE_OPTSSDP 1
++
++/* see upnpconfig.h */
++#define UPNP_HAVE_SOAP 1
++
++/* see upnpconfig.h */
++#define UPNP_HAVE_SSDP 1
++
++/* see upnpconfig.h */
++#define UPNP_HAVE_TOOLS 1
++
++/* see upnpconfig.h */
++#define UPNP_HAVE_WEBSERVER 1
++
++/* Do not use pthread_rwlock_t */
++#define UPNP_USE_RWLOCK 1
++
++/* see upnpconfig.h */
++#define UPNP_VERSION_MAJOR 1
++
++/* see upnpconfig.h */
++#define UPNP_VERSION_MINOR 6
++
++/* see upnpconfig.h */
++#define UPNP_VERSION_PATCH 19
++
++/* see upnpconfig.h */
++#define UPNP_VERSION_STRING "1.6.19"
++
++/* Version number of package */
++#define VERSION "1.6.19"
++
++/* File Offset size */
++#define _FILE_OFFSET_BITS 64
++
++/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
++#define _LARGEFILE_SOURCE 1
++
++/* Large files support */
++#define _LARGE_FILE_SOURCE /**/
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef const */
++
++/* Define to `long int' if <sys/types.h> does not define. */
++/* #undef off_t */
++
++/* Define to `unsigned int' if <sys/types.h> does not define. */
++/* #undef size_t */
++
++/* Type for storing the length of struct sockaddr */
++/* #undef socklen_t */
+--- a/threadutil/inc/ThreadPool.h
++++ b/threadutil/inc/ThreadPool.h
+@@ -46,6 +46,7 @@
+ #include <errno.h>
+ 
+ #ifdef WIN32
++#ifndef _TIMEZONE_DEFINED
+ 	#include <time.h>
+ 	struct timezone
+ 	{
+@@ -53,6 +54,7 @@
+ 		int  tz_dsttime;     /* type of dst correction */
+ 	};
+ 	int gettimeofday(struct timeval *tv, struct timezone *tz);
++#endif
+ #else /* WIN32 */
+ 	#include <sys/param.h>
+ 	#include <sys/time.h> /* for gettimeofday() */
+--- a/upnp/src/api/upnpapi.c
++++ b/upnp/src/api/upnpapi.c
+@@ -357,8 +357,8 @@ static int UpnpInitPreamble(void)
+ 
+ #ifdef UPNP_HAVE_OPTSSDP
+ 	/* Create the NLS uuid. */
+-	uuid_create(&nls_uuid);
+-	uuid_unpack(&nls_uuid, gUpnpSdkNLSuuid);
++    uuid_upnp_create(&nls_uuid);
++    uuid_upnp_unpack(&nls_uuid, gUpnpSdkNLSuuid);
+ #endif /* UPNP_HAVE_OPTSSDP */
+ 
+ 	/* Initializes the handle list. */
+@@ -374,13 +374,13 @@ static int UpnpInitPreamble(void)
+ 		return retVal;
+ 	}
+ 
++#ifdef INTERNAL_WEB_SERVER
+ #ifdef INCLUDE_DEVICE_APIS
+ #if EXCLUDE_SOAP == 0
+ 	SetSoapCallback(soap_device_callback);
+ #endif
+ #endif /* INCLUDE_DEVICE_APIS */
+ 
+-#ifdef INTERNAL_WEB_SERVER
+ #if EXCLUDE_GENA == 0
+ 	SetGenaCallback(genaCallback);
+ #endif
+--- a/upnp/src/api/upnptools.c
++++ b/upnp/src/api/upnptools.c
+@@ -57,7 +57,9 @@
+ #define HEADER_LENGTH 2000
+ 
+ #ifdef WIN32
+-	#define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #endif
+ 
+ /*!
+--- a/upnp/src/gena/gena_ctrlpt.c
++++ b/upnp/src/gena/gena_ctrlpt.c
+@@ -53,7 +53,9 @@
+ #include "upnpapi.h"
+ 
+ #ifdef WIN32
+-	#define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #endif
+ 
+ extern ithread_mutex_t GlobalClientSubscribeMutex;
+@@ -561,8 +563,8 @@ int genaSubscribe(
+ 	}
+ 
+ 	/* generate client SID */
+-	uuid_create(&uid );
+-	uuid_unpack(&uid, temp_sid);
++    uuid_upnp_create(&uid );
++    uuid_upnp_unpack(&uid, temp_sid);
+ 	rc = snprintf(temp_sid2, sizeof(temp_sid2), "uuid:%s", temp_sid);
+ 	if (rc < 0 || (unsigned int) rc >= sizeof(temp_sid2)) {
+ 		return_code = UPNP_E_OUTOF_MEMORY;
+--- a/upnp/src/gena/gena_device.c
++++ b/upnp/src/gena/gena_device.c
+@@ -53,7 +53,9 @@
+ #include "uuid.h"
+ 
+ #ifdef WIN32
+-	#define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #endif
+ 
+ #define STALE_JOBID (INVALID_JOB_ID -1)
+@@ -1271,8 +1273,8 @@ void gena_process_subscription_request(
+ 	}
+ 
+ 	/* generate SID */
+-	uuid_create(&uid);
+-	uuid_unpack(&uid, temp_sid);
++    uuid_upnp_create(&uid);
++    uuid_upnp_unpack(&uid, temp_sid);
+ 	rc = snprintf(sub->sid, sizeof(sub->sid), "uuid:%s", temp_sid);
+ 
+ 	/* respond OK */
+--- a/upnp/src/genlib/miniserver/miniserver.c
++++ b/upnp/src/genlib/miniserver/miniserver.c
+@@ -68,6 +68,13 @@
+ /*! . */
+ #define APPLICATION_LISTENING_PORT 49152
+ 
++/* IPV6_V6ONLY is missing from MinGW, hack taken from
++ * http://svn.apache.org/repos/asf/apr/apr/trunk/network_io/win32/sockopt.c
++ */
++#ifndef IPV6_V6ONLY
++#define IPV6_V6ONLY 27
++#endif
++
+ struct mserv_request_t {
+ 	/*! Connection handle. */
+ 	SOCKET connfd;
+--- a/upnp/src/genlib/net/http/httpreadwrite.c
++++ b/upnp/src/genlib/net/http/httpreadwrite.c
+@@ -59,7 +59,9 @@
+ #ifdef WIN32
+ 	#include <malloc.h>
+ 	#define fseeko fseek
+-	#define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #else
+ 	#include <arpa/inet.h>
+ 	#include <sys/types.h>
+@@ -2165,6 +2167,7 @@ void get_sdk_info(OUT char *info, IN size_t infoSize)
+ 	OSVERSIONINFO versioninfo;
+ 	versioninfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ 
++#if (WINAPI_FAMILY_APP != WINAPI_FAMILY_PC_APP)
+ 	if (GetVersionEx(&versioninfo) != 0)
+ 		snprintf(info, infoSize,
+ 			"%d.%d.%d %d/%s, UPnP/1.0, Portable SDK for UPnP devices/"
+@@ -2174,6 +2177,10 @@ void get_sdk_info(OUT char *info, IN size_t infoSize)
+ 	else
+ 		*info = '\0';
+ #else
++        snprintf(info, infoSize, "%d.%d.%d %d/%s, UPnP/1.0, Portable SDK for UPnP devices/" PACKAGE_VERSION "\r\n",
++            0, 0, 0, 0, 0);
++    #endif
++    #else
+ 	int ret_code;
+ 	struct utsname sys_info;
+ 
+--- a/upnp/src/genlib/net/http/webserver.c
++++ b/upnp/src/genlib/net/http/webserver.c
+@@ -63,7 +63,9 @@
+ #include <sys/stat.h>
+ 
+ #ifdef WIN32
+-	 #define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #endif
+ 
+ /*!
+--- a/upnp/src/genlib/net/uri/uri.c
++++ b/upnp/src/genlib/net/uri/uri.c
+@@ -45,7 +45,9 @@
+ 	#endif
+ #endif
+ #ifdef WIN32
+-	#define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #endif
+ #include <assert.h>
+ 
+--- a/upnp/src/inc/upnputil.h
++++ b/upnp/src/inc/upnputil.h
+@@ -130,7 +130,7 @@ void linecopylen(
+ 		#define strncasecmp		strnicmp
+ 		#define sleep(a)		Sleep((a)*1000)
+ 		#define usleep(a)		Sleep((a)/1000)
+-		#define strerror_r(a,b,c)	(strerror_s((b),(c),(a)))
++        #define strerror_r(a,b,c) strncpy( b, strerror(a), c)
+ 	#else
+ 		#define max(a, b)   (((a)>(b))? (a):(b))
+ 		#define min(a, b)   (((a)<(b))? (a):(b))
+--- a/upnp/src/inc/uuid.h
++++ b/upnp/src/inc/uuid.h
+@@ -41,14 +41,14 @@ typedef struct _uuid_upnp {
+ /*!
+  * \brief Generate a UUID.
+  */
+-int uuid_create(
++int uuid_upnp_create(
+ 	/*! . */
+ 	uuid_upnp * id);
+ 
+ /*!
+  * \brief Out will be xxxx-xx-xx-xx-xxxxxx format.
+  */
+-void uuid_unpack(
++void uuid_upnp_unpack(
+ 	/*! . */
+ 	uuid_upnp * u,
+ 	/*! . */
+@@ -57,7 +57,7 @@ void uuid_unpack(
+ /*!
+  * \brief Create a UUID using a "name" from a "name space"
+  */
+-void uuid_create_from_name(
++void uuid_upnp_create_from_name(
+ 	/*! Resulting UUID. */
+ 	uuid_upnp * uid,
+ 	/*! UUID to serve as context, so identical names from different name
+@@ -78,7 +78,7 @@ void uuid_create_from_name(
+  *
+  * \note Lexical ordering is not temporal ordering!
+  */
+-int uuid_compare(
++int uuid_upnp_compare(
+ 	/*! . */
+ 	uuid_upnp * u1,
+ 	/*! . */
+--- a/upnp/src/soap/soap_device.c
++++ b/upnp/src/soap/soap_device.c
+@@ -52,7 +52,9 @@
+ #include <string.h>
+ 
+ #ifdef WIN32
+-	#define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #endif
+ 
+ /*! timeout duration in secs for transmission/reception */
+--- a/upnp/src/ssdp/ssdp_ctrlpt.c
++++ b/upnp/src/ssdp/ssdp_ctrlpt.c
+@@ -59,7 +59,9 @@
+ 
+ #ifdef WIN32
+ #include <string.h>
+-#define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #endif /* WIN32 */
+ 
+ /*!
+--- a/upnp/src/ssdp/ssdp_device.c
++++ b/upnp/src/ssdp/ssdp_device.c
+@@ -57,7 +57,9 @@
+ #include <string.h>
+ 
+ #ifdef WIN32
+-	#define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #endif
+ 
+ #define MSGTYPE_SHUTDOWN	0
+--- a/upnp/src/ssdp/ssdp_server.c
++++ b/upnp/src/ssdp/ssdp_server.c
+@@ -41,7 +41,9 @@
+ #ifndef WIN32
+ 	#include <sys/param.h>
+ #else
+-	#define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #endif /* WIN32 */
+ 
+ #include "config.h"
+@@ -69,6 +71,13 @@
+ 	#endif /* UPNP_ENABLE_IPV6 */
+ #endif /* INCLUDE_CLIENT_APIS */
+ 
++/* IPV6_V6ONLY is missing from MinGW, hack taken from
++ * http://svn.apache.org/repos/asf/apr/apr/trunk/network_io/win32/sockopt.c
++ */
++#ifndef IPV6_V6ONLY
++#define IPV6_V6ONLY 27
++#endif
++
+ void RequestHandler();
+ 
+ enum Listener {
+--- a/upnp/src/urlconfig/urlconfig.c
++++ b/upnp/src/urlconfig/urlconfig.c
+@@ -50,7 +50,9 @@
+ #include <stdio.h>
+ 
+ #ifdef WIN32
+-	#define snprintf _snprintf
++    #if _MSC_VER < 1900
++        #define snprintf _snprintf
++    #endif
+ #else
+ 	#include <sys/types.h>
+ #endif
+--- a/upnp/src/uuid/sysdep.c
++++ b/upnp/src/uuid/sysdep.c
+@@ -30,6 +30,8 @@
+ #include <string.h>
+ #include <stdio.h>
+ 
++#include <Winsock2.h>
++
+ /*!
+  * \brief System dependent call to get IEEE node ID.
+  *
+@@ -93,7 +95,9 @@ void get_random_info(unsigned char seed[16])
+ 	/* Initialize memory area so that valgrind does not complain */
+ 	memset(&r, 0, sizeof r);
+ 	/* memory usage stats */
+-	GlobalMemoryStatus( &r.m );
++#if (WINAPI_FAMILY_APP != WINAPI_FAMILY_PC_APP)
++    GlobalMemoryStatus(&r.m);
++#endif
+ 	/* random system stats */
+ 	GetSystemInfo( &r.s );
+ 	/* 100ns resolution (nominally) time of day */
+@@ -101,9 +105,13 @@ void get_random_info(unsigned char seed[16])
+ 	/* high resolution performance counter */
+ 	QueryPerformanceCounter( &r.pc );
+ 	/* milliseconds since last boot */
+-	r.tc = GetTickCount();
++	r.tc = GetTickCount64();
+ 	r.l = MAX_COMPUTERNAME_LENGTH + 1;
+-	GetComputerName( r.hostname, &r.l );
++#if (WINAPI_FAMILY_APP != WINAPI_FAMILY_PC_APP)
++    GetComputerName(r.hostname, &r.l);
++#else
++    GetHostNameW(r.hostname, &r.l);
++#endif
+ 	/* MD5 it */
+ 	MD5Init(&c);
+ 	MD5Update(&c, (unsigned char *)(&r), sizeof r);
+--- a/upnp/src/uuid/uuid.c
++++ b/upnp/src/uuid/uuid.c
+@@ -50,7 +50,7 @@ static uint16_t true_random(void);
+ /*!
+  * \brief Generator of a UUID.
+  */
+-int uuid_create(uuid_upnp * uid)
++int uuid_upnp_create(uuid_upnp * uid)
+ {
+ 	uuid_time_t timestamp;
+ 	uuid_time_t last_time;
+@@ -82,7 +82,7 @@ int uuid_create(uuid_upnp * uid)
+ 	return 1;
+ };
+ 
+-void uuid_unpack(uuid_upnp * u, char *out)
++void uuid_upnp_unpack(uuid_upnp * u, char *out)
+ {
+ 	sprintf(out,
+ 		"%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
+@@ -221,7 +221,7 @@ static uint16_t true_random(void)
+ /*!
+  * \brief Create a UUID using a "name" from a "name space".
+  */
+-void uuid_create_from_name(
++void uuid_upnp_create_from_name(
+ 	/*! resulting UUID. */
+ 	uuid_upnp *uid,
+ 	/*! UUID to serve as context, so identical names from different name
+@@ -280,7 +280,7 @@ void format_uuid_v3(uuid_upnp *uid, unsigned char hash[16])
+  *
+  * Note: Lexical ordering is not temporal ordering!
+  */
+-int uuid_compare(uuid_upnp *u1, uuid_upnp *u2)
++int uuid_upnp_compare(uuid_upnp *u1, uuid_upnp *u2)
+ {
+ 	int i;
+ 
+-- 
+2.10.2.windows.1
+
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/vorbis/android.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/vorbis/android.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/vorbis/android.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/vorbis/android.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- libvorbis/configure.ac.orig	2012-09-07 00:17:47.000000000 +0200
-+++ libvorbis/configure.ac	2012-09-07 00:18:01.000000000 +0200
-@@ -130,5 +130,5 @@
- 		DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" 
--		CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
-+		CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
- #              	PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
--		PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
-+		PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline"
- 
-
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/vorbis/ios.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/vorbis/ios.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/vorbis/ios.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/vorbis/ios.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
---- libvorbis/configure.ac.orig	2012-09-07 00:17:47.000000000 +0200
-+++ libvorbis/configure.ac	2012-09-07 00:18:01.000000000 +0200
-@@ -199,8 +199,8 @@
- 		PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
- 	*-*-darwin*)
- 		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
--		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
--		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
-+		CFLAGS="-DDARWIN -fno-common -Wall -O3 -ffast-math -fsigned-char"
-+		PROFILE="-DDARWIN -fno-common -Wall -pg -O3 -ffast-math -fsigned-char";;
- 	*-*-os2*)
- 		# Use -W instead of -Wextra because gcc on OS/2 is an old version.
- 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/vorbis/osx.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/vorbis/osx.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/vorbis/osx.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/vorbis/osx.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
---- libvorbis/configure.ac.orig	2012-09-07 00:17:47.000000000 +0200
-+++ libvorbis/configure.ac	2012-09-07 00:18:01.000000000 +0200
-@@ -199,8 +199,8 @@
- 		PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
- 	*-*-darwin*)
- 		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
--		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
--		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
-+		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
-+		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
- 	*-*-os2*)
- 		# Use -W instead of -Wextra because gcc on OS/2 is an old version.
- 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/vorbis/rules.mak ring-20180816.2.e26b79f~ds1/daemon/contrib/src/vorbis/rules.mak
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/vorbis/rules.mak	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/vorbis/rules.mak	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-# libvorbis
-
-VORBIS_VERSION := 1.3.4
-VORBIS_URL := https://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.xz
-#VORBIS_URL := $(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
-
-ifdef HAVE_FPU
-PKGS += vorbis
-endif
-ifeq ($(call need_pkg,"vorbis >= 1.1"),)
-PKGS_FOUND += vorbis
-endif
-PKGS_ALL += vorbisenc
-ifdef BUILD_ENCODERS
-PKGS += vorbisenc
-endif
-ifeq ($(call need_pkg,"vorbisenc >= 1.1"),)
-PKGS_FOUND += vorbisenc
-endif
-
-$(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
-	$(call download,$(VORBIS_URL))
-
-.sum-vorbis: libvorbis-$(VORBIS_VERSION).tar.xz
-
-vorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
-	$(UNPACK)
-ifndef HAVE_IOS
-	$(APPLY) $(SRC)/vorbis/osx.patch
-else
-	$(APPLY) $(SRC)/vorbis/ios.patch
-endif
-ifdef HAVE_ANDROID
-	$(APPLY) $(SRC)/vorbis/android.patch
-endif
-	$(UPDATE_AUTOCONFIG)
-	$(MOVE)
-
-DEPS_vorbis = ogg
-
-.vorbis: vorbis
-	$(RECONF) -Im4
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-docs --disable-examples --disable-oggtest
-	cd $< && $(MAKE) install
-	touch $@
-
-.sum-vorbisenc: .sum-vorbis
-	touch $@
-
-DEPS_vorbisenc = vorbis
-
-.vorbisenc:
-	touch $@
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/vorbis/SHA512SUMS ring-20180816.2.e26b79f~ds1/daemon/contrib/src/vorbis/SHA512SUMS
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/vorbis/SHA512SUMS	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/vorbis/SHA512SUMS	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-f705c7740bec2dc6584ab8f103491a9d462136e3fa76454bde47e2ba04466b896ef066f7f925ad0a44d4c659c962717bc9099b3cecc20f12270d0ad53369ad53  libvorbis-1.3.4.tar.xz
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/x264/fetch_and_patch.bat ring-20180816.2.e26b79f~ds1/daemon/contrib/src/x264/fetch_and_patch.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/x264/fetch_and_patch.bat	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/x264/fetch_and_patch.bat	2018-08-16 15:09:51.000000000 +0000
@@ -17,6 +17,8 @@
 
 cd %BUILD%\x264
 
-%APPLY_CMD% %SRC%\x264\x264-uwp-api.patch
+if "%1"=="uwp" (
+    %APPLY_CMD% %SRC%\x264\x264-uwp.patch
+)
 
 cd %SRC%
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/x264/x264-uwp-api.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/x264/x264-uwp-api.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/x264/x264-uwp-api.patch	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/x264/x264-uwp-api.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
---- a/SMP/config.h
-+++ b/SMP/config.h
-@@ -22,7 +22,7 @@
- #define HAVE_GPL 1
- #define HAVE_INTERLACED 1
- #if BIT_DEPTH==8
--#   define HAVE_OPENCL 1
-+#   define HAVE_OPENCL 0
- #else
- #   define HAVE_OPENCL 0
- #endif
---- a/SMP/config.h
-+++ b/SMP/config.h
-@@ -48,4 +48,6 @@
- #endif
- #define HAVE_WINRT 0
- #define HAVE_BITDEPTH8 1
--#define HAVE_BITDEPTH10 1
-\ No newline at end of file
-+#define HAVE_BITDEPTH10 1
-+#undef HAVE_WINRT
-+#define HAVE_WINRT 1
---- a/SMP/libx264.vcxproj
-+++ b/SMP/libx264.vcxproj
-@@ -1351,6 +1351,8 @@ del /f /q $(OutDir)\licenses\x264.txt
-     <ClCompile Include="..\common\mc.c" />
-     <ClCompile Include="..\common\mvpred.c" />
-     <ClCompile Include="..\common\opencl.c">
-+			<ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
-+			<ExcludedFromBuild Condition="'$(Platform)'=='x86'">true</ExcludedFromBuild>
-       <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_10b'">true</ExcludedFromBuild>
-       <ExcludedFromBuild Condition="'$(Configuration)'=='Release_10b'">true</ExcludedFromBuild>
-     </ClCompile>
-\ No newline at end of file
--- 
-2.10.2.windows.1
-
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/x264/x264-uwp.patch ring-20180816.2.e26b79f~ds1/daemon/contrib/src/x264/x264-uwp.patch
--- ring-20180712.2.f3b87a6~ds1/daemon/contrib/src/x264/x264-uwp.patch	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/contrib/src/x264/x264-uwp.patch	2018-08-16 15:09:51.000000000 +0000
@@ -0,0 +1,37 @@
+--- a/SMP/config.h
++++ b/SMP/config.h
+@@ -22,7 +22,7 @@
+ #define HAVE_GPL 1
+ #define HAVE_INTERLACED 1
+ #if BIT_DEPTH==8
+-#   define HAVE_OPENCL 1
++#   define HAVE_OPENCL 0
+ #else
+ #   define HAVE_OPENCL 0
+ #endif
+--- a/SMP/config.h
++++ b/SMP/config.h
+@@ -48,4 +48,6 @@
+ #endif
+ #define HAVE_WINRT 0
+ #define HAVE_BITDEPTH8 1
+-#define HAVE_BITDEPTH10 1
+\ No newline at end of file
++#define HAVE_BITDEPTH10 1
++#undef HAVE_WINRT
++#define HAVE_WINRT 1
+--- a/SMP/libx264.vcxproj
++++ b/SMP/libx264.vcxproj
+@@ -1351,6 +1351,8 @@ del /f /q $(OutDir)\licenses\x264.txt
+     <ClCompile Include="..\common\mc.c" />
+     <ClCompile Include="..\common\mvpred.c" />
+     <ClCompile Include="..\common\opencl.c">
++			<ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
++			<ExcludedFromBuild Condition="'$(Platform)'=='x86'">true</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_10b'">true</ExcludedFromBuild>
+       <ExcludedFromBuild Condition="'$(Configuration)'=='Release_10b'">true</ExcludedFromBuild>
+     </ClCompile>
+\ No newline at end of file
+-- 
+2.10.2.windows.1
+
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/docker/Dockerfile_ubuntu_16.04 ring-20180816.2.e26b79f~ds1/daemon/docker/Dockerfile_ubuntu_16.04
--- ring-20180712.2.f3b87a6~ds1/daemon/docker/Dockerfile_ubuntu_16.04	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/docker/Dockerfile_ubuntu_16.04	2018-08-16 15:09:51.000000000 +0000
@@ -26,13 +26,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
@@ -45,7 +43,6 @@
         libavdevice-dev \
         libopus-dev \
         libudev-dev \
-        libgsm1-dev \
         libjsoncpp-dev \
         libnatpmp-dev \
         libappindicator3-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/globals.mk ring-20180816.2.e26b79f~ds1/daemon/globals.mk
--- ring-20180712.2.f3b87a6~ds1/daemon/globals.mk	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/globals.mk	2018-08-16 15:09:51.000000000 +0000
@@ -6,18 +6,6 @@
 ASTYLERC="$(top_srcdir)/../astylerc"
 indent="/usr/bin/astyle"
 
-if BUILD_SPEEX
-SPEEXCODEC=-DHAVE_SPEEX_CODEC
-endif
-
-if BUILD_OPUS
-OPUSCODEC=-DHAVE_OPUS
-endif
-
-if BUILD_GSM
-GSMCODEC=-DHAVE_GSM_CODEC
-endif
-
 RING_DIRTY_REPO ?= $(shell git diff-index --quiet HEAD 2>/dev/null || echo dirty)
 RING_REVISION ?= $(shell git log -1 --format="%h" --abbrev=10 2>/dev/null)
 
@@ -35,11 +23,7 @@
 	-DRING_REVISION=\"$(RING_REVISION)\" \
 	-DRING_DIRTY_REPO=\"$(RING_DIRTY_REPO)\" \
 	-DPJSIP_MAX_PKT_LEN=8000 \
-	-DPJ_AUTOCONF=1 \
-	$(SPEEXCODEC) \
-	$(GSMCODEC) \
-	$(OPUSCODEC)
-
+	-DPJ_AUTOCONF=1
 
 indent:
 	@echo "Indenting code:"
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/MSVC/config.h ring-20180816.2.e26b79f~ds1/daemon/MSVC/config.h
--- ring-20180712.2.f3b87a6~ds1/daemon/MSVC/config.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/MSVC/config.h	2018-08-16 15:09:51.000000000 +0000
@@ -35,9 +35,6 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
-/* Define if you have libgsm */
-#define HAVE_GSM 1
-
 /* Define if you have libiax */
 #define HAVE_IAX 0
 
@@ -53,9 +50,6 @@
 /* Define if you have jack */
 #define HAVE_JACK 0
 
-/* Define to 1 if you have the `gsm' library (-lgsm). */
-#define HAVE_LIBGSM 1
-
 /* Define to 1 if you have the <libintl.h> header file. */
 #define HAVE_LIBINTL_H 0
 
@@ -203,7 +197,7 @@
 /* Version number of package */
 #define VERSION "2.3.0"
 
-// UWP compatability
+// UWP compatibility
 #define PROGSHAREDIR ""
 
 /* Define to limit the scope of <windows.h>. */
@@ -253,4 +247,4 @@
 
 /* Define to empty if the keyword `volatile' does not work. Warning: valid
 code using `volatile' can become incorrect without. Disable with care. */
-/* #undef volatile */
\ No newline at end of file
+/* #undef volatile */
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/MSVC/make-daemon.bat ring-20180816.2.e26b79f~ds1/daemon/MSVC/make-daemon.bat
--- ring-20180712.2.f3b87a6~ds1/daemon/MSVC/make-daemon.bat	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/MSVC/make-daemon.bat	2018-08-16 15:09:51.000000000 +0000
@@ -0,0 +1,156 @@
+:: Ring - native Windows fetch and build
+
+@echo off
+@setlocal
+
+if "%1" == "/?" goto Usage
+if "%~1" == "" goto Usage
+
+set doFetch=N
+set doBuildContrib=N
+set doBuildDaemon=N
+
+set SCRIPTNAME=%~nx0
+
+if "%1"=="fetch" (
+    set doFetch=Y
+) else if "%1"=="contrib" (
+    set doBuildContrib=Y
+) else if "%1"=="daemon" (
+    set doBuildDaemon=Y
+) else (
+    goto Usage
+)
+
+set BUILD.x86=N
+set BUILD.x64=N
+set BUILD.uwp=N
+set BUILD.win32=N
+
+shift
+:ParseArgs
+if "%1" == "" goto FinishedArgs
+if /I "%1"=="x86" (
+    set BUILD.x86=Y
+) else if /I "%1"=="x64" (
+    set BUILD.x64=Y
+) else if /I "%1"=="uwp" (
+    set BUILD.uwp=Y
+) else if /I "%1"=="win32" (
+    set BUILD.win32=Y
+) else (
+        goto Usage
+)
+shift
+goto ParseArgs
+
+:FinishedArgs
+set CONTRIB_DIR=%~dp0../contrib
+set platform=N
+set arch=N
+if "%BUILD.x86%"=="Y" (
+    set arch=x86
+) else if "%BUILD.x64%"=="Y" (
+    set arch=x64
+)
+if "%BUILD.uwp%"=="Y" (
+    set platform=uwp
+    if "%arch%"=="x86" (
+        set DAEMON_MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=ReleaseLib /p:Platform=Win32 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+    ) else if "%arch%"=="x64" (
+        set DAEMON_MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=ReleaseLib /p:Platform=x64 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+    )
+) else if "%BUILD.win32%"=="Y" (
+    set platform=win32
+    if "%arch%"=="x86" (
+        set DAEMON_MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=ReleaseLib_win32 /p:Platform=Win32 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+    ) else if "%arch%"=="x64" (
+        set DAEMON_MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=ReleaseLib_win32 /p:Platform=x64 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+    )
+)
+if "%arch%" neq "N" (
+    if "%platform%" neq "N" (
+        if "%doFetch%" neq "N" (
+            call %CONTRIB_DIR%\src\fetch_all.bat %platform% %arch%
+        ) else if "%doBuildContrib%" neq "N" (
+			call %CONTRIB_DIR%\build_all.bat %platform% %arch%
+        ) else if "%doBuildDaemon%" neq "N" (
+            goto buildDaemon
+        )
+        goto :eof
+    )
+)
+goto Usage
+
+:buildDaemon
+@setlocal
+
+set VSInstallerFolder="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
+if %PROCESSOR_ARCHITECTURE%==x86 set VSInstallerFolder="%ProgramFiles%\Microsoft Visual Studio\Installer"
+
+pushd %VSInstallerFolder%
+for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
+  set VSLATESTDIR=%%i
+)
+popd
+
+echo VS Installation folder: %VSLATESTDIR%
+
+if not exist "%VSLATESTDIR%\VC\Auxiliary\Build\vcvarsall.bat" (
+    echo:
+    echo VSInstallDir not found or not installed correctly.
+    goto cleanup
+)
+
+if %PROCESSOR_ARCHITECTURE%==x86 (
+    if "%platform%"=="uwp" (
+        set Comp_x86=x86 uwp 10.0.15063.0
+        set Comp_x64=x86_amd64 uwp 10.0.15063.0
+    ) else (
+        set Comp_x86=x86 10.0.15063.0
+        set Comp_x64=x86_amd64 10.0.15063.0
+    )
+) else (
+    if "%platform%"=="uwp" (
+        set Comp_x86=amd64_x86 uwp 10.0.15063.0
+        set Comp_x64=amd64 uwp 10.0.15063.0
+    ) else (
+        set Comp_x86=amd64_x86 10.0.15063.0
+        set Comp_x64=amd64 10.0.15063.0
+    )
+)
+
+set path=%path:"=%
+if "%arch%"=="x86" (
+    call "%VSLATESTDIR%"\\VC\\Auxiliary\\Build\\vcvarsall.bat %Comp_x86%
+) else if "%arch%"=="x64" (
+    call "%VSLATESTDIR%"\\VC\\Auxiliary\\Build\\vcvarsall.bat %Comp_x64%
+)
+
+::build the daemon
+echo "building daemon..."
+msbuild ring-daemon.vcxproj %DAEMON_MSBUILD_ARGS%
+goto :eof
+
+@endlocal
+
+:Usage
+echo:
+echo The correct usage is:
+echo:
+echo     %0 [action] [target platform] [architecture]
+echo:
+echo where
+echo:
+echo [action]           is: fetch ^| build
+echo [target platform]  is: uwp   ^| win32
+echo [architecture]     is: x86   ^| x64
+echo:
+echo For example:
+echo     %SCRIPTNAME% fetch win32 x86   - fetch contrib for a win32/x86 build
+echo     %SCRIPTNAME% contrib uwp x64   - build uwp(win10)/x64 contrib
+echo     %SCRIPTNAME% daemon uwp x64    - build uwp(win10)/x64 daemon
+echo:
+goto :eof
+
+@endlocal
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/MSVC/ring-daemon.sln ring-20180816.2.e26b79f~ds1/daemon/MSVC/ring-daemon.sln
--- ring-20180712.2.f3b87a6~ds1/daemon/MSVC/ring-daemon.sln	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/MSVC/ring-daemon.sln	2018-08-16 15:09:51.000000000 +0000
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "ring-daemon.vcxproj", "{79F8DE42-595D-49D9-A66F-55244FD9DCC3}"
 EndProject
@@ -8,10 +8,14 @@
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		DebugLib_win32|x64 = DebugLib_win32|x64
+		DebugLib_win32|x86 = DebugLib_win32|x86
 		DebugLib|x64 = DebugLib|x64
 		DebugLib|x86 = DebugLib|x86
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		ReleaseLib_win32|x64 = ReleaseLib_win32|x64
+		ReleaseLib_win32|x86 = ReleaseLib_win32|x86
 		ReleaseLib|x64 = ReleaseLib|x64
 		ReleaseLib|x86 = ReleaseLib|x86
 	EndGlobalSection
@@ -20,6 +24,10 @@
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x64.Build.0 = Debug|x64
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x86.ActiveCfg = Debug|Win32
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x86.Build.0 = Debug|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib_win32|x64.ActiveCfg = DebugLib_win32|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib_win32|x64.Build.0 = DebugLib_win32|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib_win32|x86.ActiveCfg = DebugLib_win32|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib_win32|x86.Build.0 = DebugLib_win32|Win32
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x64.ActiveCfg = DebugLib|x64
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x64.Build.0 = DebugLib|x64
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x86.ActiveCfg = DebugLib|Win32
@@ -28,6 +36,10 @@
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x64.Build.0 = Release|x64
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x86.ActiveCfg = Release|Win32
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x86.Build.0 = Release|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib_win32|x64.ActiveCfg = ReleaseLib_win32|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib_win32|x64.Build.0 = ReleaseLib_win32|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib_win32|x86.ActiveCfg = ReleaseLib_win32|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib_win32|x86.Build.0 = ReleaseLib_win32|Win32
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x64.ActiveCfg = ReleaseLib|x64
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x64.Build.0 = ReleaseLib|x64
 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x86.ActiveCfg = ReleaseLib|Win32
@@ -36,4 +48,7 @@
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7505C3ED-E07A-48C4-BE60-8BD5A00CC85C}
+	EndGlobalSection
 EndGlobal
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/MSVC/ring-daemon.vcxproj ring-20180816.2.e26b79f~ds1/daemon/MSVC/ring-daemon.vcxproj
--- ring-20180712.2.f3b87a6~ds1/daemon/MSVC/ring-daemon.vcxproj	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/MSVC/ring-daemon.vcxproj	2018-08-16 15:09:51.000000000 +0000
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugLib_win32|Win32">
+      <Configuration>DebugLib_win32</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugLib_win32|x64">
+      <Configuration>DebugLib_win32</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="DebugLib|Win32">
       <Configuration>DebugLib</Configuration>
       <Platform>Win32</Platform>
@@ -13,6 +21,14 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseLib_win32|Win32">
+      <Configuration>ReleaseLib_win32</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseLib_win32|x64">
+      <Configuration>ReleaseLib_win32</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseLib|Win32">
       <Configuration>ReleaseLib</Configuration>
       <Platform>Win32</Platform>
@@ -33,14 +49,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="w32lib|Win32">
-      <Configuration>w32lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="w32lib|x64">
-      <Configuration>w32lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{79F8DE42-595D-49D9-A66F-55244FD9DCC3}</ProjectGuid>
@@ -60,6 +68,12 @@
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -74,7 +88,7 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='w32lib|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
@@ -82,7 +96,7 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
@@ -93,6 +107,12 @@
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -108,7 +128,7 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
@@ -126,13 +146,16 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='w32lib|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -141,13 +164,16 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
@@ -162,6 +188,12 @@
     <TargetExt>.lib</TargetExt>
     <TargetName>dringd</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Configuration)\bin\</OutDir>
+    <TargetExt>.lib</TargetExt>
+    <TargetName>dringd</TargetName>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetName>dring</TargetName>
     <OutDir>$(SolutionDir)$(Configuration)\bin\</OutDir>
@@ -171,14 +203,16 @@
     <OutDir>$(SolutionDir)$(Configuration)\bin\</OutDir>
     <TargetName>dring</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='w32lib|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|Win32'">
     <TargetExt>.lib</TargetExt>
-    <OutDir>$(SolutionDir)$(Configuration)\bin\</OutDir>
+    <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\bin\</OutDir>
     <TargetName>dring</TargetName>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>dringd</TargetName>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
+    <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
@@ -190,7 +224,7 @@
     <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\bin\</OutDir>
     <TargetName>dring</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">
     <TargetExt>.lib</TargetExt>
     <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\bin\</OutDir>
     <TargetName>dring</TargetName>
@@ -200,6 +234,11 @@
     <TargetName>dringd</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|x64'">
+    <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\bin\</OutDir>
+    <TargetName>dringd</TargetName>
+    <TargetExt>.lib</TargetExt>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
@@ -220,7 +259,7 @@
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodecd.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avutild.lib;libpjproject.lib;libsamplerate.lib;libsndfile.lib;libupnp.lib;libyaml-cpp.lib;opendht.lib;pcred.lib;pjlib.lib;pjlib_util.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjmedia.lib;pjmedia_codec.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;portaudio.lib;swresampled.lib;swscaled.lib;lib_json.lib;Strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodecd.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avutild.lib;libpjproject.lib;libupnp.lib;libyaml-cpp.lib;opendht.lib;pcred.lib;pjlib.lib;pjlib_util.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjmedia.lib;pjmedia_codec.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;portaudio.lib;swresampled.lib;swscaled.lib;lib_json.lib;Strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/VERBOSE:LIB /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /OPT:NOLBR /OPT:NOICF /ignore:4099 /ignore:4049 /ignore:4217 /INCREMENTAL /LTCG:OFF /FORCE:MULTIPLE</AdditionalOptions>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -255,7 +294,50 @@
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodecd.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avutild.lib;libpjproject.lib;libsamplerate.lib;libsndfile.lib;libupnp.lib;libyaml-cpp.lib;opendht.lib;pcred.lib;pjlib.lib;pjlib_util.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjmedia.lib;pjmedia_codec.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;portaudio.lib;swresampled.lib;swscaled.lib;lib_json.lib;Strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodecd.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avutild.lib;libpjproject.lib;libupnp.lib;libyaml-cpp.lib;opendht.lib;pcred.lib;pjlib.lib;pjlib_util.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjmedia.lib;pjmedia_codec.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;portaudio.lib;swresampled.lib;swscaled.lib;lib_json.lib;Strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalOptions>/VERBOSE:LIB /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /OPT:NOLBR /OPT:NOICF /ignore:4099 /ignore:4049 /ignore:4217 /INCREMENTAL /LTCG:OFF /FORCE:MULTIPLE</AdditionalOptions>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
+    </Link>
+    <ProjectReference>
+      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <Lib>
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodecd.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avutild.lib;ixml.lib;libaacs.lib;libavutil.lib;libbaseclasses.lib;libgcrypt.lib;libgmp.lib;libgpg-error.lib;libgtest.lib;libhogweed.lib;libiconv.lib;libilbccodec.lib;libmilenage.lib;libnettle.lib;libogg.lib;liboggd.lib;libpjproject.lib;libresample.lib;libspeex.lib;libspeexdsp.lib;libsrtp.lib;libupnp.lib;libuuid.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libx265_10b.lib;libx265_12b.lib;libyaml-cpp.lib;libzlib.lib;msgpack.lib;opendht.lib;opus.lib;pcred.lib;portaudio.lib;pjlib.lib;pjlib_util.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjmedia.lib;pjmedia_codec.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;swresampled.lib;swscaled.lib;lib_json.lib;Strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+    <Lib>
+      <AdditionalLibraryDirectories>..\contrib\lib\x86;</AdditionalLibraryDirectories>
+      <AdditionalOptions>/ignore:4066,4006,4221 /VERBOSE:LIB /NODEFAULTLIB:libcmtd /LTCG:OFF %(AdditionalOptions)</AdditionalOptions>
+      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|Win32'">
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>false</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\pcre\msvc;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>RING_UWP;_USE_MATH_DEFINES;DEBUG_FPS;PCRE_STATIC;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAsManaged>
+      </CompileAsManaged>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild>true</MinimalRebuild>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <UseFullPaths>false</UseFullPaths>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodecd.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avutild.lib;libpjproject.lib;libupnp.lib;libyaml-cpp.lib;opendht.lib;pcred.lib;pjlib.lib;pjlib_util.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjmedia.lib;pjmedia_codec.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;portaudio.lib;swresampled.lib;swscaled.lib;lib_json.lib;Strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/VERBOSE:LIB /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /OPT:NOLBR /OPT:NOICF /ignore:4099 /ignore:4049 /ignore:4217 /INCREMENTAL /LTCG:OFF /FORCE:MULTIPLE</AdditionalOptions>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -270,7 +352,7 @@
       </Command>
     </PreBuildEvent>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodecd.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avutild.lib;ixml.lib;libaacs.lib;libavutil.lib;libbaseclasses.lib;libgcrypt.lib;libgmp.lib;libgpg-error.lib;libgsmcodec.lib;libgtest.lib;libhogweed.lib;libiconv.lib;libilbccodec.lib;libmilenage.lib;libnettle.lib;libogg.lib;liboggd.lib;libpjproject.lib;libresample.lib;libsamplerate.lib;libsndfile.lib;libspeex.lib;libspeexdsp.lib;libsrtp.lib;libupnp.lib;libuuid.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libx265_10b.lib;libx265_12b.lib;libyaml-cpp.lib;libzlib.lib;msgpack.lib;opendht.lib;opus.lib;pcred.lib;portaudio.lib;pjlib.lib;pjlib_util.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjmedia.lib;pjmedia_codec.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;swresampled.lib;swscaled.lib;lib_json.lib;Strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodecd.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avutild.lib;ixml.lib;libaacs.lib;libavutil.lib;libbaseclasses.lib;libgcrypt.lib;libgmp.lib;libgpg-error.lib;libgsmcodec.lib;libgtest.lib;libhogweed.lib;libiconv.lib;libilbccodec.lib;libmilenage.lib;libnettle.lib;libogg.lib;liboggd.lib;libpjproject.lib;libresample.lib;libspeex.lib;libspeexdsp.lib;libsrtp.lib;libupnp.lib;libuuid.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libx265_10b.lib;libx265_12b.lib;libyaml-cpp.lib;libzlib.lib;msgpack.lib;opendht.lib;opus.lib;pcred.lib;portaudio.lib;pjlib.lib;pjlib_util.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjmedia.lib;pjmedia_codec.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;swresampled.lib;swscaled.lib;lib_json.lib;Strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <Lib>
       <AdditionalLibraryDirectories>..\contrib\lib\x86;</AdditionalLibraryDirectories>
@@ -291,7 +373,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\bin;$(ProjectDir)..\contrib\msvc\lib\x64;$(ProjectDir)..\contrib\build\boost\stage\lib;$(ProjectDir)..\contrib\build\pjproject\pjsip\lib;$(ProjectDir)..\contrib\build\pjproject\pjmedia\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\lib;$(ProjectDir)..\contrib\build\pjproject\third_party\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib\lib;$(ProjectDir)..\contrib\build\pjproject\pjnath\lib;$(ProjectDir)..\contrib\build\restbed\build\Release;$(ProjectDir)..\contrib\build\restbed\dependency\openssl\out32dll;$(ProjectDir)..\contrib\build\jsoncpp\makefiles\vs2017\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>ws2_32.lib;Strmiids.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avresample.lib;avutil.lib;ixml.lib;libaacsd.lib;libavutil.lib;libavutild.lib;libbaseclasses.lib;libgcryptd.lib;libgmp.lib;libgmpd.lib;libgpg-errord.lib;libgsmcodec.lib;libgtest.lib;libhogweed.lib;libiconv.lib;libiconvd.lib;libilbccodec.lib;libmilenage.lib;libnettle.lib;libogg.lib;liboggd.lib;libpjproject.lib;libportaudio.lib;libresample.lib;libsamplerate.lib;libsndfile.lib;libspeex.lib;libspeexd.lib;libspeexdsp.lib;libsrtp.lib;libupnp.lib;libuuid.lib;libvorbis.lib;libvorbisd.lib;libvpx.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libx265_10bd.lib;libx265_12bd.lib;libyaml-cppmdd.lib;libzlib.lib;msgpack.lib;opendht.lib;opus.lib;pcred.lib;pjlib-util.lib;pjlib.lib;pjmedia-audiodev.lib;pjmedia-codec.lib;pjmedia-videodev.lib;pjmedia.lib;pjnath.lib;pjsip-core.lib;pjsip-simple.lib;pjsip-ua.lib;pjsua-lib.lib;pjsua2-lib.lib;portaudio_x86.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;Strmiids.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avresample.lib;avutil.lib;ixml.lib;libaacsd.lib;libavutil.lib;libavutild.lib;libbaseclasses.lib;libgcryptd.lib;libgmp.lib;libgmpd.lib;libgpg-errord.lib;libgtest.lib;libhogweed.lib;libiconv.lib;libiconvd.lib;libilbccodec.lib;libmilenage.lib;libnettle.lib;libogg.lib;liboggd.lib;libpjproject.lib;libportaudio.lib;libresample.lib;libspeex.lib;libspeexd.lib;libspeexdsp.lib;libsrtp.lib;libupnp.lib;libuuid.lib;libvorbis.lib;libvorbisd.lib;libvpx.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libx265_10bd.lib;libx265_12bd.lib;libyaml-cppmdd.lib;libzlib.lib;msgpack.lib;opendht.lib;opus.lib;pcred.lib;pjlib-util.lib;pjlib.lib;pjmedia-audiodev.lib;pjmedia-codec.lib;pjmedia-videodev.lib;pjmedia.lib;pjnath.lib;pjsip-core.lib;pjsip-simple.lib;pjsip-ua.lib;pjsua-lib.lib;pjsua2-lib.lib;portaudio_x86.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/VERBOSE:LIB /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /OPT:NOLBR /OPT:NOICF /ignore:4099 /ignore:4049 /ignore:4217 /INCREMENTAL /LTCG:OFF</AdditionalOptions>
       <TargetMachine>MachineX86</TargetMachine>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -318,7 +400,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>..\..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>ws2_32.lib;Strmiids.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avresample.lib;avutil.lib;ixml.lib;libaacsd.lib;libavutil.lib;libavutild.lib;libbaseclasses.lib;libgcryptd.lib;libgmp.lib;libgmpd.lib;libgpg-errord.lib;libgsmcodec.lib;libgtest.lib;libhogweed.lib;libiconv.lib;libiconvd.lib;libilbccodec.lib;libmilenage.lib;libnettle.lib;libogg.lib;liboggd.lib;libpjproject.lib;libportaudio.lib;libresample.lib;libsamplerate.lib;libsndfile.lib;libspeex.lib;libspeexd.lib;libspeexdsp.lib;libsrtp.lib;libupnp.lib;libuuid.lib;libvorbis.lib;libvorbisd.lib;libvpx.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libx265_10bd.lib;libx265_12bd.lib;libyaml-cppmdd.lib;libzlib.lib;msgpack.lib;opendht.lib;opus.lib;pcred.lib;pjlib-util.lib;pjlib.lib;pjmedia-audiodev.lib;pjmedia-codec.lib;pjmedia-videodev.lib;pjmedia.lib;pjnath.lib;pjsip-core.lib;pjsip-simple.lib;pjsip-ua.lib;pjsua-lib.lib;pjsua2-lib.lib;portaudio_x86.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;Strmiids.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avresample.lib;avutil.lib;ixml.lib;libaacsd.lib;libavutil.lib;libavutild.lib;libbaseclasses.lib;libgcryptd.lib;libgmp.lib;libgmpd.lib;libgpg-errord.lib;libgtest.lib;libhogweed.lib;libiconv.lib;libiconvd.lib;libilbccodec.lib;libmilenage.lib;libnettle.lib;libogg.lib;liboggd.lib;libpjproject.lib;libportaudio.lib;libresample.lib;libspeex.lib;libspeexd.lib;libspeexdsp.lib;libsrtp.lib;libupnp.lib;libuuid.lib;libvorbis.lib;libvorbisd.lib;libvpx.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libx265_10bd.lib;libx265_12bd.lib;libyaml-cppmdd.lib;libzlib.lib;msgpack.lib;opendht.lib;opus.lib;pcred.lib;pjlib-util.lib;pjlib.lib;pjmedia-audiodev.lib;pjmedia-codec.lib;pjmedia-videodev.lib;pjmedia.lib;pjnath.lib;pjsip-core.lib;pjsip-simple.lib;pjsip-ua.lib;pjsua-lib.lib;pjsua2-lib.lib;portaudio_x86.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/VERBOSE:LIB /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /OPT:NOLBR /OPT:NOICF /ignore:4099 /ignore:4049 /ignore:4217 /INCREMENTAL /LTCG:OFF</AdditionalOptions>
       <TargetMachine>MachineX86</TargetMachine>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -328,7 +410,7 @@
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodecd.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avutild.lib;ixml.lib;libaacs.lib;libavutil.lib;libbaseclasses.lib;libgcrypt.lib;libgmp.lib;libgpg-error.lib;libgsmcodec.lib;libgtest.lib;libhogweed.lib;libiconv.lib;libilbccodec.lib;libmilenage.lib;libnettle.lib;libogg.lib;liboggd.lib;libpjproject.lib;libresample.lib;libsamplerate.lib;libsndfile.lib;libspeex.lib;libspeexdsp.lib;libsrtp.lib;libupnp.lib;libuuid.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libx265_10b.lib;libx265_12b.lib;libyaml-cpp.lib;libzlib.lib;msgpack.lib;opendht.lib;opus.lib;pcred.lib;portaudio.lib;pjlib.lib;pjlib_util.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjmedia.lib;pjmedia_codec.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;swresampled.lib;swscaled.lib;lib_json.lib;Strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodecd.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avutild.lib;ixml.lib;libaacs.lib;libavutil.lib;libbaseclasses.lib;libgcrypt.lib;libgmp.lib;libgpg-error.lib;libgtest.lib;libhogweed.lib;libiconv.lib;libilbccodec.lib;libmilenage.lib;libnettle.lib;libogg.lib;liboggd.lib;libpjproject.lib;libresample.lib;libspeex.lib;libspeexdsp.lib;libsrtp.lib;libupnp.lib;libuuid.lib;libvorbis.lib;libvpx.lib;libx264.lib;libx265.lib;libx265_10b.lib;libx265_12b.lib;libyaml-cpp.lib;libzlib.lib;msgpack.lib;opendht.lib;opus.lib;pcred.lib;portaudio.lib;pjlib.lib;pjlib_util.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjmedia.lib;pjmedia_codec.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;swresampled.lib;swscaled.lib;lib_json.lib;Strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\bin;$(ProjectDir)..\contrib\msvc\lib\x64;$(ProjectDir)..\contrib\build\boost\stage\lib;$(ProjectDir)..\contrib\build\pjproject\pjsip\lib;$(ProjectDir)..\contrib\build\pjproject\pjmedia\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\lib;$(ProjectDir)..\contrib\build\pjproject\third_party\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib\lib;$(ProjectDir)..\contrib\build\pjproject\pjnath\lib;$(ProjectDir)..\contrib\build\restbed\build\Release;$(ProjectDir)..\contrib\build\restbed\dependency\openssl\out32dll;$(ProjectDir)..\contrib\build\argon2\vs2015\Argon2Ref\vs2015\build;$(ProjectDir)..\contrib\build\pcre\msvc\Release;$(ProjectDir)..\contrib\build\yaml-cpp\msvc\Release</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -337,6 +419,38 @@
       </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|x64'">
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>false</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\pcre\msvc;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>RING_UWP;_USE_MATH_DEFINES;DEBUG_FPS;PCRE_STATIC;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>..\..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>ws2_32.lib;Strmiids.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avresample.lib;avutil.lib;ixml.lib;libaacsd.lib;libavutil.lib;libavutild.lib;libbaseclasses.lib;libgcryptd.lib;libgmp.lib;libgmpd.lib;libgpg-errord.lib;libgsmcodec.lib;libgtest.lib;libhogweed.lib;libiconv.lib;libiconvd.lib;libilbccodec.lib;libmilenage.lib;libnettle.lib;libogg.lib;liboggd.lib;libpjproject.lib;libportaudio.lib;libresample.lib;libspeex.lib;libspeexd.lib;libspeexdsp.lib;libsrtp.lib;libupnp.lib;libuuid.lib;libvorbis.lib;libvorbisd.lib;libvpx.lib;libvpxd.lib;libx264d.lib;libx265d.lib;libx265_10bd.lib;libx265_12bd.lib;libyaml-cppmdd.lib;libzlib.lib;msgpack.lib;opendht.lib;opus.lib;pcred.lib;pjlib-util.lib;pjlib.lib;pjmedia-audiodev.lib;pjmedia-codec.lib;pjmedia-videodev.lib;pjmedia.lib;pjnath.lib;pjsip-core.lib;pjsip-simple.lib;pjsip-ua.lib;pjsua-lib.lib;pjsua2-lib.lib;portaudio_x86.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/VERBOSE:LIB /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /OPT:NOLBR /OPT:NOICF /ignore:4099 /ignore:4049 /ignore:4217 /INCREMENTAL /LTCG:OFF</AdditionalOptions>
+      <TargetMachine>MachineX86</TargetMachine>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+    </Link>
+    <ProjectReference>
+      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;advapi32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;libgnutls.lib;lib_json.lib;libopendht.lib;Argon2Ref.lib;pcre.lib;secp256k1.lib;libyaml-cppmd.lib;portaudio.lib;libupnp.lib;pjsip-core-x86_64-x64-vc15-Release.lib;pjsip-simple-x86_64-x64-vc15-Release.lib;pjsua2-lib-x86_64-x64-vc15-Release.lib;pjsua-lib-x86_64-x64-vc15-Release.lib;pjsip-ua-x86_64-x64-vc15-Release.lib;pjmedia-x86_64-x64-vc15-Release.lib;pjlib-util-x86_64-x64-vc15-Release.lib;pjlib-x86_64-x64-vc15-Release.lib;pjnath-x86_64-x64-vc15-Release.lib;restbed.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\contrib\build\ffmpeg\Build\win32\x64\bin;$(ProjectDir)..\contrib\msvc\lib\x64;$(ProjectDir)..\contrib\build\boost\stage\lib;$(ProjectDir)..\contrib\build\pjproject\pjsip\lib;$(ProjectDir)..\contrib\build\pjproject\pjmedia\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\lib;$(ProjectDir)..\contrib\build\pjproject\third_party\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib\lib;$(ProjectDir)..\contrib\build\pjproject\pjnath\lib;$(ProjectDir)..\contrib\build\restbed\build\Release;$(ProjectDir)..\contrib\build\restbed\dependency\openssl\out32dll;$(ProjectDir)..\contrib\build\argon2\vs2015\Argon2Ref\vs2015\build;$(ProjectDir)..\contrib\build\pcre\msvc\Release;$(ProjectDir)..\contrib\build\yaml-cpp\msvc\Release</AdditionalLibraryDirectories>
+      <AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
+    </Lib>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
@@ -359,7 +473,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;Strmiids.lib;libavcodec.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavutil.lib;libswresample.lib;libswscale.lib;libsamplerate.lib;libsndfile.lib;libgnutls.lib;lib_json.lib;opendht.lib;argon.lib;blake.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;libupnp.lib;pthreadVC2.lib;portaudio.lib;libspeex-pj.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;Strmiids.lib;libavcodec.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavutil.lib;libswresample.lib;libswscale.lib;libgnutls.lib;lib_json.lib;opendht.lib;argon.lib;blake.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;libupnp.lib;pthreadVC2.lib;portaudio.lib;libspeex-pj.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/VERBOSE:LIB /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /OPT:NOLBR /OPT:NOICF %(AdditionalOptions)</AdditionalOptions>
       <LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@@ -410,12 +524,12 @@
       </Command>
     </PreBuildEvent>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;Strmiids.lib;libavcodec.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavutil.lib;libswresample.lib;libswscale.lib;libsamplerate.lib;libsndfile.lib;libgnutls.lib;lib_json.lib;opendht.lib;argon.lib;blake.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;libupnp.lib;pthreadVC2.lib;portaudio.lib;libspeex-pj.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;Strmiids.lib;libavcodec.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavutil.lib;libswresample.lib;libswscale.lib;libgnutls.lib;lib_json.lib;opendht.lib;argon.lib;blake.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;libupnp.lib;pthreadVC2.lib;portaudio.lib;libspeex-pj.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\contrib\lib\x86;</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4006 /ignore:4221 /VERBOSE:LIB /NODEFAULTLIB:libcmt /LTCG:OFF %(AdditionalOptions)</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='w32lib|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|Win32'">
     <ClCompile>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
@@ -423,7 +537,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>false</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\pcre\msvc;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>RING_UWP;_USE_MATH_DEFINES;PCRE_STATIC;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;PCRE_STATIC;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CompileAsManaged>
       </CompileAsManaged>
       <BufferSecurityCheck>
@@ -452,7 +566,7 @@
       </Command>
     </PreBuildEvent>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;Strmiids.lib;libavcodec.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavutil.lib;libswresample.lib;libswscale.lib;libsamplerate.lib;libsndfile.lib;libgnutls.lib;lib_json.lib;opendht.lib;argon.lib;blake.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;libupnp.lib;pthreadVC2.lib;portaudio.lib;libspeex-pj.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;Strmiids.lib;libavcodec.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavutil.lib;libswresample.lib;libswscale.lib;libgnutls.lib;lib_json.lib;opendht.lib;argon.lib;blake.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;libupnp.lib;pthreadVC2.lib;portaudio.lib;libspeex-pj.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\contrib\lib\x86;</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4006 /ignore:4221 /VERBOSE:LIB /NODEFAULTLIB:libcmt /LTCG:OFF %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -472,13 +586,13 @@
       </BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\bin;$(ProjectDir)..\contrib\msvc\lib\x64;$(ProjectDir)..\contrib\build\boost\stage\lib;$(ProjectDir)..\contrib\build\pjproject\pjsip\lib;$(ProjectDir)..\contrib\build\pjproject\pjmedia\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\lib;$(ProjectDir)..\contrib\build\pjproject\third_party\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib\lib;$(ProjectDir)..\contrib\build\pjproject\pjnath\lib;$(ProjectDir)..\contrib\build\restbed\build\Release;$(ProjectDir)..\contrib\build\restbed\dependency\openssl\out32dll;$(ProjectDir)..\contrib\build\jsoncpp\makefiles\vs2017\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;Strmiids.lib;libavcodec.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavutil.lib;libswresample.lib;libswscale.lib;libsamplerate.lib;libsndfile.lib;libgnutls.lib;lib_json.lib;opendht.lib;Argon2Ref.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;libupnp.lib;pthreadVC2.lib;portaudio.lib;libspeex-pj.lib;secp256k1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;Strmiids.lib;libavcodec.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavutil.lib;libswresample.lib;libswscale.lib;libgnutls.lib;lib_json.lib;opendht.lib;Argon2Ref.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;libupnp.lib;pthreadVC2.lib;portaudio.lib;libspeex-pj.lib;secp256k1.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/VERBOSE:LIB /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /OPT:NOLBR /OPT:NOICF /ignore:4006 %(AdditionalOptions)</AdditionalOptions>
       <TargetMachine>MachineX64</TargetMachine>
       <LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@@ -510,6 +624,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
       <BufferSecurityCheck>false</BufferSecurityCheck>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -529,16 +644,54 @@
       </Command>
     </PreBuildEvent>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;advapi32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;libsamplerate.lib;libgnutls.lib;lib_json.lib;libopendht.lib;Argon2Ref.lib;pcre.lib;secp256k1.lib;libyaml-cppmd.lib;portaudio.lib;libupnp.lib;pjsip-core-x86_64-x64-vc15-Release.lib;pjsip-simple-x86_64-x64-vc15-Release.lib;pjsua2-lib-x86_64-x64-vc15-Release.lib;pjsua-lib-x86_64-x64-vc15-Release.lib;pjsip-ua-x86_64-x64-vc15-Release.lib;pjmedia-x86_64-x64-vc15-Release.lib;pjlib-util-x86_64-x64-vc15-Release.lib;pjlib-x86_64-x64-vc15-Release.lib;pjnath-x86_64-x64-vc15-Release.lib;restbed.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;advapi32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;libgnutls.lib;lib_json.lib;libopendht.lib;Argon2Ref.lib;pcre.lib;secp256k1.lib;libyaml-cppmd.lib;portaudio.lib;libupnp.lib;pjsip-core-x86_64-x64-vc15-Release.lib;pjsip-simple-x86_64-x64-vc15-Release.lib;pjsua2-lib-x86_64-x64-vc15-Release.lib;pjsua-lib-x86_64-x64-vc15-Release.lib;pjsip-ua-x86_64-x64-vc15-Release.lib;pjmedia-x86_64-x64-vc15-Release.lib;pjlib-util-x86_64-x64-vc15-Release.lib;pjlib-x86_64-x64-vc15-Release.lib;pjnath-x86_64-x64-vc15-Release.lib;restbed.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\bin;$(ProjectDir)..\contrib\msvc\lib\x64;$(ProjectDir)..\contrib\build\boost\stage\lib;$(ProjectDir)..\contrib\build\pjproject\pjsip\lib;$(ProjectDir)..\contrib\build\pjproject\pjmedia\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\lib;$(ProjectDir)..\contrib\build\pjproject\third_party\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib\lib;$(ProjectDir)..\contrib\build\pjproject\pjnath\lib;$(ProjectDir)..\contrib\build\restbed\build\Release;$(ProjectDir)..\contrib\build\restbed\dependency\openssl\out32dll;$(ProjectDir)..\contrib\build\argon2\vs2015\Argon2Ref\vs2015\build;$(ProjectDir)..\contrib\build\pcre\msvc\Release;$(ProjectDir)..\contrib\build\yaml-cpp\msvc\Release</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\pcre\msvc;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>
+      </SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\pcre\msvc;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\win32\x64\include;$(ProjectDir)..\contrib\build\sndfile\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>STATIC_GETOPT;_USE_MATH_DEFINES;PCRE_STATIC;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;_MBCS;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
     </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>..\..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Strmiids.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/VERBOSE:LIB /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /OPT:NOLBR /OPT:NOICF %(AdditionalOptions)</AdditionalOptions>
+      <TargetMachine>MachineX86</TargetMachine>
+      <LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
+    <ProjectReference>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <Lib>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;advapi32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;libgnutls.lib;lib_json.lib;libopendht.lib;Argon2Ref.lib;pcre.lib;secp256k1.lib;libyaml-cppmd.lib;portaudio.lib;libupnp.lib;pjsip-core-x86_64-x64-vc15-Release.lib;pjsip-simple-x86_64-x64-vc15-Release.lib;pjsua2-lib-x86_64-x64-vc15-Release.lib;pjsua-lib-x86_64-x64-vc15-Release.lib;pjsip-ua-x86_64-x64-vc15-Release.lib;pjmedia-x86_64-x64-vc15-Release.lib;pjlib-util-x86_64-x64-vc15-Release.lib;pjlib-x86_64-x64-vc15-Release.lib;pjnath-x86_64-x64-vc15-Release.lib;restbed.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\contrib\build\ffmpeg\Build\win32\x64\bin;$(ProjectDir)..\contrib\msvc\lib\x64;$(ProjectDir)..\contrib\build\boost\stage\lib;$(ProjectDir)..\contrib\build\pjproject\pjsip\lib;$(ProjectDir)..\contrib\build\pjproject\pjmedia\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\lib;$(ProjectDir)..\contrib\build\pjproject\third_party\lib;$(ProjectDir)..\contrib\build\pjproject\pjlib\lib;$(ProjectDir)..\contrib\build\pjproject\pjnath\lib;$(ProjectDir)..\contrib\build\restbed\build\Release;$(ProjectDir)..\contrib\build\restbed\dependency\openssl\out32dll;$(ProjectDir)..\contrib\build\argon2\vs2015\Argon2Ref\vs2015\build;$(ProjectDir)..\contrib\build\pcre\msvc\Release;$(ProjectDir)..\contrib\build\yaml-cpp\msvc\Release;$(ProjectDir)..\contrib\build\sndfile\msvc\x64\Release</AdditionalLibraryDirectories>
+      <AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
+      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\account.cpp" />
@@ -570,21 +723,21 @@
     <ClCompile Include="..\src\media\audio\audiobuffer.cpp" />
     <ClCompile Include="..\src\media\audio\audiolayer.cpp" />
     <ClCompile Include="..\src\media\audio\audioloop.cpp" />
-    <ClCompile Include="..\src\media\audio\audiorecord.cpp" />
-    <ClCompile Include="..\src\media\audio\audiorecorder.cpp" />
     <ClCompile Include="..\src\media\audio\audio_rtp_session.cpp" />
     <ClCompile Include="..\src\media\audio\dcblocker.cpp" />
     <ClCompile Include="..\src\media\audio\dsp.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='w32lib|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\media\audio\portaudio\portaudiolayer.cpp" />
     <ClCompile Include="..\src\media\audio\resampler.cpp" />
@@ -610,10 +763,17 @@
     <ClCompile Include="..\src\media\system_codec_container.cpp" />
     <ClCompile Include="..\src\media\video\accel.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\media\video\sinkclient.cpp" />
-    <ClCompile Include="..\src\media\video\uwpvideo\video_device_impl.cpp" />
-    <ClCompile Include="..\src\media\video\uwpvideo\video_device_monitor_impl.cpp" />
+    <ClCompile Include="..\src\media\video\uwpvideo\video_device_impl.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\src\media\video\uwpvideo\video_device_monitor_impl.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\src\media\video\video_base.cpp" />
     <ClCompile Include="..\src\media\video\video_device_monitor.cpp" />
     <ClCompile Include="..\src\media\video\video_input.cpp" />
@@ -622,6 +782,14 @@
     <ClCompile Include="..\src\media\video\video_rtp_session.cpp" />
     <ClCompile Include="..\src\media\video\video_scaler.cpp" />
     <ClCompile Include="..\src\media\video\video_sender.cpp" />
+    <ClCompile Include="..\src\media\video\winvideo\video_device_impl.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\src\media\video\winvideo\video_device_monitor_impl.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\src\peer_connection.cpp" />
     <ClCompile Include="..\src\preferences.cpp" />
     <ClCompile Include="..\src\ringdht\accountarchive.cpp" />
@@ -708,21 +876,21 @@
     <ClInclude Include="..\src\media\audio\audiobuffer.h" />
     <ClInclude Include="..\src\media\audio\audiolayer.h" />
     <ClInclude Include="..\src\media\audio\audioloop.h" />
-    <ClInclude Include="..\src\media\audio\audiorecord.h" />
-    <ClInclude Include="..\src\media\audio\audiorecorder.h" />
     <ClInclude Include="..\src\media\audio\audio_rtp_session.h" />
     <ClInclude Include="..\src\media\audio\dcblocker.h" />
     <ClInclude Include="..\src\media\audio\dsp.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='w32lib|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib_win32|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='w32lib|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\src\media\audio\portaudio\portaudiolayer.h" />
     <ClInclude Include="..\src\media\audio\resampler.h" />
@@ -753,6 +921,7 @@
     <ClInclude Include="..\src\media\system_codec_container.h" />
     <ClInclude Include="..\src\media\video\accel.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib_win32|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\src\media\video\shm_header.h" />
     <ClInclude Include="..\src\media\video\sinkclient.h" />
@@ -765,6 +934,10 @@
     <ClInclude Include="..\src\media\video\video_rtp_session.h" />
     <ClInclude Include="..\src\media\video\video_scaler.h" />
     <ClInclude Include="..\src\media\video\video_sender.h" />
+    <ClInclude Include="..\src\media\video\winvideo\capture_graph_interfaces.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="..\src\noncopyable.h" />
     <ClInclude Include="..\src\peer_connection.h" />
     <ClInclude Include="..\src\preferences.h" />
@@ -821,4 +994,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/MSVC/ring-daemon.vcxproj.filters ring-20180816.2.e26b79f~ds1/daemon/MSVC/ring-daemon.vcxproj.filters
--- ring-20180712.2.f3b87a6~ds1/daemon/MSVC/ring-daemon.vcxproj.filters	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/MSVC/ring-daemon.vcxproj.filters	2018-08-16 15:09:51.000000000 +0000
@@ -59,6 +59,9 @@
     <Filter Include="Source Files\dring">
       <UniqueIdentifier>{f137f8a1-8c2a-4e49-b73c-835f95507160}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\media\video\winvideo">
+      <UniqueIdentifier>{96b01e7f-7e05-480c-85a3-fa35ef5f8b87}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\hooks\urlhook.cpp">
@@ -385,6 +388,12 @@
     <ClCompile Include="..\src\media\media_recorder.cpp">
       <Filter>Source Files\media</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\media\video\winvideo\video_device_impl.cpp">
+      <Filter>Source Files\media\video\winvideo</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\media\video\winvideo\video_device_monitor_impl.cpp">
+      <Filter>Source Files\media\video\winvideo</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\account.h">
@@ -798,6 +807,9 @@
     <ClInclude Include="..\src\media\media_stream.h">
       <Filter>Source Files\media</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\media\video\winvideo\capture_graph_interfaces.h">
+      <Filter>Source Files\media\video\winvideo</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\src\ringdht\eth\libdevcore\Makefile.am">
Binary files /tmp/tmp38ojOH/dxKO_LUmwT/ring-20180712.2.f3b87a6~ds1/daemon/ringtones/default.opus and /tmp/tmp38ojOH/f5eJO2pOy7/ring-20180816.2.e26b79f~ds1/daemon/ringtones/default.opus differ
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/ringtones/default.opus.LICENSE ring-20180816.2.e26b79f~ds1/daemon/ringtones/default.opus.LICENSE
--- ring-20180712.2.f3b87a6~ds1/daemon/ringtones/default.opus.LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/ringtones/default.opus.LICENSE	2018-08-16 15:09:56.000000000 +0000
@@ -0,0 +1,4 @@
+Original file name: 171324__swidmark__ringtone.wav
+Download location: https://freesound.org/people/swidmark/sounds/171324
+Uploader: https://freesound.org/people/swidmark
+License: CC0 1.0 Universal (CC0 1.0) (https://creativecommons.org/publicdomain/zero/1.0/)
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/ringtones/Makefile.am ring-20180816.2.e26b79f~ds1/daemon/ringtones/Makefile.am
--- ring-20180712.2.f3b87a6~ds1/daemon/ringtones/Makefile.am	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/ringtones/Makefile.am	2018-08-16 15:09:56.000000000 +0000
@@ -1,4 +1,5 @@
 ringringtonesdir = $(datadir)/ring/ringtones
 dist_ringringtones_DATA = \
 	konga.ul\
-	default.wav
+	default.wav \
+	default.opus
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/account.cpp ring-20180816.2.e26b79f~ds1/daemon/src/account.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/account.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/account.cpp	2018-08-16 15:09:56.000000000 +0000
@@ -86,6 +86,12 @@
 const char * const Account::PRESENCE_MODULE_ENABLED_KEY   = "presenceModuleEnabled";
 const char * const Account::UPNP_ENABLED_KEY              = "upnpEnabled";
 
+#ifdef __ANDROID__
+constexpr char * const DEFAULT_RINGTONE_PATH = "/data/data/cx.ring/files/ringtones/default.opus";
+#else
+constexpr char * const DEFAULT_RINGTONE_PATH = "/usr/share/ring/ringtones/default.opus";
+#endif
+
 Account::Account(const std::string &accountID)
     : accountID_(accountID)
     , username_()
@@ -109,11 +115,7 @@
 
     // Initialize the codec order, used when creating a new account
     loadDefaultCodecs();
-    #ifdef __ANDROID__
-        ringtonePath_ = "/data/data/cx.ring/files/ringtones/default.wav";
-    #else
-        ringtonePath_ = "/usr/share/ring/ringtones/default.wav";
-    #endif
+    ringtonePath_ = DEFAULT_RINGTONE_PATH;
 }
 
 Account::~Account()
@@ -254,6 +256,9 @@
     parseValue(node, USER_AGENT_KEY, userAgent_);
     parseValue(node, RINGTONE_PATH_KEY, ringtonePath_);
     parseValue(node, RINGTONE_ENABLED_KEY, ringtoneEnabled_);
+    if (ringtonePath_.empty()) {
+        ringtonePath_ = DEFAULT_RINGTONE_PATH;
+    }
 
     bool enabled;
     parseValue(node, UPNP_ENABLED_KEY, enabled);
@@ -274,6 +279,9 @@
     parseInt(details, DRing::Account::ConfProperties::ACTIVE_CALL_LIMIT, activeCallLimit_);
     parseBool(details, Conf::CONFIG_RINGTONE_ENABLED, ringtoneEnabled_);
     parseString(details, Conf::CONFIG_RINGTONE_PATH, ringtonePath_);
+    if (ringtonePath_.empty()) {
+        ringtonePath_ = DEFAULT_RINGTONE_PATH;
+    }
     parseBool(details, Conf::CONFIG_ACCOUNT_HAS_CUSTOM_USERAGENT, hasCustomUserAgent_);
     if (hasCustomUserAgent_)
         parseString(details, Conf::CONFIG_ACCOUNT_USERAGENT, userAgent_);
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/account_schema.h ring-20180816.2.e26b79f~ds1/daemon/src/account_schema.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/account_schema.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/account_schema.h	2018-08-16 15:09:51.000000000 +0000
@@ -24,7 +24,7 @@
 
 /**
  * @file account_schema.h
- * @brief Account specfic keys/constants that must be shared in daemon and clients.
+ * @brief Account specific keys/constants that must be shared in daemon and clients.
  */
 
 namespace ring { namespace Conf {
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/call.cpp ring-20180816.2.e26b79f~ds1/daemon/src/call.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/call.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/call.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -26,7 +26,6 @@
 #include "audio/ringbufferpool.h"
 #include "dring/call_const.h"
 #include "client/ring_signal.h"
-#include "audio/audiorecord.h"
 #include "sip/sip_utils.h"
 #include "ip_utils.h"
 #include "array_size.h"
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/client/configurationmanager.cpp ring-20180816.2.e26b79f~ds1/daemon/src/client/configurationmanager.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/client/configurationmanager.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/client/configurationmanager.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -46,7 +46,7 @@
 #include <TargetConditionals.h>
 #endif
 
-#ifdef RING_UWP
+#ifdef _MSC_VER
 #include "windirent.h"
 #else
 #include <dirent.h>
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/compiler_intrinsics.h ring-20180816.2.e26b79f~ds1/daemon/src/compiler_intrinsics.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/compiler_intrinsics.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/compiler_intrinsics.h	2018-08-16 15:09:51.000000000 +0000
@@ -23,7 +23,7 @@
 #ifndef INTRIN_H_
 #define INTRIN_H_
 
-#ifdef RING_UWP
+#ifdef _MSC_VER
 #define UNUSED
 #else
 #define UNUSED __attribute__((__unused__))
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/conference.cpp ring-20180816.2.e26b79f~ds1/daemon/src/conference.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/conference.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/conference.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -25,7 +25,6 @@
 #include "manager.h"
 #include "audio/audiolayer.h"
 #include "audio/ringbufferpool.h"
-#include "audio/audiorecord.h"
 
 #ifdef RING_VIDEO
 #include "sip/sipcall.h"
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/config/Makefile.am ring-20180816.2.e26b79f~ds1/daemon/src/config/Makefile.am
--- ring-20180712.2.f3b87a6~ds1/daemon/src/config/Makefile.am	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/config/Makefile.am	2018-08-16 15:09:51.000000000 +0000
@@ -1,5 +1,4 @@
-noinst_LTLIBRARIES = libconfig.la
+include $(top_srcdir)/globals.mk
 
+noinst_LTLIBRARIES = libconfig.la
 libconfig_la_SOURCES = serializable.h yamlparser.h yamlparser.cpp
-
-libconfig_la_CXXFLAGS = -I $(top_srcdir)/src
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/dring/configurationmanager_interface.h ring-20180816.2.e26b79f~ds1/daemon/src/dring/configurationmanager_interface.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/dring/configurationmanager_interface.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/dring/configurationmanager_interface.h	2018-08-16 15:09:51.000000000 +0000
@@ -205,7 +205,7 @@
 void setPushNotificationToken(const std::string& pushDeviceToken);
 
 /**
- * To be called by clients with relevent data when a push notification is received.
+ * To be called by clients with relevant data when a push notification is received.
  */
 void pushNotificationReceived(const std::string& from, const std::map<std::string, std::string>& data);
 
@@ -313,7 +313,7 @@
                 using cb_type = void(const std::string& /*accountId*/, const std::string& /*device*/, int /*status*/);
         };
         /**
-         * These are special getters for Android and UWP, so the daemon can retreive
+         * These are special getters for Android and UWP, so the daemon can retrieve
          * information only accessible through their respective platform APIs
          */
 #if defined(__ANDROID__) || (defined(TARGET_OS_IOS) && TARGET_OS_IOS)
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/dring/datatransfer_interface.h ring-20180816.2.e26b79f~ds1/daemon/src/dring/datatransfer_interface.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/dring/datatransfer_interface.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/dring/datatransfer_interface.h	2018-08-16 15:09:51.000000000 +0000
@@ -73,7 +73,7 @@
     std::string peer; ///< Identifier of the remote peer (in the semantic of the associated account)
     std::string displayName; ///< Human oriented transfer name
     std::string path; ///< associated local file path if supported (empty, if not)
-    std::string mimetype; ///< MimeType of transfered data (https://www.iana.org/assignments/media-types/media-types.xhtml)
+    std::string mimetype; ///< MimeType of transferred data (https://www.iana.org/assignments/media-types/media-types.xhtml)
 };
 
 std::vector<DataTransferId> dataTransferList() noexcept;
@@ -93,7 +93,7 @@
 ///
 /// Other fields are not used, but you must keep the default assigned value for compatibility.
 ///
-/// \param info a DataTransferInfo structure filled with information usefull for a file transfer.
+/// \param info a DataTransferInfo structure filled with information useful for a file transfer.
 /// \param[out] id data transfer identifiant if function succeed, usable with other APIs. Undefined value in case of error.
 ///
 /// \return DataTransferError::success if file is accepted for transfer, any other value in case of errors
@@ -114,7 +114,7 @@
 /// \param id data transfer identification value as given by a DataTransferEvent signal.
 /// \param file_path file path going to be open in binary write mode to put incoming data.
 /// \param offset used to indicate the remote side about the number of bytes already received in
-/// a previous transfer session, usefull in transfer continuation mode.
+/// a previous transfer session, useful in transfer continuation mode.
 ///
 /// \return DataTransferError::invalid_argument if id is unknown.
 /// \note unknown \a id results to a no-op call.
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/dring/dring.h ring-20180816.2.e26b79f~ds1/daemon/src/dring/dring.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/dring/dring.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/dring/dring.h	2018-08-16 15:09:51.000000000 +0000
@@ -52,7 +52,7 @@
 
 /**
  * Start asynchronously daemon created by init().
- * @returns true if daemon started successfuly
+ * @returns true if daemon started successfully
  */
 bool start(const std::string& config_file={}) noexcept;
 
@@ -81,7 +81,7 @@
  * to keep compatibility over releases we don't let user directly provides
  * his callbacks as it or through a structure.
  * This way brings ABI violation if we need to change the order
- * and/or the existance of any callback type.
+ * and/or the existence of any callback type.
  * Thus the user have to pass them using following template classes
  * and functions, that wraps user-callback in a generic and ABI-compatible way.
  */
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/fileutils.cpp ring-20180816.2.e26b79f~ds1/daemon/src/fileutils.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/fileutils.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/fileutils.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -49,11 +49,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifndef RING_UWP
+#ifndef _MSC_VER
 #include <libgen.h>
 #endif
 
-#ifdef RING_UWP
+#ifdef _MSC_VER
 #include "windirent.h"
 #else
 #include <dirent.h>
@@ -177,7 +177,7 @@
 std::string
 expand_path(const std::string &path)
 {
-#if defined __ANDROID__ || defined RING_UWP || defined WIN32 || defined __APPLE__
+#if defined __ANDROID__ || defined _MSC_VER || defined WIN32 || defined __APPLE__
     RING_ERR("Path expansion not implemented, returning original");
     return path;
 #else
@@ -251,7 +251,7 @@
     struct stat s;
     if (lstat(path.c_str(), &s) == 0)
         return S_ISLNK(s.st_mode);
-#elif !defined(RING_UWP)
+#elif !defined(_MSC_VER)
     DWORD attr = GetFileAttributes(ring::to_wstring(path).c_str());
     if (attr & FILE_ATTRIBUTE_REPARSE_POINT)
         return true;
@@ -278,8 +278,10 @@
     ext_params.lpSecurityAttributes = nullptr;
     ext_params.hTemplateFile = nullptr;
     HANDLE h = CreateFile2(ring::to_wstring(path).c_str(), GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, &ext_params);
+#elif _MSC_VER
+    HANDLE h = CreateFile(path.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #else
-    HANDLE h = CreateFile(ring::to_wstring(path).c_str(), GENERIC_READ, FILE_SHARE_READ,  nullptr,  OPEN_EXISTING,  FILE_ATTRIBUTE_NORMAL, nullptr);
+    HANDLE h = CreateFile(ring::to_wstring(path).c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #endif
     if (h == INVALID_HANDLE_VALUE)
         throw std::runtime_error("Can't open: " + path);
@@ -486,7 +488,11 @@
 static char *program_dir = NULL;
 void set_program_dir(char *program_path)
 {
+#ifdef _MSC_VER
+    _splitpath(program_path, nullptr, program_dir, nullptr, nullptr);
+#else
     program_dir = dirname(program_path);
+#endif
 }
 #endif
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/fileutils.h ring-20180816.2.e26b79f~ds1/daemon/src/fileutils.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/fileutils.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/fileutils.h	2018-08-16 15:09:51.000000000 +0000
@@ -27,11 +27,11 @@
 #include <mutex>
 #include <cstdio>
 
-#ifndef RING_UWP
+#ifndef _MSC_VER
 #define PROTECTED_GETENV(str) ({char *envvar_ = getenv((str)); \
                                                    envvar_ ? envvar_ : "";})
 #else
-#define PROTECTED_GETENV(str) ({char *envvar_ = "" })
+#define PROTECTED_GETENV(str) ""
 #endif
 
 #define XDG_DATA_HOME           (PROTECTED_GETENV("XDG_DATA_HOME"))
@@ -59,7 +59,7 @@
     std::string get_cache_dir();
 
     /**
-     * Check directory existance and create it with given mode if it doesn't.
+     * Check directory existence and create it with given mode if it doesn't.
      * @param path to check, relative or absolute
      * @param dir last directory creation mode
      * @param parents default mode for all created directories except the last
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/generic_io.h ring-20180816.2.e26b79f~ds1/daemon/src/generic_io.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/generic_io.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/generic_io.h	2018-08-16 15:09:51.000000000 +0000
@@ -45,7 +45,7 @@
     using RecvCb = std::function<ssize_t(const ValueType* buf, std::size_t len)>;
 
     /// Close established connection
-    /// \note Terminate oustanding blocking read operations with an empty error code, but a 0 read size.
+    /// \note Terminate outstanding blocking read operations with an empty error code, but a 0 read size.
     virtual void shutdown() {}
 
     /// Set Rx callback
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/hooks/urlhook.cpp ring-20180816.2.e26b79f~ds1/daemon/src/hooks/urlhook.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/hooks/urlhook.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/hooks/urlhook.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -29,8 +29,8 @@
     const std::string cmd = command + (args.empty() ? "" : " ") +
                             "\"" + args + "\" &";
 
-#if __APPLE__
-  #include "TargetConditionals.h"
+#if __APPLE__
+  #include "TargetConditionals.h"
   #if defined(TARGET_IPHONE_SIMULATOR) || defined(TARGET_OS_IPHONE)
     return 0;
   #endif
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/ice_transport.h ring-20180816.2.e26b79f~ds1/daemon/src/ice_transport.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/ice_transport.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/ice_transport.h	2018-08-16 15:09:51.000000000 +0000
@@ -88,7 +88,7 @@
     bool isInitiator() const;
 
     /**
-     * Start tranport negociation between local candidates and given remote
+     * Start tranport negotiation between local candidates and given remote
      * to find the right candidate pair.
      * This function doesn't block, the callback on_negodone_cb will be called
      * with the negotiation result when operation is really done.
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/im/message_engine.cpp ring-20180816.2.e26b79f~ds1/daemon/src/im/message_engine.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/im/message_engine.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/im/message_engine.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -115,7 +115,7 @@
     }
     // avoid locking while calling callback
     for (auto& p : pending) {
-        RING_DBG("[message %" PRIx64 "] retrying sending", p.token);
+        RING_DBG() << "[message " << p.token << "] Retry sending";
         emitSignal<DRing::ConfigurationSignal::AccountMessageStatusChanged>(
             account_.getAccountID(),
             p.token,
@@ -136,14 +136,14 @@
 void
 MessageEngine::onMessageSent(MessageToken token, bool ok)
 {
-    RING_DBG("[message %" PRIx64 "] message sent: %s", token, ok ? "success" : "failure");
+    RING_DBG() << "[message " << token << "] Message sent: " << (ok ? "success" : "failure");
     std::lock_guard<std::mutex> lock(messagesMutex_);
     auto f = messages_.find(token);
     if (f != messages_.end()) {
         if (f->second.status == MessageStatus::SENDING) {
             if (ok) {
                 f->second.status = MessageStatus::SENT;
-                RING_DBG("[message %" PRIx64 "] status changed to SENT", token);
+                RING_DBG() << "[message " << token << "] Status changed to SENT";
                 emitSignal<DRing::ConfigurationSignal::AccountMessageStatusChanged>(account_.getAccountID(),
                                                                              token,
                                                                              f->second.to,
@@ -151,7 +151,7 @@
                 save_();
             } else if (f->second.retried >= MAX_RETRIES) {
                 f->second.status = MessageStatus::FAILURE;
-                RING_WARN("[message %" PRIx64 "] status changed to FAILURE", token);
+                RING_DBG() << "[message " << token << "] Status changed to FAILURE";
                 emitSignal<DRing::ConfigurationSignal::AccountMessageStatusChanged>(account_.getAccountID(),
                                                                              token,
                                                                              f->second.to,
@@ -159,16 +159,14 @@
                 save_();
             } else {
                 f->second.status = MessageStatus::IDLE;
-                RING_DBG("[message %" PRIx64 "] status changed to IDLE", token);
+                RING_DBG() << "[message " << token << "] Status changed to IDLE";
                 reschedule();
             }
+        } else {
+           RING_DBG() << "[message " << token << "] State is not SENDING";
         }
-        else {
-           RING_DBG("[message %" PRIx64 "] state is not SENDING", token);
-        }
-    }
-    else {
-        RING_DBG("[message %" PRIx64 "] can't find message", token);
+    } else {
+        RING_DBG() << "[message " << token << "] Can't find message";
     }
 }
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/logger.cpp ring-20180816.2.e26b79f~ds1/daemon/src/logger.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/logger.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/logger.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -27,7 +27,7 @@
 
 #include "client/ring_signal.h"
 
-#ifdef RING_UWP
+#ifdef _MSC_VER
 # include <sys_time.h>
 #else
 # include <sys/time.h>
@@ -98,7 +98,7 @@
 static const char*
 stripDirName(const char* path)
 {
-#ifdef RING_UWP
+#ifdef _MSC_VER
     return strrchr(path, '\\') ? strrchr(path, '\\') + 1 : path;
 #else
     return strrchr(path, '/') ? strrchr(path, '/') + 1 : path;
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/logger.h ring-20180816.2.e26b79f~ds1/daemon/src/logger.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/logger.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/logger.h	2018-08-16 15:09:51.000000000 +0000
@@ -79,7 +79,7 @@
 
 #endif /* __ANDROID__ / _WIN32 */
 
-#if defined(_WIN32) && !defined(RING_UWP)
+#if defined(_WIN32) && !defined(_MSC_VER)
 #define PRINTF_ATTRIBUTE(a, b) __attribute__((format(gnu_printf, a, b)))
 #elif defined(__GNUC__)
 #define PRINTF_ATTRIBUTE(a, b) __attribute__((format(printf, a, b)))
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/Makefile.am ring-20180816.2.e26b79f~ds1/daemon/src/Makefile.am
--- ring-20180712.2.f3b87a6~ds1/daemon/src/Makefile.am	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/Makefile.am	2018-08-16 15:09:51.000000000 +0000
@@ -49,8 +49,6 @@
 		@PJPROJECT_LIBS@ \
 		@ALSA_LIBS@ \
 		@PULSEAUDIO_LIBS@ \
-		@SAMPLERATE_LIBS@ \
-		@SNDFILE_LIBS@ \
 		@YAMLCPP_LIBS@ \
 		@JSONCPP_LIBS@ \
 		@SPEEXDSP_LIBS@ \
@@ -78,7 +76,6 @@
 		@PJPROJECT_CFLAGS@ \
 		@ALSA_CFLAGS@ \
 		@PULSEAUDIO_CFLAGS@ \
-		@SAMPLERATE_CFLAGS@ \
 		@LIBUPNP_CFLAGS@ \
 		@SPEEXDSP_CFLAGS@ \
 		@PORTAUDIO_CFLAGS@ \
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/manager.cpp ring-20180816.2.e26b79f~ds1/daemon/src/manager.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/manager.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/manager.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -301,7 +301,7 @@
 
     std::atomic_bool autoAnswer_ {false};
 
-    /** Application wide tone controler */
+    /** Application wide tone controller */
     ToneControl toneCtrl_;
 
     /** Current Call ID */
@@ -2020,7 +2020,7 @@
     const auto call_id = call.getCallId();
     RING_DBG("[call:%s] Peer answered", call_id.c_str());
 
-    // The if statement is usefull only if we sent two calls at the same time.
+    // The if statement is useful only if we sent two calls at the same time.
     if (isCurrentCall(call))
         stopTone();
 
@@ -2208,13 +2208,13 @@
         ringback();
 }
 
-AudioLoop*
+std::shared_ptr<AudioLoop>
 Manager::getTelephoneTone()
 {
     return pimpl_->toneCtrl_.getTelephoneTone();
 }
 
-AudioLoop*
+std::shared_ptr<AudioLoop>
 Manager::getTelephoneFile()
 {
     return pimpl_->toneCtrl_.getTelephoneFile();
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/manager.h ring-20180816.2.e26b79f~ds1/daemon/src/manager.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/manager.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/manager.h	2018-08-16 15:09:51.000000000 +0000
@@ -185,7 +185,7 @@
 
         /**
          * Attended transfer
-         * @param The call id to be transfered
+         * @param The call id to be transferred
          * @param The target
          */
         bool attendedTransfer(const std::string& transferID, const std::string& targetID);
@@ -233,7 +233,7 @@
         bool unHoldConference(const std::string& conference_id);
 
         /**
-         * Test if this id is a conference (usefull to test current call)
+         * Test if this id is a conference (useful to test current call)
          * @param the call id
          */
         bool isConference(const std::string& call_id) const;
@@ -680,17 +680,17 @@
          * Retrieve the current telephone tone
          * @return AudioLoop*   The audio tone or 0 if no tone (init before calling this function)
          */
-        AudioLoop* getTelephoneTone();
+        std::shared_ptr<AudioLoop> getTelephoneTone();
 
         /**
          * Retrieve the current telephone file
          * @return AudioLoop* The audio file or 0 if the wav is stopped
          */
-        AudioLoop* getTelephoneFile();
+        std::shared_ptr<AudioLoop> getTelephoneFile();
 
         /**
          * @return true is there is one or many incoming call waiting
-         * new call, not anwsered or refused
+         * new call, not answered or refused
          */
         bool incomingCallsWaiting();
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/alsa/alsalayer.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/alsa/alsalayer.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/alsa/alsalayer.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/alsa/alsalayer.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -756,7 +756,7 @@
     if (!ringtoneHandle_)
         return;
 
-    AudioLoop *file_tone = Manager::instance().getTelephoneFile();
+    auto file_tone = Manager::instance().getTelephoneFile();
     int ringtoneAvailFrames = 0;
 
     if (not safeUpdate(ringtoneHandle_, ringtoneAvailFrames))
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiobuffer.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiobuffer.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiobuffer.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiobuffer.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -18,6 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
 
+#include "libav_deps.h"
 #include "audiobuffer.h"
 #include "logger.h"
 #include <string.h>
@@ -289,4 +290,68 @@
     return sample_num;
 }
 
+AVFrame*
+AudioBuffer::toAVFrame() const
+{
+    const constexpr AVSampleFormat fmt = AV_SAMPLE_FMT_S16;
+
+    // NOTE: don't use std::vector, avcodec_fill_audio_frame makes the frame point to our array
+    // instead of copying it, resulting in a heap use after free once we return
+    AudioSample** samples;
+    int err = av_samples_alloc_array_and_samples(reinterpret_cast<uint8_t***>(&samples),
+        nullptr, channels(), frames(), fmt, 0);
+    if (err < 0) {
+        RING_ERR() << "Failed to allocate audio buffer";
+        return nullptr;
+    }
+
+    interleave(*samples);
+
+    AVFrame* frame = av_frame_alloc();
+    if (!frame) {
+        RING_ERR() << "Failed to allocate frame";
+        av_freep(samples);
+        return nullptr;
+    }
+
+    frame->nb_samples = frames();
+    frame->format = fmt;
+    frame->channel_layout = av_get_default_channel_layout(channels());
+    frame->channels = channels();
+    frame->sample_rate = getSampleRate();
+
+    const auto bufSize = av_samples_get_buffer_size(nullptr,
+        frame->channels, frame->nb_samples, fmt, 0);
+    if (avcodec_fill_audio_frame(frame, frame->channels, fmt,
+        reinterpret_cast<uint8_t*>(*samples), bufSize, 0) < 0) {
+        RING_ERR() << "Failed to fill audio frame";
+        av_frame_free(&frame);
+        return nullptr;
+    }
+
+    return frame;
+}
+
+int
+AudioBuffer::append(AVFrame* frame)
+{
+    // FIXME we assume frame is s16 interleaved
+    if (channels() != static_cast<unsigned>(frame->channels)
+        || getSampleRate() != frame->sample_rate) {
+        auto newFormat = AudioFormat{(unsigned)frame->sample_rate, (unsigned)frame->channels};
+        setFormat(newFormat);
+    }
+
+    AudioBuffer toAppend(frame->nb_samples,
+        {(unsigned)frame->sample_rate, (unsigned)frame->channels});
+    toAppend.deinterleave(reinterpret_cast<const AudioSample*>(frame->extended_data[0]),
+        frame->nb_samples, frame->channels);
+
+    for (size_t c = 0; c < samples_.size(); ++c) {
+        samples_[c].insert(samples_[c].end(), toAppend.samples_[c].begin(), toAppend.samples_[c].end());
+    }
+
+    return 0;
+}
+
 } // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiobuffer.h ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiobuffer.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiobuffer.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiobuffer.h	2018-08-16 15:09:51.000000000 +0000
@@ -30,10 +30,16 @@
 #include <string>
 #include <cstddef> // for size_t
 
+extern "C" {
+#include <libavutil/samplefmt.h>
+}
+
 #include "ring_types.h"
 
 #include <ciso646> // fix windows compiler bug
 
+struct AVFrame;
+
 namespace ring {
 
 /**
@@ -42,11 +48,18 @@
 struct AudioFormat {
     unsigned sample_rate;
     unsigned nb_channels;
+    AVSampleFormat sampleFormat;
 
-    constexpr AudioFormat(unsigned sr, unsigned c) : sample_rate(sr), nb_channels(c) {}
+    constexpr AudioFormat(unsigned sr, unsigned c)
+        : sample_rate(sr)
+        , nb_channels(c)
+        , sampleFormat(AV_SAMPLE_FMT_S16)
+    {}
 
     inline bool operator == (const AudioFormat &b) const {
-        return ( (b.sample_rate == sample_rate) && (b.nb_channels == nb_channels) );
+        return ( (b.sample_rate == sample_rate) &&
+                 (b.nb_channels == nb_channels) &&
+                 (b.sampleFormat == sampleFormat) );
     }
 
     inline bool operator != (const AudioFormat &b) const {
@@ -55,7 +68,8 @@
 
     inline std::string toString() const {
         std::stringstream ss;
-        ss << "{" << nb_channels << " channels, " << sample_rate << "Hz}";
+        ss << "{" << av_get_sample_fmt_name(sampleFormat) << ", "
+            << nb_channels << " channels, " << sample_rate << "Hz}";
         return ss.str();
     }
 
@@ -245,7 +259,7 @@
          * Convert fixed-point channel to float and write in the out buffer (Float 32-bits).
          * The out buffer must be at least of size capacity()*sizeof(float) bytes.
          *
-         * @returns Number of samples writen.
+         * @returns Number of samples written.
          */
         size_t channelToFloat(float* out, const int& channel) const;
 
@@ -253,7 +267,7 @@
          * Write interleaved multichannel data to the out buffer (fixed-point 16-bits).
          * The out buffer must be at least of size capacity()*sizeof(AudioSample) bytes.
          *
-         * @returns Number of samples writen.
+         * @returns Number of samples written.
          */
         size_t interleave(AudioSample* out) const;
 
@@ -261,7 +275,7 @@
          * Write null data (silence) to the out buffer (fixed-point 16-bits).
          * The out buffer must be at least of size capacity()*sizeof(AudioSample) bytes.
          *
-         * @returns Number of samples writen.
+         * @returns Number of samples written.
          */
         size_t fillWithZero(AudioSample* out) const;
 
@@ -269,7 +283,7 @@
          * Write interleaved multichannel data to the out buffer (fixed-point 16-bits).
          * The out buffer is resized to hold the full content of this buffer.
          *
-         * @returns Number of samples writen.
+         * @returns Number of samples written.
          */
         size_t interleave(std::vector<AudioSample>& out) const;
 
@@ -282,7 +296,7 @@
          * Write interleaved multichannel data to the out buffer, while samples are converted to float.
          * The out buffer must be at least of size capacity()*sizeof(float) bytes.
          *
-         * @returns Number of samples writen.
+         * @returns Number of samples written.
          */
         size_t interleaveFloat(float* out) const;
 
@@ -343,6 +357,10 @@
          */
         size_t copy(AudioSample* in, size_t sample_num, size_t pos_out = 0);
 
+        AVFrame* toAVFrame() const;
+
+        int append(AVFrame* frame);
+
     private:
         int sampleRate_;
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiolayer.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiolayer.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiolayer.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiolayer.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -41,8 +41,8 @@
     , audioFormat_(Manager::instance().getRingBufferPool().getInternalAudioFormat())
     , audioInputFormat_(Manager::instance().getRingBufferPool().getInternalAudioFormat())
     , urgentRingBuffer_("urgentRingBuffer_id", SIZEBUF, audioFormat_)
-    , resampler_(new Resampler{audioFormat_.sample_rate})
-    , inputResampler_(new Resampler{audioInputFormat_.sample_rate})
+    , resampler_(new Resampler)
+    , inputResampler_(new Resampler)
     , lastNotificationTime_()
 {
     urgentRingBuffer_.createReadOffset(RingBufferPool::DEFAULT_ID);
@@ -57,13 +57,11 @@
     RING_DBG("Hardware audio format available : %s", playback.toString().c_str());
     audioFormat_ = Manager::instance().hardwareAudioFormatChanged(playback);
     urgentRingBuffer_.setFormat(audioFormat_);
-    resampler_->setFormat(audioFormat_);
 }
 
 void AudioLayer::hardwareInputFormatAvailable(AudioFormat capture)
 {
     RING_DBG("Hardware input audio format available : %s", capture.toString().c_str());
-    inputResampler_->setFormat(capture);
 }
 
 void AudioLayer::devicesChanged()
@@ -122,7 +120,7 @@
 const AudioBuffer& AudioLayer::getToRing(AudioFormat format, size_t writableSamples)
 {
     ringtoneBuffer_.resize(0);
-    AudioLoop *fileToPlay = Manager::instance().getTelephoneFile();
+    auto fileToPlay = Manager::instance().getTelephoneFile();
     if (fileToPlay) {
         auto fileformat = fileToPlay->getFormat();
         bool resample = format.sample_rate != fileformat.sample_rate;
@@ -167,9 +165,7 @@
         return playbackBuffer_;
     }
 
-    // FIXME: not thread safe! we only lock the mutex when we get the
-    // pointer, we have no guarantee that it will stay safe to use
-    if (AudioLoop* toneToPlay = Manager::instance().getTelephoneTone()) {
+    if (auto toneToPlay = Manager::instance().getTelephoneTone()) {
         playbackBuffer_.setFormat(format);
         playbackBuffer_.resize(writableSamples);
         toneToPlay->getNext(playbackBuffer_, playbackGain_); // retrive only n_channels
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiorecord.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiorecord.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiorecord.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiorecord.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,241 +0,0 @@
-/*
- *  Copyright (C) 2004-2018 Savoir-faire Linux Inc.
- *
- *  Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
- *  Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "audiorecord.h"
-#include "logger.h"
-#include "fileutils.h"
-#include "manager.h"
-
-#ifndef RING_UWP
-#include <sndfile.hh>
-#endif
-
-#include <algorithm>
-#include <sstream> // for stringstream
-#include <cstdio>
-#include <unistd.h>
-
-namespace ring {
-
-static std::string
-createFilename()
-{
-    time_t rawtime = time(NULL);
-    struct tm * timeinfo = localtime(&rawtime);
-
-    std::stringstream out;
-
-    // DATE
-    out << timeinfo->tm_year + 1900;
-
-    if (timeinfo->tm_mon < 9) // january is 01, not 1
-        out << 0;
-
-    out << timeinfo->tm_mon + 1;
-
-    if (timeinfo->tm_mday < 10) // 01 02 03, not 1 2 3
-        out << 0;
-
-    out << timeinfo->tm_mday;
-
-    out << '-';
-
-    // hour
-    if (timeinfo->tm_hour < 10) // 01 02 03, not 1 2 3
-        out << 0;
-
-    out << timeinfo->tm_hour;
-
-    if (timeinfo->tm_min < 10) // 01 02 03, not 1 2 3
-        out << 0;
-
-    out << timeinfo->tm_min;
-
-    if (timeinfo->tm_sec < 10) // 01 02 03,  not 1 2 3
-        out << 0;
-
-    out << timeinfo->tm_sec;
-    return out.str();
-}
-
-AudioRecord::AudioRecord()
-    : sndFormat_(AudioFormat::MONO())
-    , filename_(createFilename())
-    , savePath_()
-    , recorder_(this, Manager::instance().getRingBufferPool())
-{
-    RING_DBG("Generate filename for this call %s ", filename_.c_str());
-}
-
-AudioRecord::~AudioRecord()
-{
-    closeFile();
-}
-
-void AudioRecord::setSndFormat(AudioFormat format)
-{
-    sndFormat_ = format;
-}
-
-void AudioRecord::setRecordingOptions(AudioFormat format, const std::string &path)
-{
-    std::string filePath;
-
-    // use HOME directory if path is empty, or if path does not exist
-    if (path.empty() or not fileutils::check_dir(path.c_str())) {
-        filePath = fileutils::get_home_dir();
-    } else {
-        filePath = path;
-    }
-
-    sndFormat_ = format;
-    savePath_ = (*filePath.rbegin() == DIR_SEPARATOR_CH) ? filePath : filePath + DIR_SEPARATOR_STR;
-}
-
-static bool
-nonFilenameCharacter(char c)
-{
-    return not(std::isalnum(c) or c == '_' or c == '.');
-}
-
-// Replace any character that is inappropriate for a filename with '_'
-static std::string
-sanitize(std::string s)
-{
-    std::replace_if(s.begin(), s.end(), nonFilenameCharacter, '_');
-    return s;
-}
-
-void AudioRecord::initFilename(const std::string &peerNumber)
-{
-    RING_DBG("Initialize audio record for peer  : %s", peerNumber.c_str());
-    // if savePath_ don't contains filename
-    if (savePath_.find(".wav") == std::string::npos) {
-        filename_ = createFilename();
-        filename_.append("-" + sanitize(peerNumber) + "-" PACKAGE);
-        filename_.append(".wav");
-    } else {
-        filename_ = "";
-    }
-}
-
-std::string AudioRecord::getPath() const
-{
-    return savePath_ + filename_;
-}
-
-bool
-AudioRecord::openFile()
-{
-#ifndef RING_UWP
-    fileHandle_.reset(); // do it before calling fileExists()
-
-    const bool doAppend = fileExists();
-    const int access = doAppend ? SFM_RDWR : SFM_WRITE;
-
-    RING_DBG("Opening file %s with format %s", getPath().c_str(), sndFormat_.toString().c_str());
-    fileHandle_.reset(new SndfileHandle (getPath().c_str(),
-                                         access,
-                                         SF_FORMAT_WAV | SF_FORMAT_PCM_16,
-                                         sndFormat_.nb_channels,
-                                         sndFormat_.sample_rate));
-
-    // check overloaded boolean operator
-    if (!*fileHandle_) {
-        RING_WARN("Could not open WAV file!");
-        fileHandle_.reset();
-        return false;
-    }
-
-    if (doAppend and fileHandle_->seek(0, SEEK_END) < 0)
-        RING_WARN("Couldn't seek to the end of the file ");
-
-    return true;
-#else
-    return false;
-#endif
-}
-
-void
-AudioRecord::closeFile()
-{
-    stopRecording(); // needed as recData accesses to fileHandle_
-    fileHandle_.reset();
-}
-
-bool
-AudioRecord::isOpenFile() const noexcept
-{
-    return static_cast<bool>(fileHandle_);
-}
-
-bool AudioRecord::fileExists() const
-{
-    return access(getPath().c_str(), F_OK) != -1;
-}
-
-bool AudioRecord::isRecording() const
-{
-    return recordingEnabled_;
-}
-
-bool
-AudioRecord::toggleRecording()
-{
-    if (isOpenFile())
-        recordingEnabled_ = !recordingEnabled_;
-    else if (openFile()) {
-        recordingEnabled_ = true;
-        recorder_.start();
-    }
-
-    return recordingEnabled_;
-}
-
-void
-AudioRecord::stopRecording() const noexcept
-{
-    RING_DBG("Stop recording %s", getPath().c_str());
-    recordingEnabled_ = false;
-}
-
-void
-AudioRecord::recData(AudioBuffer& buffer)
-{
-#ifndef RING_UWP
-    if (not recordingEnabled_)
-        return;
-
-    auto interleaved = buffer.interleave();
-    const int nSamples = interleaved.size();
-    if (fileHandle_->write(interleaved.data(), nSamples) != nSamples) {
-        RING_WARN("Could not record data!");
-    } else {
-        fileHandle_->writeSync();
-    }
-#endif
-}
-
-} // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiorecorder.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiorecorder.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiorecorder.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiorecorder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-/*
- *  Copyright (C) 2004-2018 Savoir-faire Linux Inc.
- *
- *  Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
- *  Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- */
-
-#include "audiorecorder.h"
-
-#include "audiorecord.h"
-#include "ringbufferpool.h"
-#include "audiobuffer.h"
-
-#include <chrono>
-#include <thread>
-#include <sstream>
-#include <algorithm> // std::min
-
-namespace ring {
-
-static constexpr std::size_t BUFFER_LENGTH {10000};
-static constexpr auto SLEEP_TIME = std::chrono::milliseconds(20);
-
-AudioRecorder::AudioRecorder(AudioRecord* arec, RingBufferPool& rbp)
-    : ringBufferPool_(rbp)
-    , buffer_(new AudioBuffer(BUFFER_LENGTH, AudioFormat::NONE()))
-    , arecord_(arec)
-    , thread_(
-        [] { return true; },
-        [this] { process(); },
-        [] {})
-{
-    std::string id("processd_");
-
-    // convert count into string
-    std::string s;
-    std::ostringstream out;
-    out << nextProcessID();
-    s = out.str();
-
-    recorderId_ = id.append(s);
-}
-
-AudioRecorder::~AudioRecorder()
-{
-    thread_.join();
-}
-
-unsigned
-AudioRecorder::nextProcessID() noexcept
-{
-    static unsigned id = 0;
-    return ++id;
-}
-
-void
-AudioRecorder::start()
-{
-    if (thread_.isRunning())
-        return;
-    buffer_->setFormat(ringBufferPool_.getInternalAudioFormat());
-    thread_.start();
-}
-
-void
-AudioRecorder::process()
-{
-    auto availableSamples = ringBufferPool_.availableForGet(recorderId_);
-    buffer_->resize(std::min(availableSamples, BUFFER_LENGTH));
-    ringBufferPool_.getData(*buffer_, recorderId_);
-
-    if (availableSamples > 0)
-        arecord_->recData(*buffer_);
-
-    std::this_thread::sleep_for(SLEEP_TIME);
-}
-
-} // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiorecorder.h ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiorecorder.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiorecorder.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiorecorder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- *  Copyright (C) 2004-2018 Savoir-faire Linux Inc.
- *
- *  Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
- *  Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- */
-
-#pragma once
-
-#include "threadloop.h"
-#include "noncopyable.h"
-
-#include <string>
-#include <memory>
-
-namespace ring {
-
-class RingBufferPool;
-class AudioRecord;
-class AudioBuffer;
-
-class AudioRecorder {
-public:
-    AudioRecorder(AudioRecord* arec, RingBufferPool& rbp);
-    ~AudioRecorder();
-
-    std::string getRecorderID() const {
-        return recorderId_;
-    }
-
-    /**
-     * Call to start recording.
-     */
-    void start();
-
-private:
-    NON_COPYABLE(AudioRecorder);
-    static unsigned nextProcessID() noexcept;
-    void process();
-
-    std::string recorderId_;
-    RingBufferPool& ringBufferPool_;
-    std::unique_ptr<AudioBuffer> buffer_;
-    AudioRecord* arecord_;
-    ThreadLoop thread_;
-};
-
-} // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiorecord.h ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiorecord.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audiorecord.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audiorecord.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-/*
- *  Copyright (C) 2004-2018 Savoir-faire Linux Inc.
- *
- *  Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
- *  Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- */
-
-#pragma once
-
-#include "audiobuffer.h"
-#include "audiorecorder.h"
-#include "noncopyable.h"
-
-#include <atomic>
-#include <memory>
-#include <string>
-#include <cstdlib>
-
-class SndfileHandle;
-
-namespace ring {
-
-class AudioRecord {
-    public:
-        AudioRecord();
-        ~AudioRecord();
-
-        void setSndFormat(AudioFormat format);
-        void setRecordingOptions(AudioFormat format, const std::string &path);
-
-        /**
-         * Init recording file path
-         */
-        void initFilename(const std::string &peerNumber);
-
-        /**
-         * Return the file path of the recording
-         */
-        std::string getPath() const;
-
-        /**
-         * Check if no other file is opened, then create a new one
-         * @param filename A string containing teh file (with/without extension)
-         * @param type     The sound file format (FILE_RAW, FILE_WAVE)
-         * @param format   Internal sound format (INT16 / INT32)
-         * @return bool    True if file was opened
-         */
-        bool openFile();
-
-        /**
-         * Close the opened recording file. If wave: cout the number of byte
-         */
-        void closeFile();
-
-        /**
-         * Check if a file is already opened
-         */
-        bool isOpenFile() const noexcept;
-
-        /**
-         * Check if a file already exists
-         */
-        bool fileExists() const;
-
-        /**
-         * Check recording state
-         */
-        bool isRecording() const;
-
-        /**
-         * Toggle recording state
-         */
-        bool toggleRecording();
-
-        /**
-         * Stop recording flag
-         */
-        void stopRecording() const noexcept;
-
-        /**
-         * Record a chunk of data in an openend file
-         * @param buffer  The data chunk to be recorded
-         * @param nSamples Number of samples (number of bytes) to be recorded
-         */
-        void recData(AudioBuffer& buffer);
-
-        std::string getRecorderID() const {
-            return recorder_.getRecorderID();
-        }
-
-    private:
-        NON_COPYABLE(AudioRecord);
-
-        /**
-         * Open an existing raw file, used when the call is set on hold
-         */
-        bool openExistingRawFile();
-
-        /**
-         * Open an existing wav file, used when the call is set on hold
-         */
-        bool openExistingWavFile();
-
-        /**
-         * Compute the number of byte recorded and close the file
-         */
-        void closeWavFile();
-
-        /**
-         * Pointer to the recorded file
-         */
-        std::shared_ptr<SndfileHandle> fileHandle_;
-
-        /**
-         * Number of channels
-         */
-        AudioFormat sndFormat_;
-
-        /**
-         * Recording flage
-         */
-        mutable std::atomic<bool> recordingEnabled_ {false};
-
-        /**
-         * Filename for this recording
-         */
-        std::string filename_;
-
-        /**
-         * Path for this recording
-         */
-        std::string savePath_;
-
-        /**
-         * Audio recording thread
-         */
-        AudioRecorder recorder_;
-};
-
-} // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audio_rtp_session.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audio_rtp_session.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/audio_rtp_session.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/audio_rtp_session.cpp	2018-08-16 15:09:56.000000000 +0000
@@ -31,6 +31,7 @@
 #endif //RING_VIDEO
 
 #include "socket_pair.h"
+#include "media_recorder.h"
 #include "media_encoder.h"
 #include "media_decoder.h"
 #include "media_io_handle.h"
@@ -73,14 +74,17 @@
         std::unique_ptr<MediaIOHandle> muxContext_;
         std::unique_ptr<Resampler> resampler_;
 
+        std::weak_ptr<MediaRecorder> recorder_;
+        bool recordingStarted_ = false;
+        uint64_t sent_samples = 0;
+
         AudioBuffer micData_;
         AudioBuffer resampledData_;
         const uint16_t seqVal_;
         bool muteState_ = false;
         uint16_t mtu_;
 
-        using seconds = std::chrono::duration<double, std::ratio<1>>;
-        const seconds secondsPerPacket_ {0.02}; // 20 ms
+        const std::chrono::milliseconds msPerPacket_ {20};
 
         ThreadLoop loop_;
         void process();
@@ -109,6 +113,8 @@
 
 AudioSender::~AudioSender()
 {
+    if (auto rec = recorder_.lock())
+        rec->stopRecording();
     loop_.join();
 }
 
@@ -147,6 +153,16 @@
     resampledData_.clear();
 }
 
+// seq: frame number for video, sent samples audio
+// sampleFreq: fps for video, sample rate for audio
+// clock: stream time base (packetization interval times)
+// FIXME duplicate code from media_encoder
+static int64_t
+getNextTimestamp(int64_t seq, rational<int64_t> sampleFreq, rational<int64_t> clock)
+{
+    return (seq / (sampleFreq * clock)).real<int64_t>();
+}
+
 void
 AudioSender::process()
 {
@@ -154,11 +170,10 @@
     auto mainBuffFormat = mainBuffer.getInternalAudioFormat();
 
     // compute nb of byte to get corresponding to 1 audio frame
-    const std::size_t samplesToGet = std::chrono::duration_cast<std::chrono::seconds>(mainBuffFormat.sample_rate * secondsPerPacket_).count();
+    const std::size_t samplesToGet = std::chrono::duration_cast<std::chrono::seconds>(msPerPacket_ * mainBuffFormat.sample_rate).count();
 
-    if (mainBuffer.availableForGet(id_) < samplesToGet) {
-        const auto wait_time = std::chrono::duration_cast<std::chrono::milliseconds>(secondsPerPacket_);
-        if (not mainBuffer.waitForDataAvailable(id_, samplesToGet, wait_time))
+    if (mainBuffer.availableForGet(id_) < samplesToGet
+        && not mainBuffer.waitForDataAvailable(id_, samplesToGet, msPerPacket_)) {
             return;
     }
 
@@ -173,21 +188,46 @@
     auto accountAudioCodec = std::static_pointer_cast<AccountAudioCodecInfo>(args_.codec);
     micData_.setChannelNum(accountAudioCodec->audioformat.nb_channels, true);
 
+    Smartools::getInstance().setLocalAudioCodec(audioEncoder_->getEncoderName());
+
+    AudioBuffer buffer;
     if (mainBuffFormat.sample_rate != accountAudioCodec->audioformat.sample_rate) {
         if (not resampler_) {
             RING_DBG("Creating audio resampler");
-            resampler_.reset(new Resampler(accountAudioCodec->audioformat));
+            resampler_.reset(new Resampler);
         }
         resampledData_.setFormat(accountAudioCodec->audioformat);
         resampledData_.resize(samplesToGet);
         resampler_->resample(micData_, resampledData_);
-        Smartools::getInstance().setLocalAudioCodec(audioEncoder_->getEncoderName());
-        if (audioEncoder_->encode_audio(resampledData_) < 0)
-            RING_ERR("encoding failed");
+        buffer = resampledData_;
     } else {
-        if (audioEncoder_->encode_audio(micData_) < 0)
-            RING_ERR("encoding failed");
+        buffer = micData_;
     }
+
+    if (muteState_) // audio is muted, set samples to 0
+        buffer.reset();
+
+    AVFrame* frame = buffer.toAVFrame();
+    auto ms = MediaStream("audio", buffer.getFormat());
+    frame->pts = getNextTimestamp(sent_samples, ms.sampleRate, static_cast<rational<int64_t>>(ms.timeBase));
+    sent_samples += frame->nb_samples;
+
+    {
+        auto rec = recorder_.lock();
+        if (rec && !recordingStarted_ && rec->addStream(false, false, ms) >= 0) {
+                recordingStarted_ = true;
+        }
+
+        if (rec && recordingStarted_) {
+            rec->recordData(frame, false, false);
+        } else {
+            recordingStarted_ = false;
+            recorder_ = std::weak_ptr<MediaRecorder>();
+        }
+    }
+
+    if (audioEncoder_->encodeAudio(frame) < 0)
+        RING_ERR("encoding failed");
 }
 void
 AudioSender::setMuted(bool isMuted)
@@ -205,8 +245,11 @@
 void
 AudioSender::initRecorder(std::shared_ptr<MediaRecorder>& rec)
 {
-    if (audioEncoder_)
-        audioEncoder_->initRecorder(rec);
+    recordingStarted_ = false;
+    recorder_ = rec;
+    if (auto r = recorder_.lock()) {
+        r->incrementStreams(1);
+    }
 }
 
 class AudioReceiveThread
@@ -287,19 +330,29 @@
 {
     audioDecoder_.reset(new MediaDecoder());
     audioDecoder_->setInterruptCallback(interruptCb, this);
+
     // custom_io so the SDP demuxer will not open any UDP connections
     args_.input = SDP_FILENAME;
     args_.format = "sdp";
     args_.sdp_flags = "custom_io";
-    EXIT_IF_FAIL(not stream_.str().empty(), "No SDP loaded");
+
+    if (stream_.str().empty()) {
+        RING_ERR("No SDP loaded");
+        return false;
+    }
+
     audioDecoder_->setIOContext(sdpContext_.get());
-    EXIT_IF_FAIL(not audioDecoder_->openInput(args_),
-        "Could not open input \"%s\"", SDP_FILENAME);
+    if (audioDecoder_->openInput(args_)) {
+        RING_ERR("Could not open input \"%s\"", SDP_FILENAME);
+        return false;
+    }
+
     // Now replace our custom AVIOContext with one that will read packets
     audioDecoder_->setIOContext(demuxContext_.get());
-
-    EXIT_IF_FAIL(not audioDecoder_->setupFromAudioData(format_),
-                 "decoder IO startup failed");
+    if (audioDecoder_->setupFromAudioData()) {
+        RING_ERR("decoder IO startup failed");
+        return false;
+    }
 
     ringbuffer_ = Manager::instance().getRingBufferPool().getRingBuffer(id_);
     return true;
@@ -314,19 +367,18 @@
     switch (audioDecoder_->decode(decodedFrame)) {
 
         case MediaDecoder::Status::FrameFinished:
-            if (auto rec = recorder_.lock()) {
-                if (!recordingStarted_) {
-                    if (rec->addStream(false, true, audioDecoder_->getStream()) >= 0) {
+            {
+                auto rec = recorder_.lock();
+                if (rec && !recordingStarted_ && rec->addStream(false, true, audioDecoder_->getStream()) >= 0) {
                         recordingStarted_ = true;
-                    } else {
-                        recorder_ = std::weak_ptr<MediaRecorder>();
-                    }
                 }
-                if (recordingStarted_)
+
+                if (rec && recordingStarted_) {
                     rec->recordData(decodedFrame.pointer(), false, true);
-            } else {
-                recordingStarted_ = false;
-                recorder_ = std::weak_ptr<MediaRecorder>();
+                } else {
+                    recordingStarted_ = false;
+                    recorder_ = std::weak_ptr<MediaRecorder>();
+                }
             }
             audioDecoder_->writeToRingBuffer(decodedFrame, *ringbuffer_,
                                              mainBuffFormat);
@@ -339,12 +391,9 @@
             if (not setup()) {
                 RING_ERR("fatal error, rx thread re-setup failed");
                 loop_.stop();
-                break;
-            }
-            if (not audioDecoder_->setupFromAudioData(format_)) {
+            } else if (not audioDecoder_->setupFromAudioData()) {
                 RING_ERR("fatal error, a-decoder setup failed");
                 loop_.stop();
-                break;
             }
             break;
 
@@ -374,10 +423,7 @@
     is.read(reinterpret_cast<char*>(buf), buf_size);
 
     auto count = is.gcount();
-    if (count != 0)
-        return count;
-    else
-        return AVERROR_EOF;
+    return count ? count : AVERROR_EOF;
 }
 
 // This callback is used by libav internally to break out of blocking calls
@@ -435,7 +481,6 @@
     if (sender_)
         RING_WARN("Restarting audio sender");
 
-
     // be sure to not send any packets before saving last RTP seq value
     socketPair_->stopSendOp();
     if (sender_)
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/jack/jacklayer.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/jack/jacklayer.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/jack/jacklayer.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/jack/jacklayer.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -103,8 +103,8 @@
 void JackLayer::fillWithToneOrRingtone(AudioBuffer &buffer)
 {
     buffer.resize(hardwareBufferSize_);
-    AudioLoop *tone = Manager::instance().getTelephoneTone();
-    AudioLoop *file_tone = Manager::instance().getTelephoneFile();
+    auto tone = Manager::instance().getTelephoneTone();
+    auto file_tone = Manager::instance().getTelephoneFile();
 
     // In case of a dtmf, the pointers will be set to nullptr once the dtmf length is
     // reached. For this reason we need to fill audio buffer with zeros if pointer is nullptr
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/Makefile.am ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/Makefile.am
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/Makefile.am	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/Makefile.am	2018-08-16 15:09:51.000000000 +0000
@@ -42,8 +42,6 @@
 		audioloop.cpp \
 		ringbuffer.cpp \
 		ringbufferpool.cpp \
-		audiorecord.cpp \
-		audiorecorder.cpp \
 		audiolayer.cpp \
 		resampler.cpp \
 		$(RING_SPEEXDSP_SRC) \
@@ -64,8 +62,6 @@
 		audioloop.h \
 		ringbuffer.h \
 		ringbufferpool.h \
-		audiorecord.h \
-		audiorecorder.h \
 		audiolayer.h \
 		$(RING_SPEEXDSP_HEAD) \
 		dcblocker.h \
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/opensl/audio_player.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/opensl/audio_player.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/opensl/audio_player.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/opensl/audio_player.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -27,7 +27,7 @@
 
 /*
  * Called by OpenSL SimpleBufferQueue for every audio buffer played
- * directly pass thru to our handler.
+ * directly pass through to our handler.
  * The regularity of this callback from openSL/Android System affects
  * playback continuity. If it does not callback in the regular time
  * slot, you are under big pressure for audio processing[here we do
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/portaudio/portaudiolayer.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/portaudio/portaudiolayer.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/portaudio/portaudiolayer.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/portaudio/portaudiolayer.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -387,12 +387,12 @@
         terminate();
     }
 
-#ifdef RING_UWP
-    indexRing_ = indexOut_ = Pa_GetDefaultOutputDevice();
-    indexIn_ = Pa_GetDefaultInputDevice();
-#else
-    indexRing_ = indexOut_ = indexOut_ == paNoDevice ? Pa_GetDefaultOutputDevice() : indexOut_;
-    indexIn_ = indexIn_ == paNoDevice ? Pa_GetDefaultInputDevice() : indexIn_;
+#ifdef RING_UWP
+    indexRing_ = indexOut_ = Pa_GetDefaultOutputDevice();
+    indexIn_ = Pa_GetDefaultInputDevice();
+#else
+    indexRing_ = indexOut_ = indexOut_ == paNoDevice ? Pa_GetDefaultOutputDevice() : indexOut_;
+    indexIn_ = indexIn_ == paNoDevice ? Pa_GetDefaultInputDevice() : indexIn_;
 #endif
 
     if (indexOut_ != paNoDevice) {
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/resampler.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/resampler.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/resampler.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/resampler.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -19,109 +19,81 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
 
-#include "resampler.h"
+#include "libav_deps.h"
 #include "logger.h"
+#include "media_buffer.h"
+#include "media_filter.h"
+#include "media_stream.h"
+#include "resampler.h"
 #include "ring_types.h"
 
-#include <samplerate.h>
+extern "C" {
+#include <libswresample/swresample.h>
+}
 
 namespace ring {
 
-class SrcState {
-    public:
-        SrcState(int nb_channels, bool high_quality = false)
-        {
-            int err;
-            state_ = src_new(high_quality ? SRC_SINC_BEST_QUALITY : SRC_LINEAR, nb_channels, &err);
-        }
-
-        ~SrcState()
-        {
-            src_delete(state_);
-        }
-
-        void process(SRC_DATA *src_data)
-        {
-            src_process(state_, src_data);
-        }
-
-    private:
-        SRC_STATE *state_ {nullptr};
-};
+Resampler::Resampler()
+    : swrCtx_(swr_alloc())
+{}
 
-Resampler::Resampler(AudioFormat format, bool quality) : floatBufferIn_(),
-    floatBufferOut_(), scratchBuffer_(), samples_(0), format_(format), high_quality_(quality), src_state_()
+Resampler::~Resampler()
 {
-    setFormat(format, quality);
+    swr_free(&swrCtx_);
 }
 
-Resampler::Resampler(unsigned sample_rate, unsigned channels, bool quality) : floatBufferIn_(),
-    floatBufferOut_(), scratchBuffer_(), samples_(0), format_(sample_rate, channels), high_quality_(quality), src_state_()
+void
+Resampler::reinit(const AudioFormat& in, const int inSampleFmt,
+                  const AudioFormat& out, const int outSampleFmt)
 {
-    setFormat(format_, quality);
-}
+    av_opt_set_int(swrCtx_, "ich", 0, 0);
+    av_opt_set_int(swrCtx_, "icl", av_get_default_channel_layout(in.nb_channels), 0);
+    av_opt_set_int(swrCtx_, "isr", in.sample_rate, 0);
+    av_opt_set_sample_fmt(swrCtx_, "isf", static_cast<AVSampleFormat>(inSampleFmt), 0);
+
+    av_opt_set_int(swrCtx_, "och", 0, 0);
+    av_opt_set_int(swrCtx_, "ocl", av_get_default_channel_layout(out.nb_channels), 0);
+    av_opt_set_int(swrCtx_, "osr", out.sample_rate, 0);
+    av_opt_set_sample_fmt(swrCtx_, "osf", static_cast<AVSampleFormat>(outSampleFmt), 0);
 
-Resampler::~Resampler() = default;
+    swr_init(swrCtx_);
+}
 
-void
-Resampler::setFormat(AudioFormat format, bool quality)
+int
+Resampler::resample(const AVFrame* input, AVFrame* output)
 {
-    format_ = format;
-    samples_ = (format.nb_channels * format.sample_rate * 20) / 1000; // start with 20 ms buffers
-    floatBufferIn_.resize(samples_);
-    floatBufferOut_.resize(samples_);
-    scratchBuffer_.resize(samples_);
+    int ret = swr_convert_frame(swrCtx_, output, input);
+    if (ret & AVERROR_INPUT_CHANGED || ret & AVERROR_OUTPUT_CHANGED) {
+        reinit(AudioFormat{(unsigned)input->sample_rate, (unsigned)input->channels}, input->format,
+               AudioFormat{(unsigned)output->sample_rate, (unsigned)output->channels}, output->format);
+        return resample(input, output);
+    } else if (ret < 0) {
+        RING_ERR() << "Failed to resample frame";
+        return -1;
+    }
 
-    src_state_.reset(new SrcState(format.nb_channels, quality));
+    return 0;
 }
 
-void Resampler::resample(const AudioBuffer &dataIn, AudioBuffer &dataOut)
+void
+Resampler::resample(const AudioBuffer& dataIn, AudioBuffer& dataOut)
 {
-    const double inputFreq = dataIn.getSampleRate();
-    const double outputFreq = dataOut.getSampleRate();
-    const double sampleFactor = outputFreq / inputFreq;
+    auto input = dataIn.toAVFrame();
+    AudioFrame resampled;
+    auto output = resampled.pointer();
+    output->sample_rate = dataOut.getSampleRate();
+    output->channel_layout = av_get_default_channel_layout(dataOut.channels());
+    output->format = AV_SAMPLE_FMT_S16;
 
-    if (sampleFactor == 1.0)
+    if (resample(input, output) < 0) {
+        av_frame_free(&input);
         return;
-
-    const size_t nbFrames = dataIn.frames();
-    const size_t nbChans = dataIn.channels();
-
-    if (nbChans != format_.nb_channels) {
-        // change channel num if needed
-        src_state_.reset(new SrcState(nbChans, high_quality_));
-        format_.nb_channels = nbChans;
-        RING_DBG("SRC channel number changed.");
-    }
-    if (nbChans != dataOut.channels()) {
-        RING_DBG("Output buffer had the wrong number of channels (in: %zu, out: %u).", nbChans, dataOut.channels());
-        dataOut.setChannelNum(nbChans);
     }
 
-    size_t inSamples = nbChans * nbFrames;
-    size_t outSamples = inSamples * sampleFactor;
-
-    // grow buffer if needed
-    floatBufferIn_.resize(inSamples);
-    floatBufferOut_.resize(outSamples);
-    scratchBuffer_.resize(outSamples);
-
-    SRC_DATA src_data;
-    src_data.data_in = floatBufferIn_.data();
-    src_data.data_out = floatBufferOut_.data();
-    src_data.input_frames = nbFrames;
-    src_data.output_frames = nbFrames * sampleFactor;
-    src_data.src_ratio = sampleFactor;
-    src_data.end_of_input = 0; // More data will come
-
-    dataIn.interleaveFloat(floatBufferIn_.data());
-
-    src_state_->process(&src_data);
-    /*
-    TODO: one-shot deinterleave and float-to-short conversion
-    */
-    src_float_to_short_array(floatBufferOut_.data(), scratchBuffer_.data(), outSamples);
-    dataOut.deinterleave(scratchBuffer_.data(), src_data.output_frames, nbChans);
+    dataOut.resize(output->nb_samples);
+    dataOut.deinterleave(reinterpret_cast<const AudioSample*>(output->extended_data[0]),
+        output->nb_samples, output->channels);
+    av_frame_free(&input);
 }
 
 } // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/resampler.h ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/resampler.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/resampler.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/resampler.h	2018-08-16 15:09:51.000000000 +0000
@@ -19,64 +19,50 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
 
-#ifndef _SAMPLE_RATE_H
-#define _SAMPLE_RATE_H
-
-#include <cmath>
-#include <cstring>
-#include <memory>
+#pragma once
 
 #include "audiobuffer.h"
-#include "ring_types.h"
 #include "noncopyable.h"
+#include "ring_types.h"
 
-namespace ring {
+struct AVFrame;
+struct SwrContext;
 
-class SrcState;
+namespace ring {
 
+/**
+ * Wrapper class for libswresample
+ */
 class Resampler {
     public:
-        /**
-         * Resampler is used for several situations:
-        * streaming conversion (RTP, IAX), audiolayer conversion,
-        * audio files conversion. Parameters are used to compute
-        * internal buffer size. Resampler must be reinitialized
-        * every time these parameters change
-        */
-        Resampler(AudioFormat outFormat, bool quality = false);
-        Resampler(unsigned sample_rate, unsigned channels=1, bool quality = false);
-        // empty dtor, needed for unique_ptr
+        Resampler();
         ~Resampler();
 
         /**
-         * Change the converter sample rate and channel number.
-         * Internal state is lost.
+         * Resample from @input format to @output format.
+         * NOTE: sample_rate, channel_layout, and format should be set on @output
          */
-        void setFormat(AudioFormat format, bool quality = false);
+        int resample(const AVFrame* input, AVFrame* output);
 
         /**
-         * resample from the samplerate1 to the samplerate2
-         * @param dataIn  Input buffer
-         * @param dataOut Output buffer
-         * @param nbSamples	  The number of samples to process
+         * Resample from @dataIn format to @dataOut format.
+         *
+         * NOTE: This is a wrapper for resample(AVFrame*, AVFrame*)
          */
         void resample(const AudioBuffer& dataIn, AudioBuffer& dataOut);
 
     private:
         NON_COPYABLE(Resampler);
 
-        /* temporary buffers */
-        std::vector<float> floatBufferIn_;
-        std::vector<float> floatBufferOut_;
-        std::vector<AudioSample> scratchBuffer_;
-
-        size_t samples_; // size in samples of temporary buffers
-        AudioFormat format_; // number of channels and max output frequency
-        bool high_quality_;
+        /**
+         * Reinitializes the resampler when new settings are detected. As long as both input and
+         * output buffers always have the same formats, will never be called, as the first
+         * initialization is done in swr_convert_frame.
+         */
+        void reinit(const AudioFormat& in, const int inSampleFmt,
+                    const AudioFormat& out, const int outSampleFmt);
 
-        std::unique_ptr<SrcState> src_state_;
+        SwrContext* swrCtx_; // incomplete type, cannot be a unique_ptr
 };
 
 } // namespace ring
-
-#endif //_SAMPLE_RATE_H
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/ringbuffer.h ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/ringbuffer.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/ringbuffer.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/ringbuffer.h	2018-08-16 15:09:51.000000000 +0000
@@ -145,7 +145,7 @@
         NON_COPYABLE(RingBuffer);
 
         /**
-         * Return the smalest readoffset. Usefull to evaluate if ringbuffer is full
+         * Return the smalest readoffset. Useful to evaluate if ringbuffer is full
          */
         size_t getSmallestReadOffset() const;
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/ringbufferpool.h ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/ringbufferpool.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/ringbufferpool.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/ringbufferpool.h	2018-08-16 15:09:51.000000000 +0000
@@ -57,7 +57,7 @@
         void setInternalAudioFormat(AudioFormat format);
 
         /**
-         * Bind together two audio streams so taht a client will be able
+         * Bind together two audio streams so that a client will be able
          * to put and get data specifying its callid only.
          */
         void bindCallID(const std::string& call_id1,
@@ -104,7 +104,7 @@
         /**
          * Create a new ringbuffer with a default readoffset.
          * This class keeps a weak reference on returned pointer,
-         * so the caller is responsible of the refered instance.
+         * so the caller is responsible of the referred instance.
          */
         std::shared_ptr<RingBuffer> createRingBuffer(const std::string& id);
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/sound/audiofile.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/sound/audiofile.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/sound/audiofile.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/sound/audiofile.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -22,18 +22,15 @@
  */
 #include <fstream>
 #include <cmath>
-#include <samplerate.h>
 #include <cstring>
 #include <vector>
 #include <climits>
 
-#ifndef RING_UWP
-#include <sndfile.hh>
-#endif
-
+#include "libav_deps.h"
 #include "audiofile.h"
 #include "audio/resampler.h"
 #include "manager.h"
+#include "media_decoder.h"
 #include "client/ring_signal.h"
 
 #include "logger.h"
@@ -62,76 +59,47 @@
 AudioFile::AudioFile(const std::string &fileName, unsigned int sampleRate) :
     AudioLoop(sampleRate), filepath_(fileName), updatePlaybackScale_(0)
 {
-#ifndef RING_UWP
-    int format;
-    bool hasHeader = true;
-
-    if (filepath_.find(".wav") != std::string::npos) {
-        format = SF_FORMAT_WAV;
-    } else if (filepath_.find(".ul") != std::string::npos) {
-        format = SF_FORMAT_RAW | SF_FORMAT_ULAW;
-        hasHeader = false;
-    } else if (filepath_.find(".al") != std::string::npos) {
-        format = SF_FORMAT_RAW | SF_FORMAT_ALAW;
-        hasHeader = false;
-    } else if (filepath_.find(".au") != std::string::npos) {
-        format = SF_FORMAT_AU;
-    } else if (filepath_.find(".flac") != std::string::npos) {
-        format = SF_FORMAT_FLAC;
-    } else if (filepath_.find(".ogg") != std::string::npos) {
-        format = SF_FORMAT_OGG;
-    } else {
-        RING_WARN("No file extension, guessing WAV");
-        format = SF_FORMAT_WAV;
-    }
-
-    SndfileHandle fileHandle(fileName.c_str(), SFM_READ, format, hasHeader ? 0 : 1,
-                             hasHeader ? 0 : 8000);
-
-    if (!fileHandle)
-        throw AudioFileException("File handle " + fileName + " could not be created");
-    if (fileHandle.error()) {
-        RING_ERR("Error fileHandle: %s", fileHandle.strError());
-        throw AudioFileException("File " + fileName + " doesn't exist");
-    }
-
-    switch (fileHandle.channels()) {
-        case 1:
-        case 2:
+    auto decoder = std::make_unique<MediaDecoder>();
+    DeviceParams dev;
+    dev.input = fileName;
+
+    if (decoder->openInput(dev) < 0)
+        throw AudioFileException("File could not be opened: " + fileName);
+
+    if (decoder->setupFromAudioData() < 0)
+        throw AudioFileException("Decoder setup failed: " + fileName);
+
+    auto resampler = std::make_unique<Resampler>();
+    auto buf = std::make_unique<AudioBuffer>(0, getFormat());
+    bool done = false;
+    while (!done) {
+        AudioFrame input;
+        AudioFrame output;
+        auto resampled = output.pointer();
+        switch (decoder->decode(input)) {
+        case MediaDecoder::Status::FrameFinished:
+            resampled->sample_rate = getFormat().sample_rate;
+            resampled->channel_layout = av_get_default_channel_layout(getFormat().nb_channels);
+            resampled->format = AV_SAMPLE_FMT_S16;
+            if (resampler->resample(input.pointer(), resampled) < 0)
+                throw AudioFileException("Frame could not be resampled");
+            if (buf->append(resampled) < 0)
+                throw AudioFileException("Error while decoding: " + fileName);
+            break;
+        case MediaDecoder::Status::DecodeError:
+        case MediaDecoder::Status::ReadError:
+            throw AudioFileException("File cannot be decoded: " + fileName);
+        case MediaDecoder::Status::EOFError:
+            done = true;
             break;
+        case MediaDecoder::Status::Success:
         default:
-            throw AudioFileException("Unsupported number of channels");
+            break;
+        }
     }
 
-    // get # of bytes in file
-    const size_t fileSize = fileHandle.seek(0, SEEK_END);
-    fileHandle.seek(0, SEEK_SET);
-
-    const sf_count_t nbFrames = hasHeader ? fileHandle.frames() : fileSize / fileHandle.channels();
-
-    AudioSample * interleaved = new AudioSample[nbFrames * fileHandle.channels()];
-
-    // get n "items", aka samples (not frames)
-    fileHandle.read(interleaved, nbFrames * fileHandle.channels());
-
-    AudioBuffer * buffer = new AudioBuffer(nbFrames, AudioFormat(fileHandle.samplerate(), fileHandle.channels()));
-    buffer->deinterleave(interleaved, nbFrames, fileHandle.channels());
-    delete [] interleaved;
-
-    const int rate = static_cast<int32_t>(sampleRate);
-
-    if (fileHandle.samplerate() != rate) {
-        Resampler resampler(std::max(fileHandle.samplerate(), rate), fileHandle.channels(), true);
-        AudioBuffer * resampled = new AudioBuffer(nbFrames, AudioFormat(rate, fileHandle.channels()));
-        resampler.resample(*buffer, *resampled);
-        delete buffer;
-        delete buffer_;
-        buffer_ = resampled;
-    } else {
-        delete buffer_;
-        buffer_ = buffer;
-    }
-#endif
+    delete buffer_;
+    buffer_ = buf.release();
 }
 
 } // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/sound/tonelist.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/sound/tonelist.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/sound/tonelist.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/sound/tonelist.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -103,7 +103,7 @@
 TelephoneTone::setCurrentTone(Tone::TONEID toneId)
 {
     if (toneId != Tone::TONE_NULL && currentTone_ != toneId)
-        tones_[toneId].reset();
+        tones_[toneId]->reset();
 
     currentTone_ = toneId;
 }
@@ -114,22 +114,22 @@
     buildTones(sampleRate);
 }
 
-Tone*
+std::shared_ptr<Tone>
 TelephoneTone::getCurrentTone()
 {
     if (currentTone_ < Tone::TONE_DIALTONE or currentTone_ >= Tone::TONE_NULL)
         return nullptr;
 
-    return &tones_[currentTone_];
+    return tones_[currentTone_];
 }
 
 void
 TelephoneTone::buildTones(unsigned int sampleRate)
 {
-    tones_[Tone::TONE_DIALTONE] = Tone(toneZone[countryId_][Tone::TONE_DIALTONE], sampleRate);
-    tones_[Tone::TONE_BUSY] = Tone(toneZone[countryId_][Tone::TONE_BUSY], sampleRate);
-    tones_[Tone::TONE_RINGTONE] = Tone(toneZone[countryId_][Tone::TONE_RINGTONE], sampleRate);
-    tones_[Tone::TONE_CONGESTION] = Tone(toneZone[countryId_][Tone::TONE_CONGESTION], sampleRate);
+    tones_[Tone::TONE_DIALTONE] = std::make_shared<Tone>(toneZone[countryId_][Tone::TONE_DIALTONE], sampleRate);
+    tones_[Tone::TONE_BUSY] = std::make_shared<Tone>(toneZone[countryId_][Tone::TONE_BUSY], sampleRate);
+    tones_[Tone::TONE_RINGTONE] = std::make_shared<Tone>(toneZone[countryId_][Tone::TONE_RINGTONE], sampleRate);
+    tones_[Tone::TONE_CONGESTION] = std::make_shared<Tone>(toneZone[countryId_][Tone::TONE_CONGESTION], sampleRate);
 }
 
 } // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/sound/tonelist.h ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/sound/tonelist.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/sound/tonelist.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/sound/tonelist.h	2018-08-16 15:09:51.000000000 +0000
@@ -49,7 +49,7 @@
 
         void setCurrentTone(Tone::TONEID toneId);
         void setSampleRate(unsigned int sampleRate);
-        Tone* getCurrentTone();
+        std::shared_ptr<Tone> getCurrentTone();
 
     private:
         NON_COPYABLE(TelephoneTone);
@@ -59,7 +59,7 @@
         void buildTones(unsigned int sampleRate);
 
         COUNTRYID countryId_;
-        std::array<Tone, Tone::TONE_NULL> tones_;
+        std::array<std::shared_ptr<Tone>, Tone::TONE_NULL> tones_;
         Tone::TONEID currentTone_;
 };
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/tonecontrol.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/tonecontrol.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/tonecontrol.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/tonecontrol.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -51,7 +51,7 @@
         telephoneTone_->setSampleRate(rate);
 }
 
-AudioLoop*
+std::shared_ptr<AudioLoop>
 ToneControl::getTelephoneTone()
 {
     std::lock_guard<std::mutex> lk(mutex_);
@@ -60,11 +60,11 @@
     return nullptr;
 }
 
-AudioLoop*
+std::shared_ptr<AudioLoop>
 ToneControl::getTelephoneFile(void)
 {
     std::lock_guard<std::mutex> lk(mutex_);
-    return audioFile_.get();
+    return audioFile_;
 }
 
 bool
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/tonecontrol.h ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/tonecontrol.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/audio/tonecontrol.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/audio/tonecontrol.h	2018-08-16 15:09:51.000000000 +0000
@@ -32,7 +32,7 @@
  * ToneControl is a class to handle application wide business logic
  * to control audio tones played at various application events.
  * Having an application wide instance gives a way to handle
- * complexes interactions occuring in a multi-call context.
+ * complexes interactions occurring in a multi-call context.
  */
 
 class TelephoneTone;
@@ -44,8 +44,8 @@
         ~ToneControl();
 
         void setSampleRate(unsigned rate);
-        AudioLoop* getTelephoneTone();
-        AudioLoop* getTelephoneFile(void);
+        std::shared_ptr<AudioLoop> getTelephoneTone();
+        std::shared_ptr<AudioLoop> getTelephoneFile(void);
         bool setAudioFile(const std::string& file);
         void stopAudioFile();
         void stop();
@@ -58,7 +58,7 @@
         std::mutex mutex_; // protect access to following members
         unsigned sampleRate_;
         std::unique_ptr<TelephoneTone> telephoneTone_;
-        std::unique_ptr<AudioFile> audioFile_;
+        std::shared_ptr<AudioFile> audioFile_;
 };
 
 } // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/libav_utils.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/libav_utils.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/libav_utils.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/libav_utils.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -226,4 +226,21 @@
         return "";
 }
 
+void
+fillWithBlack(AVFrame* frame)
+{
+    const AVPixelFormat format = static_cast<AVPixelFormat>(frame->format);
+    const int planes = av_pix_fmt_count_planes(format);
+    // workaround for casting pointers to different sizes
+    // on 64 bit machines: sizeof(ptrdiff_t) != sizeof(int)
+    ptrdiff_t linesizes[4];
+    for (int i = 0; i < planes; ++i)
+        linesizes[i] = frame->linesize[i];
+    int ret = av_image_fill_black(frame->data, linesizes, format,
+        frame->color_range, frame->width, frame->height);
+    if (ret < 0) {
+        RING_ERR() << "Failed to blacken frame";
+    }
+}
+
 }} // namespace ring::libav_utils
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/libav_utils.h ring-20180816.2.e26b79f~ds1/daemon/src/media/libav_utils.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/libav_utils.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/libav_utils.h	2018-08-16 15:09:51.000000000 +0000
@@ -25,6 +25,7 @@
 #include <string>
 
 struct AVDictionary;
+struct AVFrame;
 struct AVPixFmtDescriptor;
 
 namespace ring { namespace libav_utils {
@@ -47,4 +48,6 @@
 
     const char* getDictValue(const AVDictionary* d, const std::string& key, int flags=0);
 
+    void fillWithBlack(AVFrame* frame);
+
 }} // namespace ring::libav_utils
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/Makefile.am ring-20180816.2.e26b79f~ds1/daemon/src/media/Makefile.am
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/Makefile.am	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/Makefile.am	2018-08-16 15:09:51.000000000 +0000
@@ -49,12 +49,12 @@
 	./video/libvideo.la
 endif
 
-libmedia_la_LDFLAGS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBAVFILTER_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
+libmedia_la_LDFLAGS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBAVFILTER_LIBS@ @LIBSWRESAMPLE_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
 
 if HAVE_WIN32
 libmedia_la_LDFLAGS += -lws2_32 -lwsock32 -lshlwapi
 endif
 
-AM_CFLAGS=@LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBAVFILTER_CFLAGS@ @LIBSWSCALE_CFLAGS@
+AM_CFLAGS=@LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBAVFILTER_CFLAGS@ @LIBSWRESAMPLE_CFLAGS@ @LIBSWSCALE_CFLAGS@
 
-AM_CXXFLAGS=@LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBAVFILTER_CFLAGS@ @LIBSWSCALE_CFLAGS@
+AM_CXXFLAGS=@LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBAVFILTER_CFLAGS@ @LIBSWRESAMPLE_CFLAGS@ @LIBSWSCALE_CFLAGS@
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_buffer.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/media_buffer.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_buffer.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/media_buffer.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -171,66 +171,6 @@
                                     width, height, 1);
 }
 
-void
-yuv422_clear_to_black(VideoFrame& frame)
-{
-    const auto libav_frame = frame.pointer();
-    const auto desc = av_pix_fmt_desc_get((AVPixelFormat)libav_frame->format);
-    if (not desc)
-        return;
-
-    if (not libav_utils::is_yuv_planar(*desc)) {
-        // not planar
-        auto stride = libav_frame->linesize[0];
-        if (libav_frame->width % 2) {
-            // non-even width (16bits write x-loop)
-            for (int y = 0; y < libav_frame->height; ++y) {
-                auto src = &libav_frame->data[0][y * stride];
-                for (int x = 0; x < libav_frame->width; ++x) {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-                    *((uint16_t*)src) = 0x8000;
-#else
-                    *((uint16_t*)src) = 0x0080;
-#endif
-                    src += 2;
-                }
-            }
-        } else if (libav_frame->width % 4) {
-            // non-quad width (32bits write x-loop)
-            for (int y = 0; y < libav_frame->height; ++y) {
-                auto src = &libav_frame->data[0][y * stride];
-                for (int x = 0; x < libav_frame->width / 2; ++x) {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-                    *((uint32_t*)src) = 0x80008000;
-#else
-                    *((uint32_t*)src) = 0x00800080;
-#endif
-                    src += 4;
-                }
-            }
-        } else {
-            // quad width (64bits write x-loop)
-            for (int y = 0; y < libav_frame->height; ++y) {
-                auto src = &libav_frame->data[0][y * stride];
-                for (int x = 0; x < libav_frame->width / 4; ++x) {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-                    *((uint64_t*)src) = 0x8000800080008000;
-#else
-                    *((uint64_t*)src) = 0x0080008000800080;
-#endif
-                    src += 8;
-                }
-            }
-        }
-    } else {
-        // planar
-        std::memset(libav_frame->data[0], 0, libav_frame->linesize[0] * libav_frame->height);
-        // 128 is the black level for U/V channels
-        std::memset(libav_frame->data[1], 128, libav_frame->linesize[1] * (libav_frame->height >> desc->log2_chroma_w));
-        std::memset(libav_frame->data[2], 128, libav_frame->linesize[2] * (libav_frame->height >> desc->log2_chroma_h));
-    }
-}
-
 #endif // RING_VIDEO
 
 } // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_buffer.h ring-20180816.2.e26b79f~ds1/daemon/src/media/media_buffer.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_buffer.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/media_buffer.h	2018-08-16 15:09:51.000000000 +0000
@@ -97,7 +97,6 @@
 
 // Some helpers
 std::size_t videoFrameSize(int format, int width, int height);
-void yuv422_clear_to_black(VideoFrame& frame);
 
 #endif // RING_VIDEO
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_codec.h ring-20180816.2.e26b79f~ds1/daemon/src/media/media_codec.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_codec.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/media_codec.h	2018-08-16 15:09:51.000000000 +0000
@@ -159,7 +159,7 @@
     AccountCodecInfo& operator=(AccountCodecInfo&&);
 
     const SystemCodecInfo& systemCodecInfo;
-    unsigned order {0}; /*used to define prefered codec list order in UI*/
+    unsigned order {0}; /*used to define preferred codec list order in UI*/
     bool isActive {true};
     /* account custom values */
     unsigned payloadType;
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_decoder.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/media_decoder.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_decoder.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/media_decoder.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -73,6 +73,7 @@
 
 int MediaDecoder::openInput(const DeviceParams& params)
 {
+    inputParams_ = params;
     AVInputFormat *iformat = av_find_input_format(params.format.c_str());
 
     if (!iformat)
@@ -144,11 +145,8 @@
 void MediaDecoder::setIOContext(MediaIOHandle *ioctx)
 { inputCtx_->pb = ioctx->getContext(); }
 
-int MediaDecoder::setupFromAudioData(const AudioFormat format)
+int MediaDecoder::setupFromAudioData()
 {
-    // Use AVDictionary to send extra arguments to setupStream, since video setup doesn't need them
-    av_dict_set_int(&options_, "nb_channels", format.nb_channels, 0);
-    av_dict_set_int(&options_, "sample_rate", format.sample_rate, 0);
     return setupStream(AVMEDIA_TYPE_AUDIO);
 }
 
@@ -195,12 +193,16 @@
     }
     avcodec_parameters_to_context(decoderCtx_, avStream_->codecpar);
     decoderCtx_->framerate = avStream_->avg_frame_rate;
+    if (mediaType == AVMEDIA_TYPE_VIDEO) {
+        if (decoderCtx_->framerate.num == 0 || decoderCtx_->framerate.den == 0)
+            decoderCtx_->framerate = inputParams_.framerate;
+        if (decoderCtx_->framerate.num == 0 || decoderCtx_->framerate.den == 0)
+            decoderCtx_->framerate = av_inv_q(decoderCtx_->time_base);
+        if (decoderCtx_->framerate.num == 0 || decoderCtx_->framerate.den == 0)
+            decoderCtx_->framerate = {30, 1};
+    }
 
     decoderCtx_->thread_count = std::max(1u, std::min(8u, std::thread::hardware_concurrency()/2));
-    if (mediaType == AVMEDIA_TYPE_AUDIO) {
-        decoderCtx_->channels = std::stoi(av_dict_get(options_, "nb_channels", nullptr, 0)->value);
-        decoderCtx_->sample_rate = std::stoi(av_dict_get(options_, "sample_rate", nullptr, 0)->value);
-    }
 
     if (emulateRate_)
         RING_DBG() << "Using framerate emulation";
@@ -345,6 +347,10 @@
     if (frameFinished) {
         av_packet_unref(&inpacket);
 
+        // channel layout is needed if frame will be resampled
+        if (!frame->channel_layout)
+            frame->channel_layout = av_get_default_channel_layout(frame->channels);
+
         auto packetTimestamp = frame->pts;
         // NOTE don't use clock to rescale audio pts, it may create artifacts
         frame->pts = av_rescale_q_rnd(frame->pts, avStream_->time_base, decoderCtx_->time_base,
@@ -462,7 +468,7 @@
     if ((unsigned)libav_frame->sample_rate != outFormat.sample_rate) {
         if (!resampler_) {
             RING_DBG("Creating audio resampler");
-            resampler_.reset(new Resampler(outFormat));
+            resampler_.reset(new Resampler);
         }
         resamplingBuff_.setFormat({(unsigned) outFormat.sample_rate, (unsigned) decoderCtx_->channels});
         resamplingBuff_.resize(libav_frame->nb_samples);
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_decoder.h ring-20180816.2.e26b79f~ds1/daemon/src/media/media_decoder.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_decoder.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/media_decoder.h	2018-08-16 15:09:51.000000000 +0000
@@ -34,6 +34,7 @@
 
 #include "audio/audiobuffer.h"
 
+#include "media_device.h"
 #include "media_stream.h"
 #include "rational.h"
 #include "noncopyable.h"
@@ -57,7 +58,6 @@
 class RingBuffer;
 class Resampler;
 class MediaIOHandle;
-struct DeviceParams;
 
 class MediaDecoder {
     public:
@@ -84,7 +84,7 @@
         Status flush(VideoFrame&);
  #endif // RING_VIDEO
 
-        int setupFromAudioData(const AudioFormat format);
+        int setupFromAudioData();
         Status decode(const AudioFrame&);
         void writeToRingBuffer(const AudioFrame&, RingBuffer&, const AudioFormat);
 
@@ -117,6 +117,8 @@
         int64_t startTime_;
         int64_t lastTimestamp_;
 
+        DeviceParams inputParams_;
+
         AudioBuffer decBuff_;
         AudioBuffer resamplingBuff_;
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_encoder.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/media_encoder.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_encoder.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/media_encoder.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -24,7 +24,6 @@
 #include "media_encoder.h"
 #include "media_buffer.h"
 #include "media_io_handle.h"
-#include "media_recorder.h"
 
 #include "audio/audiobuffer.h"
 #include "string_utils.h"
@@ -50,8 +49,6 @@
 
 MediaEncoder::~MediaEncoder()
 {
-    if (auto rec = recorder_.lock())
-        rec->stopRecording();
     if (outputCtx_) {
         if (outputCtx_->priv_data)
             av_write_trailer(outputCtx_);
@@ -344,7 +341,7 @@
 // seq: frame number for video, sent samples audio
 // sampleFreq: fps for video, sample rate for audio
 // clock: stream time base (packetization interval times)
-int64_t
+static int64_t
 getNextTimestamp(int64_t seq, rational<int64_t> sampleFreq, rational<int64_t> clock)
 {
     return (seq / (sampleFreq * clock)).real<int64_t>();
@@ -358,7 +355,7 @@
     /* Prepare a frame suitable to our encoder frame format,
      * keeping also the input aspect ratio.
      */
-    yuv422_clear_to_black(scaledFrame_); // to fill blank space left by the "keep aspect"
+    libav_utils::fillWithBlack(scaledFrame_.pointer());
 
     scaler_.scale_with_aspect(input, scaledFrame_);
 
@@ -378,91 +375,13 @@
 }
 #endif // RING_VIDEO
 
-int MediaEncoder::encode_audio(const AudioBuffer &buffer)
+int MediaEncoder::encodeAudio(AVFrame* frame)
 {
-    const int needed_bytes = av_samples_get_buffer_size(nullptr, buffer.channels(),
-                                                        buffer.frames(),
-                                                        AV_SAMPLE_FMT_S16, 0);
-    if (needed_bytes < 0) {
-        RING_ERR("Couldn't calculate buffer size");
-        return -1;
-    }
-
-    std::vector<AudioSample> samples (needed_bytes / sizeof(AudioSample));
-    AudioSample* sample_data = samples.data();
-
-    AudioSample *offset_ptr = sample_data;
-    int nb_frames = buffer.frames();
-
-    AVCodecContext* encoderCtx = encoders_[currentStreamIdx_];
-
-    if (not is_muted) {
-        //only fill buffer with samples if not muted
-        buffer.interleave(sample_data);
-    } else {
-        //otherwise filll buffer with zero
-        buffer.fillWithZero(sample_data);
-    }
-    const auto layout = buffer.channels() == 2 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
-    const auto sample_rate = buffer.getSampleRate();
-
-    while (nb_frames > 0) {
-        AVFrame* frame = av_frame_alloc();
-        if (!frame)
-            return -1;
-
-        if (encoderCtx->frame_size)
-            frame->nb_samples = std::min<int>(nb_frames,
-                                              encoderCtx->frame_size);
-        else
-            frame->nb_samples = nb_frames;
-
-        frame->format = AV_SAMPLE_FMT_S16;
-        frame->channel_layout = layout;
-        frame->channels = buffer.channels();
-        frame->sample_rate = sample_rate;
-
-        frame->pts = getNextTimestamp(sent_samples, encoderCtx->sample_rate, encoderCtx->time_base);
-        sent_samples += frame->nb_samples;
-
-        const auto buffer_size = \
-            av_samples_get_buffer_size(nullptr, buffer.channels(),
-                                       frame->nb_samples, AV_SAMPLE_FMT_S16, 0);
-
-        int err = avcodec_fill_audio_frame(frame, buffer.channels(),
-                                           AV_SAMPLE_FMT_S16,
-                                           reinterpret_cast<const uint8_t *>(offset_ptr),
-                                           buffer_size, 0);
-        if (err < 0) {
-            RING_ERR() << "Failed to fill audio frame of size" << buffer_size << " with "
-                << frame->nb_samples << " samples: " << libav_utils::getError(err);
-            av_frame_free(&frame);
-            return -1;
-        }
-
-        nb_frames -= frame->nb_samples;
-        offset_ptr += frame->nb_samples * buffer.channels();
-
-        if (auto rec = recorder_.lock()) {
-            if (!recordingStarted_) {
-                auto ms = MediaStream("", encoders_[currentStreamIdx_], frame->pts);
-                if (rec->addStream(false, false, ms) >= 0) {
-                    recordingStarted_ = true;
-                } else {
-                    recorder_ = std::weak_ptr<MediaRecorder>();
-                }
-            }
-            if (recordingStarted_)
-                rec->recordData(frame, false, false);
-        } else {
-            recordingStarted_ = false;
-            recorder_ = std::weak_ptr<MediaRecorder>();
-        }
-
-        encode(frame, currentStreamIdx_);
-        av_frame_free(&frame);
-    }
-
+    auto enc = encoders_[currentStreamIdx_];
+    frame->pts = getNextTimestamp(sent_samples, enc->sample_rate, enc->time_base);
+    sent_samples += frame->nb_samples;
+    encode(frame, currentStreamIdx_);
+    av_frame_free(&frame);
     return 0;
 }
 
@@ -719,15 +638,4 @@
         return 0;
 }
 
-void
-MediaEncoder::initRecorder(std::shared_ptr<MediaRecorder>& rec)
-{
-    // recording will start once we can send an AVPacket to the recorder
-    recordingStarted_ = false;
-    recorder_ = rec;
-    if (auto r = recorder_.lock()) {
-        r->incrementStreams(1);
-    }
-}
-
 } // namespace ring
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_encoder.h ring-20180816.2.e26b79f~ds1/daemon/src/media/media_encoder.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_encoder.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/media_encoder.h	2018-08-16 15:09:51.000000000 +0000
@@ -75,7 +75,7 @@
     int encode(VideoFrame &input, bool is_keyframe, int64_t frame_number);
 #endif // RING_VIDEO
 
-    int encode_audio(const AudioBuffer &input);
+    int encodeAudio(AVFrame* frame);
 
     // frame should be ready to be sent to the encoder at this point
     int encode(AVFrame* frame, int streamIdx);
@@ -98,8 +98,6 @@
 
     unsigned getStreamCount() const;
 
-    void initRecorder(std::shared_ptr<MediaRecorder>& rec);
-
 private:
     NON_COPYABLE(MediaEncoder);
     void setOptions(const MediaDescription& args);
@@ -122,9 +120,6 @@
     int scaledFrameBufferSize_ = 0;
     bool is_muted = false;
 
-    std::weak_ptr<MediaRecorder> recorder_;
-    bool recordingStarted_ = false;
-
 protected:
     AVDictionary *options_ = nullptr;
     DeviceParams device_;
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_filter.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/media_filter.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_filter.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/media_filter.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -125,7 +125,22 @@
 }
 
 MediaStream
-MediaFilter::getOutputParams()
+MediaFilter::getInputParams() const
+{
+    return getInputParams("default");
+}
+
+MediaStream
+MediaFilter::getInputParams(const std::string& inputName) const
+{
+    for (auto ms : inputParams_)
+        if (ms.name == inputName)
+            return ms;
+    return {};
+}
+
+MediaStream
+MediaFilter::getOutputParams() const
 {
     MediaStream output;
     if (!output_ || !initialized_) {
@@ -174,7 +189,7 @@
 
     for (size_t i = 0; i < inputs_.size(); ++i) {
         auto filterCtx = inputs_[i];
-        if (inputNames_[i] != inputName)
+        if (inputParams_[i].name != inputName)
             continue;
 
         int flags = AV_BUFFERSRC_FLAG_PUSH | AV_BUFFERSRC_FLAG_KEEP_REF;
@@ -213,6 +228,19 @@
     return nullptr;
 }
 
+AVFrame*
+MediaFilter::apply(AVFrame* frame)
+{
+    if (inputs_.size() != 1) {
+        RING_ERR() << "Cannot use apply(AVFrame*) shortcut with a complex filter";
+        return nullptr;
+    }
+
+    if (feedInput(frame) < 0)
+        return nullptr;
+    return readOutput();
+}
+
 int
 MediaFilter::initOutputFilter(AVFilterInOut* out)
 {
@@ -291,14 +319,15 @@
 
     inputs_.push_back(buffersrcCtx);
     if (simple)
-        inputNames_.push_back("default");
+        msp.name = "default";
     else
-        inputNames_.push_back(in->name);
+        msp.name = in->name;
+    inputParams_.push_back(msp);
     return ret;
 }
 
 int
-MediaFilter::fail(std::string msg, int err)
+MediaFilter::fail(std::string msg, int err) const
 {
     if (!msg.empty())
         RING_ERR() << msg << ": " << libav_utils::getError(err);
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_filter.h ring-20180816.2.e26b79f~ds1/daemon/src/media/media_filter.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_filter.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/media_filter.h	2018-08-16 15:09:51.000000000 +0000
@@ -79,11 +79,23 @@
         int initialize(const std::string& filterDesc, std::vector<MediaStream> msps);
 
         /**
+         * Returns a MediaStream object describing the input.
+         *
+         * NOTE This is a shortcut for simple filters and will fail when called on a complex filter.
+         */
+        MediaStream getInputParams() const;
+
+        /**
+         * Returns a MediaStream object describing the input specified by @inputName.
+         */
+        MediaStream getInputParams(const std::string& inputName) const;
+
+        /**
          * Returns a MediaStream struct describing the frames that will be output.
          *
          * When called in an invalid state, the returned format will be invalid (less than 0).
          */
-        MediaStream getOutputParams();
+        MediaStream getOutputParams() const;
 
         /**
          * Give the filter graph an input frame. Caller is responsible for freeing the frame.
@@ -109,6 +121,16 @@
          */
         AVFrame* readOutput();
 
+        /**
+         * Passes a frame through a simple filter (1 input, 1 output).
+         *
+         * This is a shortcut for feedInput(AVFrame*)+readOutput().
+         *
+         * NOTE Returns nullptr if the filter graph has multiple inputs/outputs.
+         * NOTE Caller is responsible for freeing the input and output frames.
+         */
+        AVFrame* apply(AVFrame* frame);
+
     private:
         NON_COPYABLE(MediaFilter);
 
@@ -127,7 +149,7 @@
          *
          * NOTE @msg should not be null.
          */
-        int fail(std::string msg, int err);
+        int fail(std::string msg, int err) const;
 
         /**
          * Frees resources used by MediaFilter.
@@ -150,9 +172,9 @@
         std::vector<AVFilterContext*> inputs_;
 
         /**
-         * List of filter graph input names. Same order as @inputs_.
+         * List of filter graph input parameters. Same order as @inputs_.
          */
-        std::vector<std::string> inputNames_;
+        std::vector<MediaStream> inputParams_;
 
         /**
          * Filter graph string.
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_stream.h ring-20180816.2.e26b79f~ds1/daemon/src/media/media_stream.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/media_stream.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/media_stream.h	2018-08-16 15:09:51.000000000 +0000
@@ -21,6 +21,7 @@
 #pragma once
 
 #include "config.h"
+#include "audio/audiobuffer.h"
 #include "libav_deps.h"
 #include "rational.h"
 
@@ -65,6 +66,15 @@
         , nbChannels(channels)
     {}
 
+    MediaStream(std::string name, AudioFormat fmt)
+        : name(name)
+        , format(fmt.sampleFormat)
+        , isVideo(false)
+        , timeBase(1, fmt.sample_rate)
+        , sampleRate(fmt.sample_rate)
+        , nbChannels(fmt.nb_channels)
+    {}
+
     MediaStream(std::string name, AVCodecContext* c)
         : MediaStream(name, c, 0)
     {
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/recordable.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/recordable.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/recordable.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/recordable.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -20,7 +20,6 @@
  */
 
 #include "recordable.h"
-#include "audio/audiorecord.h"
 #include "audio/ringbufferpool.h"
 #include "manager.h"
 #include "logger.h"
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/video/video_input.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/video/video_input.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/video/video_input.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/video/video_input.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -39,7 +39,7 @@
 #include <string>
 #include <sstream>
 #include <cassert>
-#ifdef RING_UWP
+#ifdef _MSC_VER
 #include <io.h> // for access
 #else
 #include <unistd.h>
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/video/video_mixer.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/video/video_mixer.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/video/video_mixer.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/video/video_mixer.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -136,7 +136,7 @@
         return;
     }
 
-    yuv422_clear_to_black(output);
+    libav_utils::fillWithBlack(output.pointer());
 
     {
         auto lock(rwMutex_.read());
@@ -190,7 +190,7 @@
     // cleanup the previous frame to have a nice copy in rendering method
     std::shared_ptr<VideoFrame> previous_p(obtainLastFrame());
     if (previous_p)
-        yuv422_clear_to_black(*previous_p);
+        libav_utils::fillWithBlack(previous_p->pointer());
 
     start_sink();
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/video/video_receive_thread.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/video/video_receive_thread.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/video/video_receive_thread.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/video/video_receive_thread.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -94,12 +94,18 @@
         // We need it to use ICE transport.
         args_.sdp_flags = "custom_io";
 
-        EXIT_IF_FAIL(not stream_.str().empty(), "No SDP loaded");
+        if (stream_.str().empty()) {
+            RING_ERR("No SDP loaded");
+            return false;
+        }
+
         videoDecoder_->setIOContext(&sdpContext_);
     }
 
-    EXIT_IF_FAIL(!videoDecoder_->openInput(args_),
-                 "Could not open input \"%s\"", args_.input.c_str());
+    if (videoDecoder_->openInput(args_)) {
+        RING_ERR("Could not open input \"%s\"", args_.input.c_str());
+        return false;
+    }
 
     if (args_.input == SDP_FILENAME) {
         // Now replace our custom AVIOContext with one that will read packets
@@ -109,8 +115,10 @@
     if (requestKeyFrameCallback_)
         requestKeyFrameCallback_(id_);
 
-    EXIT_IF_FAIL(!videoDecoder_->setupFromVideoData(),
-                 "decoder IO startup failed");
+    if (videoDecoder_->setupFromVideoData()) {
+        RING_ERR("decoder IO startup failed");
+        return false;
+    }
 
     // Default size from input video
     if (dstWidth_ == 0 and dstHeight_ == 0) {
@@ -118,7 +126,10 @@
         dstHeight_ = videoDecoder_->getHeight();
     }
 
-    EXIT_IF_FAIL(sink_->start(), "RX: sink startup failed");
+    if (not sink_->start()) {
+        RING_ERR("RX: sink startup failed");
+        return false;
+    }
 
     auto conf = Manager::instance().getConferenceFromCallID(id_);
     if (!conf)
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/media/video/winvideo/video_device_impl.cpp ring-20180816.2.e26b79f~ds1/daemon/src/media/video/winvideo/video_device_impl.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/media/video/winvideo/video_device_impl.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/media/video/winvideo/video_device_impl.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -237,7 +237,7 @@
             auto videoInfo = (VIDEOINFOHEADER*) pmt->pbFormat;
             params.width = videoInfo->bmiHeader.biWidth;
             params.height = videoInfo->bmiHeader.biHeight;
-            params.framerate = {1e7,  videoInfo->AvgTimePerFrame};
+            params.framerate = {1e7, static_cast<double>(videoInfo->AvgTimePerFrame)};
         }
     }
     return params;
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/peer_connection.cpp ring-20180816.2.e26b79f~ds1/daemon/src/peer_connection.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/peer_connection.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/peer_connection.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -44,7 +44,7 @@
 #include <sys/select.h>
 #endif
 
-#ifndef RING_UWP
+#ifndef _MSC_VER
 #include <sys/time.h>
 #endif
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/preferences.cpp ring-20180816.2.e26b79f~ds1/daemon/src/preferences.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/preferences.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/preferences.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -139,7 +139,7 @@
 static const char * const DECODING_ACCELERATED_KEY = "decodingAccelerated";
 #endif
 
-static const char * const DFT_PULSE_LENGTH_STR = "250"; /** Default DTMF lenght */
+static const char * const DFT_PULSE_LENGTH_STR = "250"; /** Default DTMF length */
 static const char * const ALSA_DFT_CARD    = "0";          /** Default sound card index */
 
 Preferences::Preferences() :
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/rational.h ring-20180816.2.e26b79f~ds1/daemon/src/rational.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/rational.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/rational.h	2018-08-16 15:09:51.000000000 +0000
@@ -49,7 +49,7 @@
 
     // Define conversions to and from AVRational (equivalent)
     rational(AVRational r) : num_(r.num), den_(r.den) {};
-    operator AVRational() const { return AVRational{num_, den_}; }
+    operator AVRational() const { return AVRational{(int)num_, (int)den_}; }
 
     // Normal copy constructors and assignment operators
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/ringdht/eth/libdevcrypto/Makefile.am ring-20180816.2.e26b79f~ds1/daemon/src/ringdht/eth/libdevcrypto/Makefile.am
--- ring-20180712.2.f3b87a6~ds1/daemon/src/ringdht/eth/libdevcrypto/Makefile.am	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/ringdht/eth/libdevcrypto/Makefile.am	2018-08-16 15:09:51.000000000 +0000
@@ -1,7 +1,7 @@
 include $(top_srcdir)/globals.mk
 
-AM_CPPFLAGS += -I../
+AM_CPPFLAGS += -I$(top_srcdir)/src/ringdht/eth
 noinst_LTLIBRARIES = libdevcrypto.la
-libdevcrypto_la_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/src/ringdht/eth
+
 libdevcrypto_la_SOURCES = Common.cpp
 noinst_HEADERS = Common.h
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/ringdht/ringaccount.cpp ring-20180816.2.e26b79f~ds1/daemon/src/ringdht/ringaccount.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/ringdht/ringaccount.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/ringdht/ringaccount.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -21,12 +21,14 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
 
-#include "ringaccount.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "ringaccount.h"
+
+#include "logger.h"
+
 #include "accountarchive.h"
 #include "ringcontact.h"
 #include "configkeys.h"
@@ -52,7 +54,6 @@
 #include "system_codec_container.h"
 
 #include "account_schema.h"
-#include "logger.h"
 #include "manager.h"
 #include "utf8_utils.h"
 
@@ -79,6 +80,7 @@
 #include <memory>
 #include <sstream>
 #include <cctype>
+#include <cinttypes>
 #include <cstdarg>
 #include <string>
 #include <system_error>
@@ -2121,15 +2123,15 @@
         auto dht_log_level = Manager::instance().dhtLogLevel.load();
         if (dht_log_level > 0) {
             static auto silent = [](char const* /*m*/, va_list /*args*/) {};
-#ifndef RING_UWP
             static auto log_error = [](char const* m, va_list args) { Logger::vlog(LOG_ERR, nullptr, 0, true, m, args); };
             static auto log_warn = [](char const* m, va_list args) { Logger::vlog(LOG_WARNING, nullptr, 0, true, m, args); };
             static auto log_debug = [](char const* m, va_list args) { Logger::vlog(LOG_DEBUG, nullptr, 0, true, m, args); };
+#ifndef _MSC_VER
             dht_.setLoggers(
                 log_error,
                 (dht_log_level > 1) ? log_warn : silent,
                 (dht_log_level > 2) ? log_debug : silent);
-#else
+#elif RING_UWP
             static auto log_all = [](char const* m, va_list args) {
                 char tmp[2048];
                 vsprintf(tmp, m, args);
@@ -2137,6 +2139,14 @@
                 ring::emitSignal<DRing::DebugSignal::MessageSend>(std::to_string(now) + " " + std::string(tmp));
             };
             dht_.setLoggers(log_all, log_all, silent);
+#else
+            if (dht_log_level > 2) {
+                dht_.setLoggers(log_error, log_warn, log_debug);
+            } else if (dht_log_level > 1) {
+                dht_.setLoggers(log_error, log_warn, silent);
+            } else {
+                dht_.setLoggers(log_error, silent, silent);
+            }
 #endif
         }
 
@@ -2267,7 +2277,7 @@
                     std::map<std::string, std::string> payloads = {{datatype,
                                                                    utf8_make_valid(v.msg)}};
                     shared->onTextMessage(peer_account.toString(), payloads);
-                    RING_DBG("Sending message confirmation %" PRIx64, v.id);
+                    RING_DBG() << "Sending message confirmation " << v.id;
                     shared->dht_.putEncrypted(inboxDeviceKey,
                               v.from,
                               dht::ImMessage(v.id, std::string(), now));
@@ -3335,11 +3345,11 @@
                     return true;
                 auto e = this_.sentMessages_.find(msg.id);
                 if (e == this_.sentMessages_.end() or e->second.to != msg.from) {
-                    RING_DBG("[Account %s] [message %" PRIx64 "] message not found", this_.getAccountID().c_str(), token);
+                    RING_DBG() << "[Account " << this_.getAccountID() << "] [message " << token << "] Message not found";
                     return true;
                 }
                 this_.sentMessages_.erase(e);
-                RING_DBG("[Account %s] [message %" PRIx64 "] received text message reply", this_.getAccountID().c_str(), token);
+                RING_DBG() << "[Account " << this_.getAccountID() << "] [message " << token << "] Received text message reply";
 
                 // add treated message
                 auto res = this_.treatedMessages_.insert(msg.id);
@@ -3362,7 +3372,7 @@
             dht::ImMessage(token, std::string(payloads.begin()->first), std::string(payloads.begin()->second), now),
             [wshared,token,confirm,h](bool ok) {
                 if (auto this_ = wshared.lock()) {
-                    RING_DBG("[Account %s] [message %" PRIx64 "] put encrypted %s", this_->getAccountID().c_str(), token, ok ? "ok" : "failed");
+                    RING_DBG() << "[Account " << this_->getAccountID() << "] [message " << token << "] Put encrypted " << (ok ? "ok" : "failed");
                     if (not ok) {
                         auto lt = confirm->listenTokens.find(h);
                         if (lt != confirm->listenTokens.end()) {
@@ -3375,7 +3385,7 @@
                 }
             });
 
-        RING_DBG("[Account %s] [message %" PRIx64 "] sending message for device %s", shared->getAccountID().c_str(), token, dev.toString().c_str());
+        RING_DBG() << "[Account " << shared->getAccountID() << "] [message " << token << "] Sending message for device " << dev.toString();
     }, [token](const std::shared_ptr<RingAccount>& shared, bool ok) {
         if (not ok) {
             shared->messageEngine_.onMessageSent(token, false);
@@ -3387,7 +3397,7 @@
     Manager::instance().scheduleTask([wshared, confirm, token]() {
         if (not confirm->replied) {
             if (auto this_ = wshared.lock()) {
-                RING_DBG("[Account %s] [message %" PRIx64 "] timeout", this_->getAccountID().c_str(), token);
+                RING_DBG() << "[Account " << this_->getAccountID() << "] [message " << token << "] Timeout";
                 for (auto& t : confirm->listenTokens)
                     this_->dht_.cancelListen(t.first, t.second.get());
                 confirm->listenTokens.clear();
@@ -3468,7 +3478,7 @@
 }
 
 /**
- * To be called by clients with relevent data when a push notification is received.
+ * To be called by clients with relevant data when a push notification is received.
  */
 void RingAccount::pushNotificationReceived(const std::string& from, const std::map<std::string, std::string>& data)
 {
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/ringdht/ringaccount.h ring-20180816.2.e26b79f~ds1/daemon/src/ringdht/ringaccount.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/ringdht/ringaccount.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/ringdht/ringaccount.h	2018-08-16 15:09:51.000000000 +0000
@@ -234,7 +234,7 @@
          *      The type of this instance is given in template argument.
          *      This type can be any base class of SIPCall class (included).
          */
-#ifndef RING_UWP
+#ifndef _MSC_VER
         template <class T=SIPCall>
         std::shared_ptr<enable_if_base_of<T, SIPCall> >
         newOutgoingCall(const std::string& toUrl, const std::map<std::string, std::string>& volatileCallDetails = {});
@@ -372,7 +372,7 @@
         void setPushNotificationToken(const std::string& pushDeviceToken = "");
 
         /**
-         * To be called by clients with relevent data when a push notification is received.
+         * To be called by clients with relevant data when a push notification is received.
          */
         void pushNotificationReceived(const std::string& from, const std::map<std::string, std::string>& data);
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/security/tls_session.cpp ring-20180816.2.e26b79f~ds1/daemon/src/security/tls_session.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/security/tls_session.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/security/tls_session.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -860,7 +860,7 @@
     RING_DBG("[TLS] session established: %s", desc);
     gnutls_free(desc);
 
-    // Anonymous connection? rehandshake immediatly with certificate authentification forced
+    // Anonymous connection? rehandshake immediately with certificate authentification forced
     auto cred = gnutls_auth_get_type(session_);
     if (cred == GNUTLS_CRD_ANON) {
         RING_DBG("[TLS] renogotiate with certificate authentification");
@@ -1037,7 +1037,7 @@
 ///
 /// Reorder and push received packet to upper layer
 ///
-/// \note This method must be called continously, faster than RX_OOO_TIMEOUT
+/// \note This method must be called continuously, faster than RX_OOO_TIMEOUT
 ///
 void
 TlsSession::TlsSessionImpl::flushRxQueue()
@@ -1064,7 +1064,7 @@
     auto item = std::begin(reorderBuffer_);
     auto next_offset = item->first;
 
-    // Wait for next continous packet until timeout
+    // Wait for next continuous packet until timeout
     if ((clock::now() - lastReadTime_) >= RX_OOO_TIMEOUT) {
         // OOO packet timeout - consider waited packets as lost
         if (auto lost = next_offset - gapOffset_)
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/security/tlsvalidator.cpp ring-20180816.2.e26b79f~ds1/daemon/src/security/tlsvalidator.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/security/tlsvalidator.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/security/tlsvalidator.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -45,7 +45,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifndef RING_UWP
+#ifndef _MSC_VER
 #include <libgen.h>
 #endif
 
@@ -55,14 +55,14 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #else
-#ifndef RING_UWP
+#ifndef _MSC_VER
 #define close(x) closesocket(x)
 #endif
 #endif
 #include <unistd.h>
 #include <fcntl.h>
 
-#ifdef RING_UWP
+#ifdef _MSC_VER
 #include "windirent.h"
 #endif
 
@@ -851,7 +851,7 @@
     if (privateKeyPath_.empty())
        return TlsValidator::CheckResult(CheckValues::UNSUPPORTED, "");
 
-#ifndef RING_UWP
+#ifndef _MSC_VER
     auto path = std::unique_ptr<char, decltype(free)&> (strdup(privateKeyPath_.c_str()), free);
     const char* dir = dirname(path.get());
 #else
@@ -874,7 +874,7 @@
 
 TlsValidator::CheckResult TlsValidator::publicKeyDirectoryPermissions()
 {
-#ifndef RING_UWP
+#ifndef _MSC_VER
     auto path = std::unique_ptr<char, decltype(free)&>(strdup(certificatePath_.c_str()), free);
     const char* dir = dirname(path.get());
 #else
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/pattern.cpp ring-20180816.2.e26b79f~ds1/daemon/src/sip/pattern.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/pattern.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/pattern.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -123,7 +123,7 @@
         offset_[1] =  ovector_[1] + offset_[0];
     }
 
-    // Matching succeded but not enough space.
+    // Matching succeeded but not enough space.
     // @TODO figure out something more clever to do in this case.
     if (rc == 0)
         throw MatchError("No space to store all substrings.");
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/pres_sub_client.h ring-20180816.2.e26b79f~ds1/daemon/src/sip/pres_sub_client.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/pres_sub_client.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/pres_sub_client.h	2018-08-16 15:09:51.000000000 +0000
@@ -78,7 +78,7 @@
         bool subscribe();
         /**
          * Send a SUBCRIBE to the PXB or directly to a pres_client in the IP2IP context but
-         * the 0s timeout make the dialog expire immediatly.
+         * the 0s timeout make the dialog expire immediately.
          */
         bool unsubscribe();
         /**
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/pres_sub_server.cpp ring-20180816.2.e26b79f~ds1/daemon/src/sip/pres_sub_server.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/pres_sub_server.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/pres_sub_server.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -227,7 +227,7 @@
         return PJ_TRUE;
     }
 
-    /*Send notify immediatly. Replace real status with fake.*/
+    /*Send notify immediately. Replace real status with fake.*/
 
     // pjsip_pres_set_status(sub, pres->getStatus()); // real status
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/pres_sub_server.h ring-20180816.2.e26b79f~ds1/daemon/src/sip/pres_sub_server.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/pres_sub_server.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/pres_sub_server.h	2018-08-16 15:09:51.000000000 +0000
@@ -43,8 +43,8 @@
         PresSubServer(SIPPresence * pres, pjsip_evsub *evsub, const char *remote, pjsip_dialog *d);
         ~PresSubServer();
         /*
-         * Acces to the evsub expire variable.
-         * It was recieved in the SUBSCRIBE request.
+         * Access to the evsub expire variable.
+         * It was received in the SUBSCRIBE request.
          */
         void setExpires(int ms);
         int getExpires() const;
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sdes_negotiator.cpp ring-20180816.2.e26b79f~ds1/daemon/src/sip/sdes_negotiator.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sdes_negotiator.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/sdes_negotiator.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -109,7 +109,7 @@
         } else
             return cryptoAttributeVector;
 
-        // Check if the crypto suite is valid and retreive
+        // Check if the crypto suite is valid and retrieve
         // its value.
         cryptoSuitePattern->updateSubject(sdesLine.at(1));
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipaccountbase.h ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipaccountbase.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipaccountbase.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipaccountbase.h	2018-08-16 15:09:51.000000000 +0000
@@ -149,7 +149,7 @@
 
     /**
      * Determine if TLS is enabled for this account. TLS provides a secured channel for
-     * SIP signalization. It is independant of the media encription (as provided by SRTP).
+     * SIP signalization. It is independent of the media encryption (as provided by SRTP).
      */
     virtual bool isTlsEnabled() const {
         return false;
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipaccount.cpp ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipaccount.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipaccount.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipaccount.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -1287,7 +1287,13 @@
     DWORD size = UNLEN + 1;
     std::string uname;
     if (GetUserName((TCHAR*)username, &size)) {
+#ifdef _MSC_VER
+        wchar_t* tmpstr = new wchar_t[UNLEN + 1];
+        mbstowcs(tmpstr, username, UNLEN + 1);
+        std::wstring wStr = tmpstr;
+#else
         std::wstring wStr = username;
+#endif
         uname = std::string(wStr.begin(), wStr.end());
     }
     return uname;
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipaccount.h ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipaccount.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipaccount.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipaccount.h	2018-08-16 15:09:51.000000000 +0000
@@ -241,7 +241,7 @@
         }
 
         /**
-         * Get the registration stucture that is used
+         * Get the registration structure that is used
          * for PJSIP in the registration process.
          * Settings are loaded from configuration file.
          * @return pjsip_regc* A pointer to the registration structure
@@ -465,14 +465,14 @@
          *      The type of this instance is given in template argument.
          *      This type can be any base class of SIPCall class (included).
          */
-#ifndef RING_UWP
+#ifndef _MSC_VER
         template <class T=SIPCall>
         std::shared_ptr<enable_if_base_of<T, SIPCall> >
-        newOutgoingCall(const std::string& toUrl, const std::map<std::string, std::string>& volatileCallDetails = {});
-#else
-        template <class T>
-        std::shared_ptr<T>
-        newOutgoingCall(const std::string& toUrl, const std::map<std::string, std::string>& volatileCallDetails = {});
+        newOutgoingCall(const std::string& toUrl, const std::map<std::string, std::string>& volatileCallDetails = {});
+#else
+        template <class T>
+        std::shared_ptr<T>
+        newOutgoingCall(const std::string& toUrl, const std::map<std::string, std::string>& volatileCallDetails = {});
 #endif
 
         /**
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipcall.cpp ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipcall.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipcall.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipcall.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -81,22 +81,6 @@
 
 const char* const SIPCall::LINK_TYPE = SIPAccount::ACCOUNT_TYPE;
 
-static void
-dtmfSend(SIPCall &call, char code, const std::string& /*dtmf*/)
-{
-    int duration = Manager::instance().voipPreferences.getPulseLength();
-    char dtmf_body[1000];
-
-    // handle flash code
-    if (code == '!') {
-        snprintf(dtmf_body, sizeof dtmf_body - 1, "Signal=16\r\nDuration=%d\r\n", duration);
-    } else {
-        snprintf(dtmf_body, sizeof dtmf_body - 1, "Signal=%c\r\nDuration=%d\r\n", code, duration);
-    }
-
-    call.sendSIPInfo(dtmf_body, "dtmf-relay");
-}
-
 SIPCall::SIPCall(SIPAccountBase& account, const std::string& id, Call::CallType type,
                  const std::map<std::string, std::string>& details)
     : Call(account, id, type, details)
@@ -671,7 +655,21 @@
 void
 SIPCall::carryingDTMFdigits(char code)
 {
-    dtmfSend(*this, code, getSIPAccount().getDtmfType());
+    int duration = Manager::instance().voipPreferences.getPulseLength();
+    char dtmf_body[1000];
+
+    // handle flash code
+    if (code == '!') {
+        snprintf(dtmf_body, sizeof dtmf_body - 1, "Signal=16\r\nDuration=%d\r\n", duration);
+    } else {
+        snprintf(dtmf_body, sizeof dtmf_body - 1, "Signal=%c\r\nDuration=%d\r\n", code, duration);
+    }
+
+    try {
+        sendSIPInfo(dtmf_body, "dtmf-relay");
+    } catch (const std::exception& e) {
+        RING_ERR("Error sending DTMF: %s", e.what());
+    }
 }
 
 void
@@ -1014,7 +1012,7 @@
             if (!ice->isInitialized())
                 return true;
 
-            // Start transport on SDP data and wait for negotation
+            // Start transport on SDP data and wait for negotiation
             auto rem_ice_attrs = call->sdp_->getIceAttributes();
             if (rem_ice_attrs.ufrag.empty() or rem_ice_attrs.pwd.empty()) {
                 RING_ERR("[call:%s] Media ICE attributes empty", call->getCallId().c_str());
@@ -1033,7 +1031,7 @@
                     auto ice = call->getIceMediaTransport();
 
                     if (ice->isFailed()) {
-                        RING_ERR("[call:%s] Media ICE negotation failed", call->getCallId().c_str());
+                        RING_ERR("[call:%s] Media ICE negotiation failed", call->getCallId().c_str());
                         call->onFailure(EIO);
                         return false;
                     }
@@ -1081,7 +1079,7 @@
          * Try to open the desired ports with UPnP,
          * if they are used, use the alternative port and update the SDP session with the newly chosen port(s)
          *
-         * TODO: the inital ports were chosen from the list of available ports and were marked as used
+         * TODO: the initial ports were chosen from the list of available ports and were marked as used
          *       the newly selected port should possibly be checked against the list of used ports and marked
          *       as used, the old port should be "released"
          */
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/siptransport.cpp ring-20180816.2.e26b79f~ds1/daemon/src/sip/siptransport.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/siptransport.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/siptransport.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -450,7 +450,7 @@
 
     {
         std::lock_guard<std::mutex> lock(transportMapMutex_);
-        // we do not check for key existance as we've just created it
+        // we do not check for key existence as we've just created it
         // (member of new SipIceTransport instance)
         transports_.emplace(std::make_pair(tr, sip_tr));
     }
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/siptransport.h ring-20180816.2.e26b79f~ds1/daemon/src/sip/siptransport.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/siptransport.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/siptransport.h	2018-08-16 15:09:51.000000000 +0000
@@ -190,7 +190,7 @@
     std::shared_ptr<SipTransport> addTransport(pjsip_transport*);
 
     /**
-     * Start gracefull shutdown procedure for all transports
+     * Start graceful shutdown procedure for all transports
      */
     void shutdown();
 
@@ -214,7 +214,7 @@
     std::mutex transportMapMutex_ {};
 
     /**
-     * Transports are stored in this map in order to retreive them in case
+     * Transports are stored in this map in order to retrieve them in case
      * several accounts would share the same port number.
      */
     std::map<SipTransportDescr, pjsip_transport*> udpTransports_;
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sip_utils.cpp ring-20180816.2.e26b79f~ds1/daemon/src/sip/sip_utils.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sip_utils.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/sip_utils.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -192,7 +192,7 @@
 register_thread()
 {
     if (!pj_thread_is_registered()) {
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || defined RING_UWP
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || defined _MSC_VER
         static thread_local pj_thread_desc desc;
         static thread_local pj_thread_t *this_thread;
 #else
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipvoiplink.cpp ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipvoiplink.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipvoiplink.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipvoiplink.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -232,7 +232,7 @@
                     Manager::instance().startVoiceMessageNotification(account_id, voicemail);
             }
         } else if (request.find("MESSAGE") != std::string::npos) {
-            // Reply 200 immediatly (RFC 3428, ch. 7)
+            // Reply 200 immediately (RFC 3428, ch. 7)
             try_respond_stateless(endpt_, rdata, PJSIP_SC_OK, nullptr, nullptr, nullptr);
             // Process message content in case of multi-part body
             auto payloads = im::parseSipMessage(rdata->msg_info.msg);
@@ -396,7 +396,7 @@
         return PJ_FALSE;
     }
 
-    // Check if call has been transfered
+    // Check if call has been transferred
     pjsip_tx_data *tdata = 0;
 
     if (pjsip_inv_initial_answer(call->inv.get(), rdata, PJSIP_SC_TRYING, NULL, NULL, &tdata) != PJ_SUCCESS) {
@@ -452,7 +452,7 @@
 {
     // There is no way (at writing) to link a user data to a PJSIP transport.
     // So we obtain it from the global SIPVoIPLink instance that owns it.
-    // Be sure the broker's owner is not deleted during proccess
+    // Be sure the broker's owner is not deleted during process
     if (auto sipLink = getSIPVoIPLink()) {
         if (auto& broker = sipLink->sipTransportBroker)
             broker->transportStateChanged(tp, state, info);
@@ -781,7 +781,11 @@
         "</to_encoder></vc_primitive></media_control>";
 
     RING_DBG("Sending video keyframe request via SIP INFO");
-    call->sendSIPInfo(BODY, "media_control+xml");
+    try {
+        call->sendSIPInfo(BODY, "media_control+xml");
+    } catch (const std::exception& e) {
+        RING_WARN("Error sending video keyframe request: %s", e.what());
+    }
 }
 #endif
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipvoiplink.h ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipvoiplink.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/sip/sipvoiplink.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/sip/sipvoiplink.h	2018-08-16 15:09:51.000000000 +0000
@@ -68,10 +68,6 @@
 
 class SIPVoIPLink {
     public:
-#ifdef __ANDROID__
-        static void setSipLogger();
-#endif
-
         SIPVoIPLink();
         ~SIPVoIPLink();
 
@@ -80,9 +76,6 @@
          */
         void handleEvents();
 
-        /* Returns a list of all callIDs */
-        std::vector<std::string> getCallIDs();
-
         /**
          * Register a new keepalive registration timer to this endpoint
          */
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/threadloop.cpp ring-20180816.2.e26b79f~ds1/daemon/src/threadloop.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/threadloop.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/threadloop.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -45,6 +45,7 @@
     } catch (const std::exception& e) {
         RING_ERR("[threadloop:%p] Unwaited exception: %s", this, e.what());
     }
+    stop();
 }
 
 ThreadLoop::ThreadLoop(const std::function<bool()>& setup,
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/threadloop.h ring-20180816.2.e26b79f~ds1/daemon/src/threadloop.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/threadloop.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/threadloop.h	2018-08-16 15:09:51.000000000 +0000
@@ -30,11 +30,6 @@
 
 namespace ring {
 
-// FIXME: this is ugly
-// If condition A is false, print the error message in M and exit thread
-#define EXIT_IF_FAIL(A, ...) if (!(A)) { \
-        RING_ERR(__VA_ARGS__); loop_.exit(); }
-
 struct ThreadLoopException : public std::runtime_error {
     ThreadLoopException() : std::runtime_error("ThreadLoopException") {}
 };
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/turn_transport.cpp ring-20180816.2.e26b79f~ds1/daemon/src/turn_transport.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/turn_transport.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/turn_transport.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -336,11 +336,9 @@
 
     // TURN allocation setup
     pj_turn_alloc_param turn_alloc_param;
-	pj_turn_alloc_param_default(&turn_alloc_param);
-#ifndef RING_UWP // RING_UWP pjsip version is too old for now (need to have > 2.7.1)
+    pj_turn_alloc_param_default(&turn_alloc_param);
     if (params.authorized_family != 0)
         turn_alloc_param.af = params.authorized_family; // RFC 6156!!!
-#endif
 
     if (params.isPeerConnection)
         turn_alloc_param.peer_conn_type = PJ_TURN_TP_TCP; // RFC 6062!!!
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/upnp/upnp_context.cpp ring-20180816.2.e26b79f~ds1/daemon/src/upnp/upnp_context.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/src/upnp/upnp_context.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/upnp/upnp_context.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -1040,7 +1040,7 @@
     case UPNP_EVENT_SUBSCRIBE_COMPLETE:
         /* RING_DBG("UPnP: Control Point async subscription complete"); */
 
-        /* TODO: check if successfull */
+        /* TODO: check if successful */
 
         break;
 
@@ -1215,7 +1215,7 @@
                     /* failed to delete entry, skip it and try the next one */
                     ++entry_idx;
                 }
-                /* note: in the case that the entry deletion is successfull, we do not increment the entry
+                /* note: in the case that the entry deletion is successful, we do not increment the entry
                  *       idx as the number of entries has decreased by one */
             } else
                 ++entry_idx;
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/upnp/upnp_context.h ring-20180816.2.e26b79f~ds1/daemon/src/upnp/upnp_context.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/upnp/upnp_context.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/upnp/upnp_context.h	2018-08-16 15:09:51.000000000 +0000
@@ -148,7 +148,7 @@
     IGD* chooseIGD_unlocked() const;
     bool hasValidIGD_unlocked() const;
 
-    /* tries to add mapping, assumes you alreayd have lock on igd_mutex_ */
+    /* tries to add mapping, assumes you already have lock on igd_mutex_ */
     Mapping addMapping(IGD* igd,
                        uint16_t port_external,
                        uint16_t port_internal,
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/src/windirent.h ring-20180816.2.e26b79f~ds1/daemon/src/windirent.h
--- ring-20180712.2.f3b87a6~ds1/daemon/src/windirent.h	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/src/windirent.h	2018-08-16 15:09:51.000000000 +0000
@@ -590,7 +590,7 @@
             /* Got a file */
             p = &dirp->data;
         } else {
-            /* The very last entry has been processed or an error occured */
+            /* The very last entry has been processed or an error occurred */
             FindClose (dirp->handle);
             dirp->handle = INVALID_HANDLE_VALUE;
             p = NULL;
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/test/sip/test_SIP.cpp ring-20180816.2.e26b79f~ds1/daemon/test/sip/test_SIP.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/test/sip/test_SIP.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/test/sip/test_SIP.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -173,7 +173,7 @@
 void
 test_SIP::testSimpleIncomingIpCall()
 {
-    std::cout << ">>>> test simple incomming IP call <<<< " << '\n';
+    std::cout << ">>>> test simple incoming IP call <<<< " << '\n';
 
     CPPUNIT_ASSERT(Manager::instance().callFactory.empty());
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/account_factory/testAccount_factory.cpp ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/account_factory/testAccount_factory.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/account_factory/testAccount_factory.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/account_factory/testAccount_factory.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -75,7 +75,7 @@
 void
 Account_factoryTest::testAddRemoveSIPAccount()
 {
-    // verify if there is no account at the begining
+    // verify if there is no account at the beginning
     CPPUNIT_ASSERT(accountFactory->empty());
     CPPUNIT_ASSERT(accountFactory->accountCount()==0);
 
@@ -95,7 +95,7 @@
 void
 Account_factoryTest::testAddRemoveRINGAccount()
 {
-    // verify if there is no account at the begining
+    // verify if there is no account at the beginning
     CPPUNIT_ASSERT(accountFactory->empty());
     CPPUNIT_ASSERT(accountFactory->accountCount()==0);
 
@@ -115,7 +115,7 @@
 void
 Account_factoryTest::testClear()
 {
-    // verify if there is no account at the begining
+    // verify if there is no account at the beginning
     CPPUNIT_ASSERT(accountFactory->empty());
     CPPUNIT_ASSERT(accountFactory->accountCount()==0);
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/fileutils/testFileutils.cpp ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/fileutils/testFileutils.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/fileutils/testFileutils.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/fileutils/testFileutils.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -107,7 +107,7 @@
     CPPUNIT_ASSERT(isDirectory(NON_EXISTANT_PATH));
     CPPUNIT_ASSERT(removeAll(NON_EXISTANT_PATH_BASE) == 0);
     CPPUNIT_ASSERT(!isDirectory(NON_EXISTANT_PATH_BASE));
-    //remove an non existant directory
+    //remove an non existent directory
     CPPUNIT_ASSERT(removeAll(NON_EXISTANT_PATH_BASE) == -1);
 }
 
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/Makefile.am ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/Makefile.am
--- ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/Makefile.am	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/Makefile.am	2018-08-16 15:09:51.000000000 +0000
@@ -67,9 +67,22 @@
 check_PROGRAMS += ut_media_encoder
 ut_media_encoder_SOURCES = media/test_media_encoder.cpp
 
+#
+# media_decoder
+#
+check_PROGRAMS += ut_media_decoder
+ut_media_decoder_SOURCES = media/test_media_decoder.cpp
+
+#
 # media_filter
 #
 check_PROGRAMS += ut_media_filter
 ut_media_filter_SOURCES = media/test_media_filter.cpp
 
+#
+# resampler
+#
+check_PROGRAMS += ut_resampler
+ut_resampler_SOURCES = media/audio/test_resampler.cpp
+
 TESTS = $(check_PROGRAMS)
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/media/audio/test_resampler.cpp ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/media/audio/test_resampler.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/media/audio/test_resampler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/media/audio/test_resampler.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -0,0 +1,84 @@
+/*
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
+ *
+ *  Author: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ */
+
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include "dring.h"
+#include "libav_deps.h"
+#include "audio/resampler.h"
+
+#include "../test_runner.h"
+
+namespace ring { namespace test {
+
+class ResamplerTest : public CppUnit::TestFixture {
+public:
+    static std::string name() { return "resampler"; }
+
+    void setUp();
+    void tearDown();
+
+private:
+    void testResample();
+
+    CPPUNIT_TEST_SUITE(ResamplerTest);
+    CPPUNIT_TEST(testResample);
+    CPPUNIT_TEST_SUITE_END();
+
+    std::unique_ptr<Resampler> resampler_;
+};
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ResamplerTest, ResamplerTest::name());
+
+void
+ResamplerTest::setUp()
+{
+    DRing::init(DRing::InitFlag(DRing::DRING_FLAG_DEBUG | DRing::DRING_FLAG_CONSOLE_LOG));
+    libav_utils::ring_avcodec_init();
+}
+
+void
+ResamplerTest::tearDown()
+{
+    DRing::fini();
+}
+
+void
+ResamplerTest::testResample()
+{
+    const constexpr AudioFormat none(0, 0);
+    const constexpr AudioFormat infmt(44100, 1);
+    const constexpr AudioFormat outfmt(48000, 2);
+
+    resampler_.reset(new Resampler);
+
+    AudioBuffer inbuf(1024, infmt);
+    AudioBuffer outbuf(0, outfmt);
+
+    resampler_->resample(inbuf, outbuf);
+    CPPUNIT_ASSERT(outbuf.getFormat().sample_rate == 48000);
+    CPPUNIT_ASSERT(outbuf.getFormat().nb_channels == 2);
+}
+
+}} // namespace ring::test
+
+RING_TEST_RUNNER(ring::test::ResamplerTest::name());
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/media/test_media_decoder.cpp ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/media/test_media_decoder.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/media/test_media_decoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/media/test_media_decoder.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -0,0 +1,162 @@
+/*
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
+ *
+ *  Author: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ */
+
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+#include "dring.h"
+#include "fileutils.h"
+#include "libav_deps.h"
+#include "media_buffer.h"
+#include "media_decoder.h"
+#include "media_device.h"
+#include "media_io_handle.h"
+
+#include "../../test_runner.h"
+
+namespace ring { namespace test {
+
+class MediaDecoderTest : public CppUnit::TestFixture {
+public:
+    static std::string name() { return "media_decoder"; }
+
+    void setUp();
+    void tearDown();
+
+private:
+    void testAudioFile();
+
+    CPPUNIT_TEST_SUITE(MediaDecoderTest);
+    CPPUNIT_TEST(testAudioFile);
+    CPPUNIT_TEST_SUITE_END();
+
+    void writeWav(); // writes a minimal wav file to test decoding
+
+    std::unique_ptr<MediaDecoder> decoder_;
+    std::string filename_ = "test.wav";
+};
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(MediaDecoderTest, MediaDecoderTest::name());
+
+void
+MediaDecoderTest::setUp()
+{
+    DRing::init(DRing::InitFlag(DRing::DRING_FLAG_DEBUG | DRing::DRING_FLAG_CONSOLE_LOG));
+    libav_utils::ring_avcodec_init();
+    decoder_.reset(new MediaDecoder);
+}
+
+void
+MediaDecoderTest::tearDown()
+{
+    fileutils::remove(filename_);
+    DRing::fini();
+}
+
+void
+MediaDecoderTest::testAudioFile()
+{
+    if (!avcodec_find_decoder(AV_CODEC_ID_PCM_S16LE)
+        || !avcodec_find_decoder(AV_CODEC_ID_PCM_S16BE))
+        return; // no way to test the wav file, since it is in pcm signed 16
+
+    writeWav();
+
+    DeviceParams dev;
+    dev.input = filename_;
+    CPPUNIT_ASSERT(decoder_->openInput(dev) >= 0);
+    CPPUNIT_ASSERT(decoder_->setupFromAudioData() >= 0);
+
+    bool done = false;
+    while (!done) {
+        AudioFrame frame;
+        switch (decoder_->decode(frame)) {
+        case MediaDecoder::Status::FrameFinished:
+            CPPUNIT_ASSERT(frame.pointer()->sample_rate == decoder_->getStream().sampleRate);
+            CPPUNIT_ASSERT(frame.pointer()->channels == decoder_->getStream().nbChannels);
+            break;
+        case MediaDecoder::Status::DecodeError:
+        case MediaDecoder::Status::ReadError:
+            CPPUNIT_ASSERT_MESSAGE("Decode error", false);
+            done = true;
+            break;
+        case MediaDecoder::Status::EOFError:
+            done = true;
+            break;
+        case MediaDecoder::Status::Success:
+        default:
+            break;
+        }
+    }
+    CPPUNIT_ASSERT(done);
+}
+
+// write bytes to file using native endianness
+template<typename Word>
+static std::ostream& write(std::ostream& os, Word value, unsigned size)
+{
+    union {
+        uint32_t i;
+        char c[4];
+    } big = {0x01020304};
+
+    // big endian if 0x01 is the first byte
+    if (big.c[0] == 1) {
+        while (size)
+            os.put(static_cast<char>((value >> (8 * --size)) & 0xFF));
+        return os;
+    } else {
+        for (; size; --size, value >>= 8)
+            os.put(static_cast<char>(value & 0xFF));
+        return os;
+    }
+}
+
+void
+MediaDecoderTest::writeWav()
+{
+    auto f = std::ofstream(filename_, std::ios::binary);
+    f << "RIFF----WAVEfmt ";
+    write(f, 16, 4); // no extension data
+    write(f, 1, 2); // PCM integer samples
+    write(f, 1, 2); // channels
+    write(f, 8000, 4); // sample rate
+    write(f, 8000 * 1 * 2, 4); // sample rate * channels * bytes per sample
+    write(f, 4, 2); // data block size
+    write(f, 2 * 8, 2); // bits per sample
+    size_t dataChunk = f.tellp();
+    f << "data----";
+
+    // fill file with silence
+    // make sure there is more than 1 AVFrame in the file
+    for (int i = 0; i < 8192; ++i)
+        write(f, 0, 2);
+
+    size_t length = f.tellp();
+    f.seekp(dataChunk + 4);
+    write(f, length - dataChunk + 8, 4);
+    f.seekp(4);
+    write(f, length - 8, 4);
+}
+
+}} // namespace ring::test
+
+RING_TEST_RUNNER(ring::test::MediaDecoderTest::name());
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/media/test_media_filter.cpp ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/media/test_media_filter.cpp
--- ring-20180712.2.f3b87a6~ds1/daemon/test/unitTest/media/test_media_filter.cpp	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/test/unitTest/media/test_media_filter.cpp	2018-08-16 15:09:51.000000000 +0000
@@ -140,8 +140,7 @@
     CPPUNIT_ASSERT(filter_->initialize(filterSpec, params) >= 0);
 
     // apply filter
-    CPPUNIT_ASSERT(filter_->feedInput(frame_) >= 0);
-    frame_ = filter_->readOutput();
+    frame_ = filter_->apply(frame_);
     CPPUNIT_ASSERT(frame_);
 
     // check if the filter worked
@@ -178,8 +177,7 @@
     CPPUNIT_ASSERT(filter_->initialize(filterSpec, params) >= 0);
 
     // apply filter
-    CPPUNIT_ASSERT(filter_->feedInput(frame_) >= 0);
-    frame_ = filter_->readOutput();
+    frame_ = filter_->apply(frame_);
     CPPUNIT_ASSERT(frame_);
 
     // check if the filter worked
@@ -259,17 +257,19 @@
     // prepare filter
     CPPUNIT_ASSERT(filter_->initialize(filterSpec, params) >= 0);
 
+    // check input params
+    auto msin = filter_->getInputParams();
+    CPPUNIT_ASSERT(msin.format == format && msin.width == width && msin.height == height);
+
     // output params should now be valid
-    auto ms = filter_->getOutputParams();
-    CPPUNIT_ASSERT(ms.format >= 0 && ms.width > 0 && ms.height > 0);
+    auto msout = filter_->getOutputParams();
+    CPPUNIT_ASSERT(msout.format >= 0 && msout.width > 0 && msout.height > 0);
 }
 
 void
 MediaFilterTest::testComplexFilterParams()
 {
     std::string filterSpec = "[main] [top] overlay=main_w-overlay_w-10:main_h-overlay_h-10";
-    std::string main = "main";
-    std::string top = "top";
 
     // constants
     const constexpr int width1 = 320;
@@ -292,6 +292,12 @@
     vec.push_back(params1);
     CPPUNIT_ASSERT(filter_->initialize(filterSpec, vec) >= 0);
 
+    // check input params
+    auto main = filter_->getInputParams("main");
+    CPPUNIT_ASSERT(main.format == format && main.width == width1 && main.height == height1);
+    auto top = filter_->getInputParams("top");
+    CPPUNIT_ASSERT(top.format == format && top.width == width2 && top.height == height2);
+
     // output params should now be valid
     auto ms = filter_->getOutputParams();
     CPPUNIT_ASSERT(ms.format >= 0 && ms.width == width1 && ms.height == height1);
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/tools/asterisk/extensions.conf ring-20180816.2.e26b79f~ds1/daemon/tools/asterisk/extensions.conf
--- ring-20180712.2.f3b87a6~ds1/daemon/tools/asterisk/extensions.conf	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/tools/asterisk/extensions.conf	2018-08-16 15:09:51.000000000 +0000
@@ -303,7 +303,7 @@
 ; The SWITCH statement permits a server to share the dialplan with
 ; another server. Use with care: Reciprocal switch statements are not
 ; allowed (e.g. both A -> B and B -> A), and the switched server needs
-; to be on-line or else dialing can be severly delayed.
+; to be on-line or else dialing can be severely delayed.
 ;
 [iaxprovider]
 ;switch => IAX2/user:[key]@myserver/mycontext
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/tools/asterisk/sip.conf ring-20180816.2.e26b79f~ds1/daemon/tools/asterisk/sip.conf
--- ring-20180712.2.f3b87a6~ds1/daemon/tools/asterisk/sip.conf	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/tools/asterisk/sip.conf	2018-08-16 15:09:51.000000000 +0000
@@ -83,7 +83,7 @@
 ;	1. Asterisk checks the SIP From: address username and matches against
 ;	   names of devices with type=user
 ;	   The name is the text between square brackets [name]
-;	2. Asterisk checks the From: addres and matches the list of devices
+;	2. Asterisk checks the From: address and matches the list of devices
 ;	   with a type=peer
 ;	3. Asterisk checks the IP address (and port number) that the INVITE
 ;	   was sent from and matches against any devices with type=peer
@@ -219,7 +219,7 @@
                                 ; ability to place SIP calls based on domain
                                 ; names to some other SIP users on the Internet
                                 ; Specifying a port in a SIP peer definition or
-                                ; when dialing outbound calls will supress SRV
+                                ; when dialing outbound calls will suppress SRV
                                 ; lookups for that peer or call.
 
 ;pedantic=yes                   ; Enable checking of tags in headers,
@@ -786,7 +786,7 @@
 ; 'comedia RTP handling' refers to the technique of sending RTP to the port that the
 ; the other endpoint's RTP arrived from, and means 'connection-oriented media'. This is
 ; only partially related to RFC 4145 which was referred to as COMEDIA while it was in
-; draft form. This method is used to accomodate endpoints that may be located behind
+; draft form. This method is used to accommodate endpoints that may be located behind
 ; NAT devices, and as such the port number they tell Asterisk to send RTP packets to
 ; for their media streams is not actual port number that will be used on the nearer
 ; side of the NAT.
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/tools/cpplint.py3 ring-20180816.2.e26b79f~ds1/daemon/tools/cpplint.py3
--- ring-20180712.2.f3b87a6~ds1/daemon/tools/cpplint.py3	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/tools/cpplint.py3	2018-08-16 15:09:51.000000000 +0000
@@ -6299,7 +6299,7 @@
       try:
           _valid_extensions = set(val.split(','))
       except ValueError:
-          PrintUsage('Extensions must be comma seperated list.')
+          PrintUsage('Extensions must be comma separated list.')
 
   if not filenames:
     PrintUsage('No files were specified.')
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/controler.py ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/controler.py
--- ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/controler.py	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/controler.py	2018-08-16 15:09:51.000000000 +0000
@@ -18,7 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
 #
 
-"""DRing controling class through DBUS"""
+"""DRing controlling class through DBUS"""
 
 import sys
 import os
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/dringctrl.py ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/dringctrl.py
--- ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/dringctrl.py	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/dringctrl.py	2018-08-16 15:09:51.000000000 +0000
@@ -33,7 +33,7 @@
     exit(1)
 
 from errors import *
-from controler import DRingCtrl
+from controller import DRingCtrl
 from tester import DRingTester
 
 if __name__ == "__main__":
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/dringctrl_testdbus.py ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/dringctrl_testdbus.py
--- ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/dringctrl_testdbus.py	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/dringctrl_testdbus.py	2018-08-16 15:09:51.000000000 +0000
@@ -25,7 +25,7 @@
 
 
 # Define function callback to emulate UA behavior on
-# recieving a call (peer hangup))
+# receiving a call (peer hangup))
 def acceptOnIncomingCall(sflphone):
 
     sflphone.Accept(sflphone.currentCallId)
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/sendfile.py ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/sendfile.py
--- ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/sendfile.py	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/sendfile.py	2018-08-16 15:09:51.000000000 +0000
@@ -17,14 +17,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
 
-from controler import DRingCtrl
+from controller import DRingCtrl
 
 import argparse
 import sys
 import signal
 import os.path
 
-class Controler(DRingCtrl):
+class Controller(DRingCtrl):
     def onDataTransferEvent(self, transferId, code):
         if code == 6:
             print("transfer %u has been cancelled by host" % transferId)
@@ -39,7 +39,7 @@
 parser.add_argument('--displayname', help='Name displayed to peer', metavar='<displayname>', type=str)
 
 args = parser.parse_args()
-ctrl = Controler(sys.argv[0], False)
+ctrl = Controller(sys.argv[0], False)
 
 if not args.account:
     for account in ctrl.getAllEnabledAccounts():
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/sippwrap.py ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/sippwrap.py
--- ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/sippwrap.py	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/sippwrap.py	2018-08-16 15:09:51.000000000 +0000
@@ -21,7 +21,7 @@
 import os
 
 class SippWrapper:
-    """ Wrapper taht allow for managing sipp command line easily """
+    """ Wrapper that allow for managing sipp command line easily """
 
     def __init__(self):
         self.commandLine = "./sipp"
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/test_dring_dbus_interface.py ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/test_dring_dbus_interface.py
--- ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/test_dring_dbus_interface.py	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/test_dring_dbus_interface.py	2018-08-16 15:09:51.000000000 +0000
@@ -64,7 +64,7 @@
         sippInstance.launch()
 
     def find_sipp_pid(self):
-        # Retreive the PID of the last
+        # Retrieve the PID of the last
         # The /proc/PID/cmdline contain the command line from
         pids = [int(x) for x in os.listdir("/proc") if x.isdigit()]
         sippPid = [pid for pid in pids if "sipp" in open("/proc/" + str(pid) + "/cmdline").readline()]
diff -Nru ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/tester.py ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/tester.py
--- ring-20180712.2.f3b87a6~ds1/daemon/tools/dringctrl/tester.py	2018-07-12 21:48:40.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/daemon/tools/dringctrl/tester.py	2018-08-16 15:09:51.000000000 +0000
@@ -252,7 +252,7 @@
             if (currBitrate > self.maxBitrate):
                 currBitrate = self.minBitrate
 
-        print("**[SUCESS] VIDEO Bitrate Test")
+        print("**[SUCCESS] VIDEO Bitrate Test")
         print("**[END] VIDEO Bitrate Test")
 
 # testSimultaneousLoopCallDht
@@ -281,7 +281,7 @@
 
             count += 1
 
-        print("**[SUCESS] Simultaneous DHT call test")
+        print("**[SUCCESS] Simultaneous DHT call test")
         print("**[END] Simultaneous DHT call test")
 
 
diff -Nru ring-20180712.2.f3b87a6~ds1/debian/changelog ring-20180816.2.e26b79f~ds1/debian/changelog
--- ring-20180712.2.f3b87a6~ds1/debian/changelog	2018-07-19 08:44:25.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/debian/changelog	2018-08-23 23:43:53.000000000 +0000
@@ -1,8 +1,14 @@
-ring (20180712.2.f3b87a6~ds1-1build1) cosmic; urgency=medium
+ring (20180816.2.e26b79f~ds1-3) unstable; urgency=medium
 
-  * No-change rebuild for ffmpeg soname changes.
+  * New upstream version.
 
- -- Matthias Klose <doko@ubuntu.com>  Thu, 19 Jul 2018 08:44:25 +0000
+ -- Alexandre Viau <aviau@debian.org>  Thu, 23 Aug 2018 19:43:53 -0400
+
+ring (20180712.2.f3b87a6~ds1-2) unstable; urgency=medium
+
+  * No longer depend on boost. (Closes: #904498)
+
+ -- Alexandre Viau <aviau@debian.org>  Thu, 23 Aug 2018 16:08:06 -0400
 
 ring (20180712.2.f3b87a6~ds1-1) unstable; urgency=medium
 
diff -Nru ring-20180712.2.f3b87a6~ds1/debian/control ring-20180816.2.e26b79f~ds1/debian/control
--- ring-20180712.2.f3b87a6~ds1/debian/control	2018-07-17 22:25:52.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/debian/control	2018-08-23 23:43:53.000000000 +0000
@@ -36,9 +36,6 @@
                libexpat1-dev,
                libpcre3-dev,
                libyaml-cpp-dev,
-               libboost-dev,
-               libboost-system-dev,
-               libboost-random-dev,
                libsndfile1-dev,
                libxext-dev,
                libxfixes-dev,
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_debian_8 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_debian_8
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_debian_8	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_debian_8	2018-08-16 15:09:36.000000000 +0000
@@ -33,13 +33,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_debian_8_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_debian_8_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_debian_8_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_debian_8_i386	2018-08-16 15:09:36.000000000 +0000
@@ -33,13 +33,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_debian_9 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_debian_9
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_debian_9	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_debian_9	2018-08-16 15:09:36.000000000 +0000
@@ -34,13 +34,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_debian_9_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_debian_9_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_debian_9_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_debian_9_i386	2018-08-16 15:09:36.000000000 +0000
@@ -34,13 +34,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_22 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_22
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_22	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_22	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
 	libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -25,7 +24,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_22_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_22_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_22_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_22_i386	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
 	libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -25,7 +24,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_23 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_23
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_23	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_23	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
 	libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -25,7 +24,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_23_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_23_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_23_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_23_i386	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
 	libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -25,7 +24,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_24 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_24
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_24	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_24	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
 	libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -25,7 +24,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_24_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_24_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_24_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_24_i386	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
 	libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -25,7 +24,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_25 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_25
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_25	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_25	2018-08-16 15:09:36.000000000 +0000
@@ -13,7 +13,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
 	libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -22,7 +21,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_25_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_25_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_25_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_25_i386	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
 	libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -25,7 +24,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_26 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_26
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_26	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_26	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
         libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -25,7 +24,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_27 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_27
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_27	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_27	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
         libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -25,7 +24,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_28 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_28
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_fedora_28	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_fedora_28	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,6 @@
         speexdsp-devel \
         pulseaudio-libs-devel \
         libcanberra-devel \
-        libsamplerate-devel \
         libtool \
         dbus-devel \
         expat-devel \
@@ -25,7 +24,6 @@
         boost-devel \
         dbus-c++-devel \
         dbus-devel \
-        libsndfile-devel \
         libXext-devel \
         libXfixes-devel \
         yasm \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_14.04 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_14.04
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_14.04	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_14.04	2018-08-16 15:09:36.000000000 +0000
@@ -34,13 +34,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_14.04_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_14.04_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_14.04_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_14.04_i386	2018-08-16 15:09:36.000000000 +0000
@@ -34,13 +34,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_16.04 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_16.04
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_16.04	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_16.04	2018-08-16 15:09:36.000000000 +0000
@@ -34,13 +34,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_16.04_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_16.04_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_16.04_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_16.04_i386	2018-08-16 15:09:36.000000000 +0000
@@ -34,13 +34,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_16.10 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_16.10
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_16.10	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_16.10	2018-08-16 15:09:36.000000000 +0000
@@ -44,13 +44,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_16.10_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_16.10_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_16.10_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_16.10_i386	2018-08-16 15:09:36.000000000 +0000
@@ -44,13 +44,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_17.04 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_17.04
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_17.04	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_17.04	2018-08-16 15:09:36.000000000 +0000
@@ -45,13 +45,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_17.04_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_17.04_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_17.04_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_17.04_i386	2018-08-16 15:09:36.000000000 +0000
@@ -45,13 +45,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_17.10 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_17.10
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_17.10	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_17.10	2018-08-16 15:09:36.000000000 +0000
@@ -45,13 +45,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_17.10_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_17.10_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_17.10_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_17.10_i386	2018-08-16 15:09:36.000000000 +0000
@@ -45,13 +45,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_18.04 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_18.04
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_18.04	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_18.04	2018-08-16 15:09:36.000000000 +0000
@@ -35,13 +35,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_18.04_i386 ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_18.04_i386
--- ring-20180712.2.f3b87a6~ds1/docker/Dockerfile_ubuntu_18.04_i386	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docker/Dockerfile_ubuntu_18.04_i386	2018-08-16 15:09:36.000000000 +0000
@@ -35,13 +35,11 @@
         autotools-dev \
         gettext \
         libpulse-dev \
-        libsamplerate0-dev \
         libasound2-dev \
         libexpat1-dev \
         libpcre3-dev \
         libyaml-cpp-dev \
         libboost-dev \
-        libsndfile1-dev \
         libxext-dev \
         libxfixes-dev \
         libspeex-dev \
diff -Nru ring-20180712.2.f3b87a6~ds1/docs/source/dev/compiling_and_installing/gnome_client.rst ring-20180816.2.e26b79f~ds1/docs/source/dev/compiling_and_installing/gnome_client.rst
--- ring-20180712.2.f3b87a6~ds1/docs/source/dev/compiling_and_installing/gnome_client.rst	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docs/source/dev/compiling_and_installing/gnome_client.rst	2018-08-16 15:09:36.000000000 +0000
@@ -38,7 +38,7 @@
     cmake ..
     make
 
-The following options are often usefull to append to the cmake line:
+The following options are often useful to append to the cmake line:
 
 .. code-block:: none
 
diff -Nru ring-20180712.2.f3b87a6~ds1/docs/source/dev/compiling_and_installing/lrc.rst ring-20180816.2.e26b79f~ds1/docs/source/dev/compiling_and_installing/lrc.rst
--- ring-20180712.2.f3b87a6~ds1/docs/source/dev/compiling_and_installing/lrc.rst	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docs/source/dev/compiling_and_installing/lrc.rst	2018-08-16 15:09:36.000000000 +0000
@@ -16,7 +16,7 @@
     make -j3
     make install
 
-The following options are often usefull to append to the cmake line:
+The following options are often useful to append to the cmake line:
 
 .. code-block:: none
 
diff -Nru ring-20180712.2.f3b87a6~ds1/docs/source/dev/contributing.rst ring-20180816.2.e26b79f~ds1/docs/source/dev/contributing.rst
--- ring-20180712.2.f3b87a6~ds1/docs/source/dev/contributing.rst	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docs/source/dev/contributing.rst	2018-08-16 15:09:36.000000000 +0000
@@ -17,7 +17,7 @@
 In each Ring submodule there is a ``.gitreview`` file. It contains all the
 necessary info to send a patchset to our gerrit server.
 
-After you commited your changes (one or multiple commits) you can submit them
+After you committed your changes (one or multiple commits) you can submit them
 with:
 
 .. code-block:: bash
diff -Nru ring-20180712.2.f3b87a6~ds1/docs/source/dev/test/daemon.rst ring-20180816.2.e26b79f~ds1/docs/source/dev/test/daemon.rst
--- ring-20180712.2.f3b87a6~ds1/docs/source/dev/test/daemon.rst	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/docs/source/dev/test/daemon.rst	2018-08-16 15:09:36.000000000 +0000
@@ -3,7 +3,7 @@
 
 The unit testing framework
 ##########################
-We use CppUnit on GNU ring project. You can find a simple tutorial with code exemple on the  `official website <http://cppunit.sourceforge.net/doc/cvs/cppunit_cookbook.html>`_.
+We use CppUnit on GNU ring project. You can find a simple tutorial with code example on the  `official website <http://cppunit.sourceforge.net/doc/cvs/cppunit_cookbook.html>`_.
 
 Tests
 #####
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/CMakeLists.txt ring-20180816.2.e26b79f~ds1/lrc/CMakeLists.txt
--- ring-20180712.2.f3b87a6~ds1/lrc/CMakeLists.txt	2018-07-12 21:48:41.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/CMakeLists.txt	2018-08-16 15:09:52.000000000 +0000
@@ -20,11 +20,24 @@
 INCLUDE(CMakePackageConfigHelpers)
 INCLUDE(GenerateExportHeader)
 
-ADD_DEFINITIONS(
-   ${QT_DEFINITIONS}
-   -fexceptions
-   -O2
-)
+option (ENABLE_SHARED "Build shared library" ON)
+
+string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)
+if(CMAKE_GENERATOR_SHORT MATCHES "Visual Studio ")
+    message(STATUS "Generating VS project")
+    set(CMAKE_CXX_COMPILER_ID "MSVC")
+    set(ENABLE_TEST false)
+    set(ENABLE_STATIC true)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /W0")
+endif()
+
+if (NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC"))
+    ADD_DEFINITIONS(
+       ${QT_DEFINITIONS}
+       -fexceptions
+       -O2
+    )
+endif()
 
 # Options
 set(CHK_FREEABLE_BEFORE_ERASE_ACCOUNT_DESCRIPTION
@@ -83,39 +96,41 @@
   SET(ENABLE_LIBWRAP true) # because mocks use the same interface present in src/qtwrapper
 ENDIF()
 
+if (NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC"))
 # Enable some useful warnings
-ADD_DEFINITIONS(
-   -Wall
-   -Wextra
-   -Wmissing-declarations
-   -Wmissing-noreturn
-   -Wpointer-arith
-   -Wcast-align
-   -Wwrite-strings
-   -Wformat-nonliteral
-   -Wformat-security
-   -Wswitch-enum
-   -Winit-self
-   -Wmissing-include-dirs
-   -Wundef
-   -Wmissing-format-attribute
-   -Wno-reorder
-   -Wunused
-   -Wuninitialized
-   -Woverloaded-virtual
-   -Wunused-value
-   -pedantic
-   -Wnonnull
-   -Wsequence-point
-   #-Wsystem-headers
-   -Wsizeof-pointer-memaccess
-   #-Wuseless-cast
-   -Wvarargs
-
-   #See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55578
-   -Wno-unused-function
-   -Wno-attributes
-)
+    ADD_DEFINITIONS(
+       -Wall
+       -Wextra
+       -Wmissing-declarations
+       -Wmissing-noreturn
+       -Wpointer-arith
+       -Wcast-align
+       -Wwrite-strings
+       -Wformat-nonliteral
+       -Wformat-security
+       -Wswitch-enum
+       -Winit-self
+       -Wmissing-include-dirs
+       -Wundef
+       -Wmissing-format-attribute
+       -Wno-reorder
+       -Wunused
+       -Wuninitialized
+       -Woverloaded-virtual
+       -Wunused-value
+       -pedantic
+       -Wnonnull
+       -Wsequence-point
+       #-Wsystem-headers
+       -Wsizeof-pointer-memaccess
+       #-Wuseless-cast
+       -Wvarargs
+
+       #See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55578
+       -Wno-unused-function
+       -Wno-attributes
+    )
+endif()
 
 #Add more warnings for compilers that support it. I used this command:
 #curl https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/Warning-Options.html | \
@@ -198,7 +213,9 @@
 
    ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/src/qtwrapper)
    ADD_DEFINITIONS(-DENABLE_LIBWRAP=true) # Use native calls (no dbus)
-   ADD_DEFINITIONS(-Wno-unknown-pragmas)
+   if (NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC"))
+      ADD_DEFINITIONS(-Wno-unknown-pragmas)
+   endif()
    SET(ENABLE_QT5 true) # Use Qt5
    MESSAGE(STATUS "Compiling with qtwrapper enabled, Qt5 enabled.")
 
@@ -235,16 +252,18 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_BINARY_DIR})
 
-# Build dbus api
-IF(DEFINED RING_XML_INTERFACES_DIR)
-    SET (dbus_xml_introspecs_path ${RING_XML_INTERFACES_DIR})
-ELSEIF(EXISTS "${RING_BUILD_DIR}/../bin/dbus")
-    SET (dbus_xml_introspecs_path ${RING_BUILD_DIR}/../bin/dbus)
-ELSE()
-    SET (dbus_xml_introspecs_path ${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces)
-ENDIF()
+IF(NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC"))
+    # Build dbus api
+    IF(DEFINED RING_XML_INTERFACES_DIR)
+        SET (dbus_xml_introspecs_path ${RING_XML_INTERFACES_DIR})
+    ELSEIF(EXISTS "${RING_BUILD_DIR}/../bin/dbus")
+        SET (dbus_xml_introspecs_path ${RING_BUILD_DIR}/../bin/dbus)
+    ELSE()
+        SET (dbus_xml_introspecs_path ${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces)
+    ENDIF()
 
-MESSAGE(STATUS "Using Ring DBus-XML interfaces in ${dbus_xml_introspecs_path}")
+    MESSAGE(STATUS "Using Ring DBus-XML interfaces in ${dbus_xml_introspecs_path}")
+ENDIF()
 
 #File to compile
 SET( libringclient_LIB_SRCS
@@ -693,45 +712,59 @@
 IF(NOT ${ENABLE_TEST} MATCHES true)
   QT5_WRAP_CPP(LIB_HEADER_MOC ${libringclient_PRIVATE_HDRS})
 ENDIF()
-ADD_LIBRARY( ringclient SHARED ${libringclient_LIB_SRCS} ${LIB_HEADER_MOC} )
 
 IF(NOT ${ENABLE_STATIC} MATCHES false)
-   ADD_LIBRARY( ringclient_static  STATIC ${libringclient_LIB_SRCS} ${LIB_HEADER_MOC} )
-   target_link_libraries(ringclient_static Qt5::Core)
-   TARGET_LINK_LIBRARIES( ringclient_static
-      -lpthread
-      ${QT_QTDBUS_LIBRARY}
-      ${QT_QTCORE_LIBRARY}
-      Qt5::Sql
-      )
-   SET_TARGET_PROPERTIES( ringclient_static
-      PROPERTIES VERSION ${GENERIC_LIB_VERSION}
-   )
-ENDIF()
-
-target_link_libraries(ringclient Qt5::Core)
+    message(STATUS "Configuring as static lib")
+    add_library( ringclient_static  STATIC ${libringclient_LIB_SRCS} ${LIB_HEADER_MOC} )
+    target_link_libraries(ringclient_static Qt5::Core)
+    target_link_libraries( ringclient_static
+       -lpthread
+       ${QT_QTDBUS_LIBRARY}
+       ${QT_QTCORE_LIBRARY}
+       Qt5::Sql
+       )
+    SET_TARGET_PROPERTIES( ringclient_static
+       PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+    )
+ENDIF()
+
+if (ENABLE_SHARED)
+    message(STATUS "Configuring as shared lib")
+    add_library(ringclient SHARED ${libringclient_LIB_SRCS} ${LIB_HEADER_MOC} )
+    target_link_libraries(ringclient Qt5::Core)
+endif()
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  target_link_libraries(ringclient Qt5::DBus)
-  IF(NOT ${ENABLE_STATIC} MATCHES false)
+    if (ENABLE_SHARED)
+        target_link_libraries(ringclient Qt5::DBus)
+    endif()
+  IF(${ENABLE_STATIC} MATCHES true)
       target_link_libraries(ringclient_static Qt5::DBus)
   ENDIF()
 ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-   FIND_PACKAGE(Qt5Concurrent)
+    FIND_PACKAGE(Qt5Concurrent)
+
+    #For some reason, QSemaphore wont compile on Windows without QtConcurrent
+    if(${ENABLE_STATIC} MATCHES true)
+        target_link_libraries(ringclient_static Qt5::Concurrent)
+    endif()
 
-   #For some reason, QSemaphore wont compile on Windows without QtConcurrent
-   target_link_libraries(ringclient Qt5::Concurrent)
+    if(ENABLE_SHARED)
+        target_link_libraries(ringclient Qt5::Concurrent)
+    endif()
 ENDIF()
 
 
-TARGET_LINK_LIBRARIES( ringclient
-   -lpthread
-   ${QT_QTCORE_LIBRARY}
-   Qt5::Sql
-)
+IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    TARGET_LINK_LIBRARIES( ringclient
+        -lpthread
+        ${QT_QTCORE_LIBRARY}
+        Qt5::Sql
+        )
+ENDIF()
 
 IF(${ENABLE_LIBWRAP} MATCHES true)
-   IF(NOT ${ring_BIN} MATCHES "ring_BIN-NOTFOUND")
+   IF((NOT ${ring_BIN} MATCHES "ring_BIN-NOTFOUND") AND ENABLE_SHARED)
       TARGET_LINK_LIBRARIES( ringclient
          qtwrapper
          ${ring_BIN}
@@ -739,7 +772,7 @@
    ELSE()
       # Allow building with undefined symbols when only the daemon headers are provided
       # It speeds up our CI builds
-      IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+      IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
          SET_TARGET_PROPERTIES( ringclient PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" )
       ENDIF()
    ENDIF()
@@ -749,6 +782,7 @@
          ${ring_BIN}
       )
    ENDIF()
+
 ELSE()
    TARGET_LINK_LIBRARIES( ringclient
       ${QT_QTDBUS_LIBRARY}
@@ -767,9 +801,11 @@
    ENDIF()
 ENDIF()
 
-SET_TARGET_PROPERTIES( ringclient
-  PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_VERSION}
-)
+if(ENABLE_SHARED)
+    SET_TARGET_PROPERTIES( ringclient
+      PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_VERSION}
+    )
+endif()
 
 SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include)
 
@@ -814,21 +850,22 @@
 #higher priority than the prefixed one.
 STRING(REPLACE "${CMAKE_LIBRARY_ARCHITECTURE}" "" SANE_LIBRARY_PATH "${CMAKE_INSTALL_FULL_LIBDIR}" )
 
-INSTALL( TARGETS ringclient
-  ARCHIVE DESTINATION ${SANE_LIBRARY_PATH}
-  RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-  LIBRARY DESTINATION ${SANE_LIBRARY_PATH}
-  DESTINATION ${SANE_LIBRARY_PATH}
-)
-
 IF(NOT ${ENABLE_STATIC} MATCHES false)
-   INSTALL( TARGETS ringclient_static
-      ARCHIVE DESTINATION ${SANE_LIBRARY_PATH}
-      LIBRARY DESTINATION ${SANE_LIBRARY_PATH}
-      DESTINATION ${SANE_LIBRARY_PATH}
-   )
+    INSTALL( TARGETS ringclient_static
+        ARCHIVE DESTINATION ${SANE_LIBRARY_PATH}
+        LIBRARY DESTINATION ${SANE_LIBRARY_PATH}
+        DESTINATION ${SANE_LIBRARY_PATH}
+    )
 ENDIF()
 
+if(ENABLE_SHARED)
+    INSTALL( TARGETS ringclient
+        ARCHIVE DESTINATION ${SANE_LIBRARY_PATH}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+        LIBRARY DESTINATION ${SANE_LIBRARY_PATH}
+        DESTINATION ${SANE_LIBRARY_PATH}
+    )
+endif()
 
 SET(LIB_INSTALL_DIR ${SANE_LIBRARY_PATH})
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/INSTALL ring-20180816.2.e26b79f~ds1/lrc/INSTALL
--- ring-20180712.2.f3b87a6~ds1/lrc/INSTALL	2018-07-12 21:48:41.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/INSTALL	2018-08-16 15:09:52.000000000 +0000
@@ -17,7 +17,7 @@
 	mkdir -p build
 	cd build
 	cmake ..
-        	The following options are often usefull to append to the cmake line:
+        	The following options are often useful to append to the cmake line:
                 -DRING_BUILD_DIR=<daemon install location>
                 -DRING_XML_INTERFACES_DIR=<daemon dbus interface definitions directory>
                 -DCMAKE_INSTALL_PREFIX=<install location>
@@ -74,7 +74,7 @@
 	mkdir -p build-test
 	cd build-test
 	cmake .. -DENABLE_TEST=true
-        	The following options are often usefull to append to the cmake line:
+        	The following options are often useful to append to the cmake line:
                 -DRING_BUILD_DIR=<daemon install location>
                 -DRING_XML_INTERFACES_DIR=<daemon dbus interface definitions directory>
                 -DCMAKE_INSTALL_PREFIX=<install location>
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/make-lrc.bat ring-20180816.2.e26b79f~ds1/lrc/make-lrc.bat
--- ring-20180712.2.f3b87a6~ds1/lrc/make-lrc.bat	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/make-lrc.bat	2018-08-16 15:09:52.000000000 +0000
@@ -0,0 +1,141 @@
+:: Ring - native Windows LRC project generator
+
+@echo off
+setlocal
+
+if "%1" == "/?" goto Usage
+if "%~1" == "" goto Usage
+
+set doGen=N
+set doBuild=N
+
+set SCRIPTNAME=%~nx0
+
+if "%1"=="gen" (
+    set doGen=Y
+) else if "%1"=="build" (
+    set doBuild=Y
+) else (
+    goto Usage
+)
+
+set arch=N
+
+shift
+:ParseArgs
+if "%1" == "" goto FinishedArgs
+if /I "%1"=="x86" (
+    set arch=x86
+) else if /I "%1"=="x64" (
+    set arch=x64
+) else (
+    goto Usage
+)
+shift
+goto ParseArgs
+
+:FinishedArgs
+if "%arch%"=="x86" (
+    set MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=Release /p:Platform=Win32 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+) else if "%arch%"=="x64" (
+    set MSBUILD_ARGS=/nologo /p:useenv=true /p:Configuration=Release /p:Platform=x64 /verbosity:normal /maxcpucount:%NUMBER_OF_PROCESSORS%
+)
+
+@setlocal
+
+set VSInstallerFolder="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
+if %PROCESSOR_ARCHITECTURE%==x86 set VSInstallerFolder="%ProgramFiles%\Microsoft Visual Studio\Installer"
+
+pushd %VSInstallerFolder%
+for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
+  set VSLATESTDIR=%%i
+)
+popd
+
+echo VS Installation folder: %VSLATESTDIR%
+
+if not exist "%VSLATESTDIR%\VC\Auxiliary\Build\vcvarsall.bat" (
+    echo:
+    echo VSInstallDir not found or not installed correctly.
+    goto cleanup
+)
+
+if %PROCESSOR_ARCHITECTURE%==x86 (
+    set Comp_x86=x86 10.0.15063.0
+    set Comp_x64=x86_amd64 10.0.15063.0
+) else (
+    set Comp_x86=amd64_x86 10.0.15063.0
+    set Comp_x64=amd64 10.0.15063.0
+)
+
+set path=%path:"=%
+if "%arch%"=="x86" (
+    call "%VSLATESTDIR%"\\VC\\Auxiliary\\Build\\vcvarsall.bat %Comp_x86%
+) else if "%arch%"=="x64" (
+    call "%VSLATESTDIR%"\\VC\\Auxiliary\\Build\\vcvarsall.bat %Comp_x64%
+)
+
+if "%arch%" neq "N" (
+    if "%doGen%" neq "N" (
+        goto genLRC
+    ) else if "%doBuild%" neq "N" (
+		goto buildLRC
+    )
+    goto :eof
+)
+goto Usage
+
+:genLRC
+setlocal EnableDelayedExpansion
+set DaemonDir=%cd%\\..\\daemon
+mkdir msvc
+cd msvc
+set PATH=C:\\Program Files\\CMake\\bin\\;%PATH%
+if "echo QtDir is: %QtDir%"=="" (
+    echo Error: QtDir not specified
+    goto cleanup
+)
+set CMAKE_GENERATOR_STRING=""
+set CMAKE_OPTIONS=""
+if "%arch%"=="x86" (
+    set CMAKE_GENERATOR_STRING="Visual Studio 15 2017 Win32"
+    set QtCmakeDir=%QtDir%\\msvc2017\\lib\\cmake
+    set CMAKE_OPTIONS=-DQt5Core_DIR=!QtCmakeDir!\\Qt5Core -DQt5Sql_DIR=!QtCmakeDir!\\Qt5Sql -DQt5LinguistTools_DIR=!QtCmakeDir!\\Qt5LinguistTools -DQt5Concurrent_DIR=!QtCmakeDir!\\Qt5Concurrent -Dring_BIN=!DaemonDir!\MSVC\x86\ReleaseLib_win32\bin\dring.lib -DRING_INCLUDE_DIR=!DaemonDir!\src\dring
+) else if "%arch%"=="x64" (
+    set CMAKE_GENERATOR_STRING="Visual Studio 15 2017 Win64"
+    set QtCmakeDir=%QtDir%\\msvc2017_64\\lib\\cmake
+    set CMAKE_OPTIONS=-DQt5Core_DIR=!QtCmakeDir!\\Qt5Core -DQt5Sql_DIR=!QtCmakeDir!\\Qt5Sql -DQt5LinguistTools_DIR=!QtCmakeDir!\\Qt5LinguistTools -DQt5Concurrent_DIR=!QtCmakeDir!\\Qt5Concurrent -Dring_BIN=!DaemonDir!\MSVC\x64\ReleaseLib_win32\bin\dring.lib -DRING_INCLUDE_DIR=!DaemonDir!\src\dring
+)
+cmake .. -G !CMAKE_GENERATOR_STRING! !CMAKE_OPTIONS!
+endlocal
+goto cleanup
+
+:buildLRC
+:: build qtwrapper
+msbuild msvc\src\qtwrapper\qtwrapper.vcxproj %MSBUILD_ARGS%
+:: build lrc
+msbuild msvc\ringclient_static.vcxproj %MSBUILD_ARGS%
+goto cleanup
+
+@endlocal
+
+:Usage
+echo:
+echo The correct usage is:
+echo:
+echo     %0 [action] [architecture]
+echo:
+echo where
+echo:
+echo [action]           is: gen   ^| build
+echo [architecture]     is: x86   ^| x64
+echo:
+echo For example:
+echo     %SCRIPTNAME% gen x86     - gen x86 static lib vs projects for qtwrapper/lrc
+echo     %SCRIPTNAME% build x64   - build x64 qtwrapper/lrc static libs
+echo:
+goto :eof
+
+:cleanup
+endlocal
+exit /B %ERRORLEVEL%
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/api/behaviorcontroller.h ring-20180816.2.e26b79f~ds1/lrc/src/api/behaviorcontroller.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/api/behaviorcontroller.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/api/behaviorcontroller.h	2018-08-16 15:09:52.000000000 +0000
@@ -38,7 +38,12 @@
 
 namespace conversation
 {
-    class Info;
+    struct Info;
+}
+
+namespace interaction
+{
+    struct Info;
 }
 
 /**
@@ -65,6 +70,24 @@
      * Emitted when the client should open the incoming call view.
      */
     void showIncomingCallView(const std::string& accountId, const api::conversation::Info& conversationInfo) const;
+    /**
+     * Emitted when the client receives a new trust request
+     */
+    void newTrustRequest(const std::string& accountId, const std::string& contactUri) const;
+    /**
+     * Emitted when a trust request has been accepted, refused or blocked
+     */
+    void trustRequestTreated(const std::string& accountId, const std::string& contactUri) const;
+    /**
+     * Emitted when the client receives an unread message to display (text or file for now)
+     */
+    void newUnreadInteraction(const std::string& accountId, const std::string& conversation,
+        uint64_t interactionId, const interaction::Info& interaction) const;
+    /**
+     * Emitted when the unread interaction is now read
+     */
+     void newReadInteraction(const std::string& accountId, const std::string& conversation, uint64_t interactionId) const;
+
 };
 
 } // namespace api
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/api/contactmodel.h ring-20180816.2.e26b79f~ds1/lrc/src/api/contactmodel.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/api/contactmodel.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/api/contactmodel.h	2018-08-16 15:09:52.000000000 +0000
@@ -28,6 +28,7 @@
 
 // LRC
 #include "typedefs.h"
+#include "api/behaviorcontroller.h"
 
 namespace lrc
 {
@@ -57,7 +58,8 @@
 
     ContactModel(const account::Info& owner,
                  Database& database,
-                 const CallbacksHandler& callbacksHandler);
+                 const CallbacksHandler& callbacksHandler,
+                 const BehaviorController& behaviorController);
     ~ContactModel();
 
     /**
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/api/lrc.h ring-20180816.2.e26b79f~ds1/lrc/src/api/lrc.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/api/lrc.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/api/lrc.h	2018-08-16 15:09:52.000000000 +0000
@@ -56,6 +56,20 @@
      */
     DataTransferModel& getDataTransferModel() const;
 
+    /**
+     * Inform the daemon that the connectivity changed
+     */
+    void connectivityChanged() const;
+
+    /**
+     * Test connection with daemon
+     */
+    static bool isConnected();
+    /**
+     * Can communicate with the daemon via dbus
+     */
+    static bool dbusIsValid();
+
 private:
     std::unique_ptr<LrcPimpl> lrcPimpl_;
 };
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/api/newcallmodel.h ring-20180816.2.e26b79f~ds1/lrc/src/api/newcallmodel.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/api/newcallmodel.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/api/newcallmodel.h	2018-08-16 15:09:52.000000000 +0000
@@ -93,6 +93,13 @@
      */
     const call::Info& getCallFromURI(const std::string& uri, bool notOver = false) const;
     /**
+     * Get conference from a peer uri
+     * @param  uri
+     * @return the callInfo
+     * @throw out_of_range exception if not found
+     */
+    const call::Info& getConferenceFromURI(const std::string& uri) const;
+    /**
      * @param  callId to test
      * @return true if callId is presend else false.
      */
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/api/newcodecmodel.h ring-20180816.2.e26b79f~ds1/lrc/src/api/newcodecmodel.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/api/newcodecmodel.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/api/newcodecmodel.h	2018-08-16 15:09:52.000000000 +0000
@@ -96,6 +96,27 @@
      * @return if codecId is the only codec impacted
      */
     bool enable(const unsigned int& codecid, bool enabled);
+    /**
+     * Enable/Disable auto quality for this codec
+     * @param codecId
+     * @param on true if enabled else false
+     * @return
+     */
+    void autoQuality(const unsigned int& codecid, bool on);
+    /**
+     * Change wanted quality
+     * @param codecId
+     * @param quality
+     * @return
+     */
+    void quality(const unsigned int& codecid, double quality);
+    /**
+     * Change wanted bitrate
+     * @param codecId
+     * @param bitrate
+     * @return
+     */
+    void bitrate(const unsigned int& codecid, double bitrate);
 
 private:
     std::unique_ptr<NewCodecModelPimpl> pimpl_;
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/authority/daemon.cpp ring-20180816.2.e26b79f~ds1/lrc/src/authority/daemon.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/authority/daemon.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/authority/daemon.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -49,17 +49,17 @@
     QString(contactUri.c_str()), banned);
 }
 
-void
+bool
 addContactFromPending(const api::account::Info& owner, const std::string& contactUri)
 {
-    ConfigurationManager::instance().acceptTrustRequest(QString(owner.id.c_str()),
+    return ConfigurationManager::instance().acceptTrustRequest(QString(owner.id.c_str()),
     QString(contactUri.c_str()));
 }
 
-void
+bool
 discardFromPending(const api::account::Info& owner, const std::string& contactUri)
 {
-    ConfigurationManager::instance().discardTrustRequest(
+    return ConfigurationManager::instance().discardTrustRequest(
         QString(owner.id.c_str()),
         QString(contactUri.c_str())
     );
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/authority/daemon.h ring-20180816.2.e26b79f~ds1/lrc/src/authority/daemon.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/authority/daemon.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/authority/daemon.h	2018-08-16 15:09:52.000000000 +0000
@@ -54,14 +54,16 @@
  * Ask the daemon to add a contact from the pending list.
  * @param owner
  * @param contactUri
+ * @return if operation succeed
  */
-void addContactFromPending(const api::account::Info& owner, const std::string& contactUri);
+bool addContactFromPending(const api::account::Info& owner, const std::string& contactUri);
 /**
  * Ask the daemon to discard a pending.
  * @param owner
  * @param contactUri
+ * @return if operation succeed
  */
-void discardFromPending(const api::account::Info& owner, const std::string& contactUri);
+bool discardFromPending(const api::account::Info& owner, const std::string& contactUri);
 
 } // namespace daemon
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/callbackshandler.cpp ring-20180816.2.e26b79f~ds1/lrc/src/callbackshandler.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/callbackshandler.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/callbackshandler.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -47,107 +47,128 @@
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::incomingAccountMessage,
             this,
-            &CallbacksHandler::slotNewAccountMessage);
+            &CallbacksHandler::slotNewAccountMessage,
+            Qt::QueuedConnection);
 
     connect(&PresenceManager::instance(),
             &PresenceManagerInterface::newBuddyNotification,
             this,
-            &CallbacksHandler::slotNewBuddySubscription);
+            &CallbacksHandler::slotNewBuddySubscription,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::contactAdded,
             this,
-            &CallbacksHandler::slotContactAdded);
+            &CallbacksHandler::slotContactAdded,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::contactRemoved,
             this,
-            &CallbacksHandler::slotContactRemoved);
+            &CallbacksHandler::slotContactRemoved,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::incomingTrustRequest,
             this,
-            &CallbacksHandler::slotIncomingContactRequest);
+            &CallbacksHandler::slotIncomingContactRequest,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::accountMessageStatusChanged,
             this,
-            &CallbacksHandler::slotAccountMessageStatusChanged);
+            &CallbacksHandler::slotAccountMessageStatusChanged,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::accountDetailsChanged,
             this,
-            &CallbacksHandler::slotAccountDetailsChanged);
+            &CallbacksHandler::slotAccountDetailsChanged,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::registrationStateChanged,
             this,
-            &CallbacksHandler::slotRegistrationStateChanged);
+            &CallbacksHandler::slotRegistrationStateChanged,
+            Qt::QueuedConnection);
 
     connect(&CallManager::instance(),
             &CallManagerInterface::incomingCall,
             this,
-            &CallbacksHandler::slotIncomingCall);
+            &CallbacksHandler::slotIncomingCall,
+            Qt::QueuedConnection);
 
     connect(&CallManager::instance(),
             &CallManagerInterface::callStateChanged,
             this,
-            &CallbacksHandler::slotCallStateChanged);
+            &CallbacksHandler::slotCallStateChanged,
+            Qt::QueuedConnection);
 
     connect(&CallManager::instance(),
             &CallManagerInterface::conferenceCreated,
             this,
-            &CallbacksHandler::slotConferenceCreated);
+            &CallbacksHandler::slotConferenceCreated,
+            Qt::QueuedConnection);
 
     connect(&CallManager::instance(),
             &CallManagerInterface::conferenceRemoved,
             this,
-            &CallbacksHandler::slotConferenceRemoved);
+            &CallbacksHandler::slotConferenceRemoved,
+            Qt::QueuedConnection);
 
     connect(&CallManager::instance(),
             &CallManagerInterface::conferenceChanged,
             this,
-            &CallbacksHandler::slotConferenceChanged);
+            &CallbacksHandler::slotConferenceChanged,
+            Qt::QueuedConnection);
 
     connect(&CallManager::instance(),
             &CallManagerInterface::incomingMessage,
             this,
-            &CallbacksHandler::slotIncomingMessage);
+            &CallbacksHandler::slotIncomingMessage,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::dataTransferEvent,
             this,
-            &CallbacksHandler::slotDataTransferEvent);
+            &CallbacksHandler::slotDataTransferEvent,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::knownDevicesChanged,
             this,
-            &CallbacksHandler::slotKnownDevicesChanged);
+            &CallbacksHandler::slotKnownDevicesChanged,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::deviceRevocationEnded,
             this,
-            &CallbacksHandler::slotDeviceRevokationEnded);
+            &CallbacksHandler::slotDeviceRevokationEnded,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::exportOnRingEnded,
             this,
-            &CallbacksHandler::slotExportOnRingEnded);
+            &CallbacksHandler::slotExportOnRingEnded,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::nameRegistrationEnded,
             this,
-            &CallbacksHandler::slotNameRegistrationEnded);
+            &CallbacksHandler::slotNameRegistrationEnded,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::registeredNameFound,
             this,
-            &CallbacksHandler::slotRegisteredNameFound);
+            &CallbacksHandler::slotRegisteredNameFound,
+            Qt::QueuedConnection);
 
     connect(&ConfigurationManager::instance(),
             &ConfigurationManagerInterface::migrationEnded,
             this,
-            &CallbacksHandler::slotMigrationEnded);
+            &CallbacksHandler::slotMigrationEnded,
+            Qt::QueuedConnection);
 }
 
 CallbacksHandler::~CallbacksHandler()
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/call.cpp ring-20180816.2.e26b79f~ds1/lrc/src/call.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/call.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/call.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -294,16 +294,16 @@
 m_History(false),m_Missed(false),m_Direction(Call::Direction::OUTGOING),m_Type(Call::Type::CALL),
 m_pUserActionModel(nullptr), m_CurrentState(Call::State::ERROR),m_pCertificate(nullptr),m_mMedias({{
    /*                                            IN                                                            OUT                           */
-   /* AUDIO */ {{ new QList<Media::Media*>() /*Created lifecycle == progress*/, new QList<Media::Media*>() /*Created lifecycle == progress*/}},
-   /* VIDEO */ {{ new QList<Media::Media*>() /*On demand                    */, new QList<Media::Media*>() /*On demand                    */}},
-   /* TEXT  */ {{ new QList<Media::Media*>() /*On demand                    */, new QList<Media::Media*>() /*On demand                    */}},
-   /* FILE  */ {{ new QList<Media::Media*>() /*Not implemented              */, new QList<Media::Media*>() /*Not implemented              */}},
+   /* AUDIO */ {{ new QList<media::Media*>() /*Created lifecycle == progress*/, new QList<media::Media*>() /*Created lifecycle == progress*/}},
+   /* VIDEO */ {{ new QList<media::Media*>() /*On demand                    */, new QList<media::Media*>() /*On demand                    */}},
+   /* TEXT  */ {{ new QList<media::Media*>() /*On demand                    */, new QList<media::Media*>() /*On demand                    */}},
+   /* FILE  */ {{ new QList<media::Media*>() /*Not implemented              */, new QList<media::Media*>() /*Not implemented              */}},
 }}), m_mRecordings({{
    /*                           IN                            OUT                */
-   /* AUDIO */ {{ new QList<Media::Recording*>(), new QList<Media::Recording*>()}},
-   /* VIDEO */ {{ new QList<Media::Recording*>(), new QList<Media::Recording*>()}},
-   /* TEXT  */ {{ new QList<Media::Recording*>(), new QList<Media::Recording*>()}},
-   /* FILE  */ {{ new QList<Media::Recording*>(), new QList<Media::Recording*>()}},
+   /* AUDIO */ {{ new QList<media::Recording*>(), new QList<media::Recording*>()}},
+   /* VIDEO */ {{ new QList<media::Recording*>(), new QList<media::Recording*>()}},
+   /* TEXT  */ {{ new QList<media::Recording*>(), new QList<media::Recording*>()}},
+   /* FILE  */ {{ new QList<media::Recording*>(), new QList<media::Recording*>()}},
 }}), m_mIsRecording({{
    /*              IN     OUT   */
    /* AUDIO */ {{ false, false }},
@@ -371,16 +371,16 @@
 
 CallPrivate::~CallPrivate()
 {
-   for ( const Media::Media::Type t : EnumIterator<Media::Media::Type>()) {
-      if (m_mMedias[t][Media::Media::Direction::IN  ])
-         delete m_mMedias[t][Media::Media::Direction::IN  ];
-      if (m_mMedias[t][Media::Media::Direction::OUT ])
-         delete m_mMedias[t][Media::Media::Direction::OUT ];
-
-      if (m_mRecordings[t][Media::Media::Direction::IN  ])
-         delete m_mRecordings[t][Media::Media::Direction::IN  ];
-      if (m_mRecordings[t][Media::Media::Direction::OUT ])
-         delete m_mRecordings[t][Media::Media::Direction::OUT ];
+   for ( const media::Media::Type t : EnumIterator<media::Media::Type>()) {
+      if (m_mMedias[t][media::Media::Direction::IN  ])
+         delete m_mMedias[t][media::Media::Direction::IN  ];
+      if (m_mMedias[t][media::Media::Direction::OUT ])
+         delete m_mMedias[t][media::Media::Direction::OUT ];
+
+      if (m_mRecordings[t][media::Media::Direction::IN  ])
+         delete m_mRecordings[t][media::Media::Direction::IN  ];
+      if (m_mRecordings[t][media::Media::Direction::OUT ])
+         delete m_mRecordings[t][media::Media::Direction::OUT ];
    }
 }
 
@@ -397,7 +397,7 @@
 
 void CallPrivate::updateOutgoingMedia(const MapStringString& details)
 {
-   auto list = q_ptr->media(Media::Media::Type::VIDEO, Media::Media::Direction::OUT);
+   auto list = q_ptr->media(media::Media::Type::VIDEO, media::Media::Direction::OUT);
    QString video_source  = details[ DRing::Call::Details::VIDEO_SOURCE];
 
    if (video_source.length() <= 0 && list.isEmpty()) {
@@ -407,12 +407,12 @@
 
    if (list.isEmpty()) {
        // Update data
-       static const Media::Media::Direction direction = Media::Media::Direction::OUT;
-       mediaFactory<Media::Video>(direction);
+       static const media::Media::Direction direction = media::Media::Direction::OUT;
+       mediaFactory<media::Video>(direction);
    }
 
-   list = q_ptr->media(Media::Media::Type::VIDEO, Media::Media::Direction::OUT);
-   Media::Video* media_video = static_cast<Media::Video*>(list[0]);
+   list = q_ptr->media(media::Media::Type::VIDEO, media::Media::Direction::OUT);
+   media::Video* media_video = static_cast<media::Video*>(list[0]);
    media_video->sourceModel()->setUsedIndex(video_source);
    return;
 }
@@ -474,10 +474,10 @@
 
     //Set the recording state
     if (CallManager::instance().getIsRecording(callId)) {
-        call->d_ptr->m_mIsRecording[ Media::Media::Type::AUDIO ].setAt( Media::Media::Direction::IN  , true);
-        call->d_ptr->m_mIsRecording[ Media::Media::Type::AUDIO ].setAt( Media::Media::Direction::OUT , true);
-        call->d_ptr->m_mIsRecording[ Media::Media::Type::VIDEO ].setAt( Media::Media::Direction::IN  , true);
-        call->d_ptr->m_mIsRecording[ Media::Media::Type::VIDEO ].setAt( Media::Media::Direction::OUT , true);
+        call->d_ptr->m_mIsRecording[ media::Media::Type::AUDIO ].setAt( media::Media::Direction::IN  , true);
+        call->d_ptr->m_mIsRecording[ media::Media::Type::AUDIO ].setAt( media::Media::Direction::OUT , true);
+        call->d_ptr->m_mIsRecording[ media::Media::Type::VIDEO ].setAt( media::Media::Direction::IN  , true);
+        call->d_ptr->m_mIsRecording[ media::Media::Type::VIDEO ].setAt( media::Media::Direction::OUT , true);
     }
 
     if (!details[ DRing::Call::Details::TIMESTAMP_START ].isEmpty())
@@ -959,10 +959,10 @@
 bool Call::isAVRecording() const
 {
    return lifeCycleState() == Call::LifeCycleState::PROGRESS
-      && (d_ptr->m_mIsRecording[ Media::Media::Type::AUDIO ][ Media::Media::Direction::IN  ]
-      ||  d_ptr->m_mIsRecording[ Media::Media::Type::AUDIO ][ Media::Media::Direction::OUT ]
-      ||  d_ptr->m_mIsRecording[ Media::Media::Type::VIDEO ][ Media::Media::Direction::IN  ]
-      ||  d_ptr->m_mIsRecording[ Media::Media::Type::VIDEO ][ Media::Media::Direction::OUT ]);
+      && (d_ptr->m_mIsRecording[ media::Media::Type::AUDIO ][ media::Media::Direction::IN  ]
+      ||  d_ptr->m_mIsRecording[ media::Media::Type::AUDIO ][ media::Media::Direction::OUT ]
+      ||  d_ptr->m_mIsRecording[ media::Media::Type::VIDEO ][ media::Media::Direction::IN  ]
+      ||  d_ptr->m_mIsRecording[ media::Media::Type::VIDEO ][ media::Media::Direction::OUT ]);
 }
 
 ///Get the call account id
@@ -1008,8 +1008,8 @@
    emit q_ptr->videoStarted(renderer);
 
    //Test logic, this is very weak, but works in a normal scenario
-   for (const auto d : EnumIterator<Media::Media::Direction>())
-      mediaFactory<Media::Video>(d);
+   for (const auto d : EnumIterator<media::Media::Direction>())
+      mediaFactory<media::Video>(d);
 
    connect(renderer, &Video::Renderer::stopped, this, &CallPrivate::videoStopped);
 
@@ -1026,27 +1026,27 @@
    return;
 }
 
-QList<Media::Media*> Call::media(Media::Media::Type type, Media::Media::Direction direction) const
+QList<media::Media*> Call::media(media::Media::Type type, media::Media::Direction direction) const
 {
    return *(d_ptr->m_mMedias[type][direction]);
 }
 
-bool Call::hasMedia(Media::Media::Type type, Media::Media::Direction direction) const
+bool Call::hasMedia(media::Media::Type type, media::Media::Direction direction) const
 {
    return d_ptr->m_mMedias[type][direction]->size();
 }
 
-bool Call::hasRecording(Media::Media::Type type, Media::Media::Direction direction) const
+bool Call::hasRecording(media::Media::Type type, media::Media::Direction direction) const
 {
    return d_ptr->m_mRecordings[type][direction]->size();
 }
 
-bool Call::isRecording(Media::Media::Type type, Media::Media::Direction direction) const
+bool Call::isRecording(media::Media::Type type, media::Media::Direction direction) const
 {
    return d_ptr->m_mIsRecording[type][direction];
 }
 
-QList<Media::Recording*> Call::recordings(Media::Media::Type type, Media::Media::Direction direction) const
+QList<media::Recording*> Call::recordings(media::Media::Type type, media::Media::Direction direction) const
 {
    //Note that the recording are not Media attributes to avoid keeping "terminated" media
    //for history call.
@@ -1057,13 +1057,13 @@
  * An iffecient way to list all media. If this ever become used elsewhere,
  * add caching.
  */
-QList<Media::Media*> Call::allMedia() const
+QList<media::Media*> Call::allMedia() const
 {
-   QList<Media::Media*> ret;
+   QList<media::Media*> ret;
 
-   for (const auto t : EnumIterator<Media::Media::Type>() ) {
-      for (const auto d : EnumIterator<Media::Media::Direction>() ) {
-         foreach(Media::Media* m, *(d_ptr->m_mMedias[t][d]))
+   for (const auto t : EnumIterator<media::Media::Type>() ) {
+      for (const auto d : EnumIterator<media::Media::Direction>() ) {
+         foreach(media::Media* m, *(d_ptr->m_mMedias[t][d]))
             ret << m;
       }
    }
@@ -1088,17 +1088,17 @@
 }
 
 /**
- * Everytime new ids are generated (that can be done some time), this map is
+ * Every time new ids are generated (that can be done some time), this map is
  * updated to map those type ids to Media::Type
  *
  * It could be extended to store some operations into lambdas too, but for
  * now the safeMediaCreator switch is the only place where this would be useful,
  * so there is very little point to do that.
  */
-QHash<int, Media::Media::Type>& MediaTypeInference::typeMap(bool regen) {
+QHash<int, media::Media::Type>& MediaTypeInference::typeMap(bool regen) {
    static bool isInit = false;
-   //Try to map T to Media::Media::Type then use this to retrieve and cast the media
-   static QHash<int, Media::Media::Type> sTypeMap;
+   //Try to map T to media::Media::Type then use this to retrieve and cast the media
+   static QHash<int, media::Media::Type> sTypeMap;
    if (!isInit || regen) {
       isInit = true;
       REGISTER_MEDIA()
@@ -1110,11 +1110,11 @@
  * Create, register and connect new media to a call.
  */
 template<typename T>
-T* CallPrivate::mediaFactory(Media::Media::Direction dir)
+T* CallPrivate::mediaFactory(media::Media::Direction dir)
 {
    T* m = new T(q_ptr, dir);
    (*m_mMedias[MediaTypeInference::getType<T>()][dir]) << m;
-   const auto cb = [this,m](const Media::Media::State s, const Media::Media::State p) {
+   const auto cb = [this,m](const media::Media::State s, const media::Media::State p) {
       if (m) {
          emit q_ptr->mediaStateChanged(m,s,p);
       }
@@ -1122,7 +1122,7 @@
          Q_ASSERT(false);
    };
 
-   connect(m, &Media::Media::stateChanged, cb);
+   connect(m, &media::Media::stateChanged, cb);
    emit q_ptr->mediaAdded(m);
 
    return m;
@@ -1133,18 +1133,18 @@
  * do a static cast to re-create the right type. Given how it is using
  * MediaTypeInference, it is safe-ish.
  */
-Media::Media* MediaTypeInference::safeMediaCreator(Call* c, Media::Media::Type t, Media::Media::Direction d)
+media::Media* MediaTypeInference::safeMediaCreator(Call* c, media::Media::Type t, media::Media::Direction d)
 {
    switch(t) {
-      case Media::Media::Type::AUDIO:
-         return c->d_ptr->mediaFactory<Media::Audio>(d);
-      case Media::Media::Type::VIDEO:
-         return c->d_ptr->mediaFactory<Media::Video>(d);
-      case Media::Media::Type::TEXT :
-         return c->d_ptr->mediaFactory<Media::Text>(d);
-      case Media::Media::Type::FILE :
-         return c->d_ptr->mediaFactory<Media::File>(d);
-      case Media::Media::Type::COUNT__:
+      case media::Media::Type::AUDIO:
+         return c->d_ptr->mediaFactory<media::Audio>(d);
+      case media::Media::Type::VIDEO:
+         return c->d_ptr->mediaFactory<media::Video>(d);
+      case media::Media::Type::TEXT :
+         return c->d_ptr->mediaFactory<media::Text>(d);
+      case media::Media::Type::FILE :
+         return c->d_ptr->mediaFactory<media::File>(d);
+      case media::Media::Type::COUNT__:
          break;
    }
    return nullptr;
@@ -1212,14 +1212,14 @@
 
    if (!path.isEmpty() && QFile::exists(path)) {
 
-      Media::Recording* rec = LocalRecordingCollection::instance().addFromPath(path);
-      (*m_mRecordings[Media::Media::Type::AUDIO][Media::Media::Direction::IN ]) << rec;
-      (*m_mRecordings[Media::Media::Type::AUDIO][Media::Media::Direction::OUT]) << rec;
+       media::Recording* rec = LocalRecordingCollection::instance().addFromPath(path);
+      (*m_mRecordings[media::Media::Type::AUDIO][media::Media::Direction::IN ]) << rec;
+      (*m_mRecordings[media::Media::Type::AUDIO][media::Media::Direction::OUT]) << rec;
    }
 
    //TODO add a media type attribute to this method
-   /*(*m_mRecordings[Media::Media::Type::VIDEO][Media::Media::Direction::IN ]
-   (*m_mRecordings[Media::Media::Type::VIDEO][Media::Media::Direction::OUT]*/
+   /*(*m_mRecordings[media::Media::Type::VIDEO][media::Media::Direction::IN ]
+   (*m_mRecordings[media::Media::Type::VIDEO][media::Media::Direction::OUT]*/
 }
 
 ///Set peer name
@@ -1227,7 +1227,7 @@
 {
    d_ptr->m_PeerName = name;
 
-   // its possible that this is not set at the begining of a call, so we should update the CM here
+   // its possible that this is not set at the beginning of a call, so we should update the CM here
    if (peerContactMethod())
       peerContactMethod()->incrementAlternativeName(name, startTimeStamp());
 }
@@ -1477,17 +1477,17 @@
 void CallPrivate::initMedia()
 {
    //Always assume there is an audio media, even if this is untrue
-   for (const auto d : EnumIterator<Media::Media::Direction>())
-      mediaFactory<Media::Audio>(d);
+   for (const auto d : EnumIterator<media::Media::Direction>())
+      mediaFactory<media::Audio>(d);
 }
 
 void CallPrivate::terminateMedia()
 {
    //Delete remaining media
-   for (const auto t : EnumIterator<Media::Media::Type>() ) {
-      for (const auto d : EnumIterator<Media::Media::Direction>() ) {
+   for (const auto t : EnumIterator<media::Media::Type>() ) {
+      for (const auto d : EnumIterator<media::Media::Direction>() ) {
          for (auto m : q_ptr->media(t,d) ) {
-            m << Media::Media::Action::TERMINATE;
+            m << media::Media::Action::TERMINATE;
             m_mMedias[t][d]->removeAll(m);
             //TODO keep the media for history visualization purpose if it has a recording
             delete m;
@@ -1690,7 +1690,7 @@
      * course, this is an ugly hack is while vCard is a standard, using it
      * like this is not. Therefore we use the proprietary PROFILE_VCF MIME.
      */
-    auto t = mediaFactory<Media::Text>(Media::Media::Direction::OUT);
+    auto t = mediaFactory<media::Text>(media::Media::Direction::OUT);
 
     MapStringString details = ConfigurationManager::instance().getAccountDetails(m_Account->id());
     using namespace DRing::Account;
@@ -1928,13 +1928,13 @@
 void CallPrivate::toggleAudioRecord()
 {
    CallManagerInterface & callManager = CallManager::instance();
-   const bool wasRecording = m_mIsRecording[ Media::Media::Type::AUDIO ][Media::Media::Direction::IN];
+   const bool wasRecording = m_mIsRecording[ media::Media::Type::AUDIO ][media::Media::Direction::IN];
    qDebug() << "Setting record " << !wasRecording << " for call. callId : " << q_ptr  << "ConfId:" << q_ptr;
 
    const bool isRec = callManager.toggleRecording(q_ptr->dringId());
 
-   m_mIsRecording[ Media::Media::Type::AUDIO ].setAt( Media::Media::Direction::IN  , isRec);
-   m_mIsRecording[ Media::Media::Type::AUDIO ].setAt( Media::Media::Direction::OUT , isRec);
+   m_mIsRecording[ media::Media::Type::AUDIO ].setAt( media::Media::Direction::IN  , isRec);
+   m_mIsRecording[ media::Media::Type::AUDIO ].setAt( media::Media::Direction::OUT , isRec);
 }
 
 ///Record the call
@@ -1942,13 +1942,13 @@
 {
    //TODO upgrade once the video recording is implemented
    CallManagerInterface & callManager = CallManager::instance();
-   const bool wasRecording = m_mIsRecording[ Media::Media::Type::VIDEO ][Media::Media::Direction::IN];
+   const bool wasRecording = m_mIsRecording[ media::Media::Type::VIDEO ][media::Media::Direction::IN];
    qDebug() << "Setting record " << !wasRecording << " for call. callId : " << q_ptr  << "ConfId:" << q_ptr;
 
    const bool isRec = callManager.toggleRecording(q_ptr->dringId());
 
-   m_mIsRecording[ Media::Media::Type::VIDEO ].setAt( Media::Media::Direction::IN  , isRec);
-   m_mIsRecording[ Media::Media::Type::VIDEO ].setAt( Media::Media::Direction::OUT , isRec);
+   m_mIsRecording[ media::Media::Type::VIDEO ].setAt( media::Media::Direction::IN  , isRec);
+   m_mIsRecording[ media::Media::Type::VIDEO ].setAt( media::Media::Direction::OUT , isRec);
 }
 
 ///Start the timer
@@ -2266,11 +2266,11 @@
       case static_cast<int>(Call::Role::DateTime):
          return dateTime();
       case static_cast<int>(Call::Role::HasAVRecording):
-         return d_ptr->m_mRecordings[Media::Media::Type::AUDIO][Media::Media::Direction::IN]->size()
-            + d_ptr->m_mRecordings[Media::Media::Type::AUDIO][Media::Media::Direction::IN]->size() > 0;
+         return d_ptr->m_mRecordings[media::Media::Type::AUDIO][media::Media::Direction::IN]->size()
+            + d_ptr->m_mRecordings[media::Media::Type::AUDIO][media::Media::Direction::IN]->size() > 0;
       case static_cast<int>(Call::Role::IsAVRecording):
-         return d_ptr->m_mIsRecording[Media::Media::Type::AUDIO][Media::Media::Direction::IN]
-            || d_ptr->m_mIsRecording[Media::Media::Type::AUDIO][Media::Media::Direction::IN];
+         return d_ptr->m_mIsRecording[media::Media::Type::AUDIO][media::Media::Direction::IN]
+            || d_ptr->m_mIsRecording[media::Media::Type::AUDIO][media::Media::Direction::IN];
       case static_cast<int>(Call::Role::Filter): {
          QString normStripppedC;
          foreach(QChar char2,(static_cast<int>(direction())+'\n'+roleData(Call::Role::Name).toString()+'\n'+
@@ -2324,9 +2324,9 @@
       case static_cast<int>(Call::Role::Certificate):
          return QVariant::fromValue(certificate());
       case static_cast<int>(Call::Role::HasAudioRecording):
-         return d_ptr->m_mRecordings[Media::Media::Type::AUDIO][Media::Media::Direction::IN]->size() > 0;
+         return d_ptr->m_mRecordings[media::Media::Type::AUDIO][media::Media::Direction::IN]->size() > 0;
       case static_cast<int>(Call::Role::HasVideoRecording):
-         return d_ptr->m_mRecordings[Media::Media::Type::VIDEO][Media::Media::Direction::IN]->size() > 0;
+         return d_ptr->m_mRecordings[media::Media::Type::VIDEO][media::Media::Direction::IN]->size() > 0;
       case static_cast<int>(Ring::Role::FormattedState):
       case static_cast<int>(Call::Role::HumanStateName):
          return toHumanStateName(state());
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/call.h ring-20180816.2.e26b79f~ds1/lrc/src/call.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/call.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/call.h	2018-08-16 15:09:52.000000000 +0000
@@ -46,7 +46,7 @@
    class ManagerPrivate;
 }
 
-namespace Media {
+namespace media {
    class Media;
    class Audio;
    class Video;
@@ -89,10 +89,10 @@
    friend class IMConversationManager;
    friend class VideoRendererManager;
    friend class VideoRendererManagerPrivate;
-   friend class Media::Media;
-   friend class Media::Audio;
-   friend class Media::Video;
-   friend class Media::Text;
+   friend class media::Media;
+   friend class media::Audio;
+   friend class media::Video;
+   friend class media::Text;
    friend class MediaTypeInference;
    friend class IMConversationManagerPrivate;
    friend QMimeData* RingMimes::payload(const Call*, const ContactMethod*, const Person*);
@@ -334,13 +334,13 @@
    Q_INVOKABLE QMimeData* mimePayload      (         ) const;
 
    template<typename T>
-   T* firstMedia(Media::Media::Direction direction) const;
-   QList<Media::Recording*> recordings  (Media::Media::Type type, Media::Media::Direction direction) const;
-   QList<Media::Media*>     media       (Media::Media::Type type, Media::Media::Direction direction) const;
-   bool                     hasMedia    (Media::Media::Type type, Media::Media::Direction direction) const;
-   bool                     hasRecording(Media::Media::Type type, Media::Media::Direction direction) const;
-   bool                     isRecording (Media::Media::Type type, Media::Media::Direction direction) const;
-   QList<Media::Media*>     allMedia    (                                                          ) const;
+   T* firstMedia(media::Media::Direction direction) const;
+   QList<media::Recording*> recordings  (media::Media::Type type, media::Media::Direction direction) const;
+   QList<media::Media*>     media       (media::Media::Type type, media::Media::Direction direction) const;
+   bool                     hasMedia    (media::Media::Type type, media::Media::Direction direction) const;
+   bool                     hasRecording(media::Media::Type type, media::Media::Direction direction) const;
+   bool                     isRecording (media::Media::Type type, media::Media::Direction direction) const;
+   QList<media::Media*>     allMedia    (                                                          ) const;
 
    //Automated function
    Q_INVOKABLE Call::State performAction(Call::Action action);
@@ -399,9 +399,9 @@
    ///Remove a new video renderer
    void videoStopped(Video::Renderer* renderer); //TODO remove, use the media signals
    ///Notify when a media is added
-   void mediaAdded(Media::Media* media);
+   void mediaAdded(media::Media* media);
    ///Notify when a media state change
-   void mediaStateChanged(Media::Media* media, const Media::Media::State s, const Media::Media::State m);
+   void mediaStateChanged(media::Media* media, const media::Media::State s, const media::Media::State m);
    ///The holding combination has changed
    void holdFlagsChanged(const FlagPack<HoldFlags>& current, const FlagPack<HoldFlags>& previous);
 };
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/call.hpp ring-20180816.2.e26b79f~ds1/lrc/src/call.hpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/call.hpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/call.hpp	2018-08-16 15:09:52.000000000 +0000
@@ -18,10 +18,10 @@
 
 class LIB_EXPORT MediaTypeInference {
 public:
-   static Media::Media* safeMediaCreator(Call* c, Media::Media::Type t, Media::Media::Direction d);
+   static media::Media* safeMediaCreator(Call* c, media::Media::Type t, media::Media::Direction d);
 
    template<typename T>
-   static inline Media::Media::Type getType() {
+   static inline media::Media::Type getType() {
       const int id = MediaTypeInference::getId<T>();
       return MediaTypeInference::typeMap(!MediaTypeInference::typeMap().contains(id))[id];
    }
@@ -31,25 +31,25 @@
       static int id = genId();
       return id;
    }
-   static QHash<int, Media::Media::Type>& typeMap(bool regen = false);
+   static QHash<int, media::Media::Type>& typeMap(bool regen = false);
 private:
    static int genId();
 };
 
 /**
  * Perform a safe cast of the first media of "T" type
- * @example Media::Audio* audio = call->firstMedia<Media::Audio>(Media::Media::Direction::OUT);
+ * @example Media::Audio* audio = call->firstMedia<media::Audio>(media::Media::Direction::OUT);
  * @return nullptr if none, the media otherwise.
  */
 template<typename T>
-T* Call::firstMedia(Media::Media::Direction direction) const
+T* Call::firstMedia(media::Media::Direction direction) const
 {
-   const Media::Media::Type t = MediaTypeInference::getType<T>();
+   const media::Media::Type t = MediaTypeInference::getType<T>();
 
-   QList<Media::Media*> ms = media(t, direction);
+   QList<media::Media*> ms = media(t, direction);
 
    if (!ms.isEmpty()) {
-      Media::Media* m = ms[0];
+      media::Media* m = ms[0];
       Q_ASSERT(m->type() == t);
 
       return reinterpret_cast<T*>(m);
@@ -63,21 +63,25 @@
 {
    #pragma push_macro("OUT")
    #undef OUT
-   T* existing = firstMedia<T>(Media::Media::Direction::OUT);
+   T* existing = firstMedia<T>(media::Media::Direction::OUT);
    if (useExisting && existing)
       return existing;
 
-   Media::Media::Type t = MediaTypeInference::getType<T>();
+   media::Media::Type t = MediaTypeInference::getType<T>();
 
-   return static_cast<T*>(MediaTypeInference::safeMediaCreator(this,t,Media::Media::Direction::OUT));
+   return static_cast<T*>(MediaTypeInference::safeMediaCreator(this,t, media::Media::Direction::OUT));
    #pragma pop_macro("OUT")
 }
 
+#ifdef _MSC_VER
+#define __attribute__(A) /*do nothing*/
+#endif // _MSC_VER
+
 #define REGISTER_MEDIA() __attribute__ ((unused)) static auto forceType = [] {\
-  QHash<int,::Media::Media::Type>& sTypeMap = MediaTypeInference::typeMap(0);\
-  sTypeMap[MediaTypeInference::getId<Media::Audio>()] = ::Media::Media::Type::AUDIO;\
-  sTypeMap[MediaTypeInference::getId<Media::Video>()] = ::Media::Media::Type::VIDEO;\
-  sTypeMap[MediaTypeInference::getId<Media::Text >()] = ::Media::Media::Type::TEXT ;\
-  sTypeMap[MediaTypeInference::getId<Media::File >()] = ::Media::Media::Type::FILE ;\
+  QHash<int,::media::Media::Type>& sTypeMap = MediaTypeInference::typeMap(0);\
+  sTypeMap[MediaTypeInference::getId<media::Audio>()] = ::media::Media::Type::AUDIO;\
+  sTypeMap[MediaTypeInference::getId<media::Video>()] = ::media::Media::Type::VIDEO;\
+  sTypeMap[MediaTypeInference::getId<media::Text >()] = ::media::Media::Type::TEXT ;\
+  sTypeMap[MediaTypeInference::getId<media::File >()] = ::media::Media::Type::FILE ;\
   return 0;\
 }();
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/callmodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/callmodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/callmodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/callmodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -55,7 +55,11 @@
 #include "call_const.h"
 
 //System
+#ifndef _MSC_VER
 #include <unistd.h>
+#else
+#include "../../daemon/MSVC/unistd.h"
+#endif // !_MSC_VER
 #include <errno.h>
 
 //Private
@@ -477,10 +481,10 @@
       connect(call,&Call::videoStopped,[this,call](Video::Renderer* r) {
          emit q_ptr->rendererRemoved(call, r);
       });
-      connect(call,&Call::mediaAdded, [this,call](Media::Media* media) {
+      connect(call,&Call::mediaAdded, [this,call](media::Media* media) {
          emit q_ptr->mediaAdded(call,media);
       });
-      connect(call,&Call::mediaStateChanged, [this,call](Media::Media* media, const Media::Media::State s, const Media::Media::State m) {
+      connect(call,&Call::mediaStateChanged, [this,call](media::Media* media, const media::Media::State s, const media::Media::State m) {
          emit q_ptr->mediaStateChanged(call,media,s,m);
       });
 
@@ -518,7 +522,7 @@
 {
    qDebug() << "New incoming call:" << callId;
 
-   // Since november 2015, calls are alowed to be declared with a state change
+   // Since november 2015, calls are allowed to be declared with a state change
    // if it has been done, then they should be ignored
    // contains can be true and contain nullptr if it was accessed without
    // contains() first
@@ -1452,10 +1456,10 @@
 {
    if (auto call = q_ptr->getCall(callId)) {
 
-      call->d_ptr->m_mIsRecording[ Media::Media::Type::AUDIO ].setAt( Media::Media::Direction::IN  , state);
-      call->d_ptr->m_mIsRecording[ Media::Media::Type::AUDIO ].setAt( Media::Media::Direction::OUT , state);
-      call->d_ptr->m_mIsRecording[ Media::Media::Type::VIDEO ].setAt( Media::Media::Direction::IN  , state);
-      call->d_ptr->m_mIsRecording[ Media::Media::Type::VIDEO ].setAt( Media::Media::Direction::OUT , state);
+      call->d_ptr->m_mIsRecording[ media::Media::Type::AUDIO ].setAt( media::Media::Direction::IN  , state);
+      call->d_ptr->m_mIsRecording[ media::Media::Type::AUDIO ].setAt( media::Media::Direction::OUT , state);
+      call->d_ptr->m_mIsRecording[ media::Media::Type::VIDEO ].setAt( media::Media::Direction::IN  , state);
+      call->d_ptr->m_mIsRecording[ media::Media::Type::VIDEO ].setAt( media::Media::Direction::OUT , state);
 
       emit call->changed();
    }
@@ -1466,11 +1470,11 @@
    Call* call = q_ptr->getCall(callId);
 
    if (call) {
-      auto a = call->firstMedia<Media::Audio>(Media::Media::Direction::OUT);
+      auto a = call->firstMedia<media::Audio>(media::Media::Direction::OUT);
       if (state)
-         a->Media::d_ptr->muteConfirmed();
+         a->media::Media::d_ptr->muteConfirmed();
       else
-         a->Media::d_ptr->unmuteConfirmed();
+         a->media::Media::d_ptr->unmuteConfirmed();
    }
 }
 
@@ -1479,11 +1483,11 @@
    Call* call = q_ptr->getCall(callId);
 
    if (call) {
-      auto v = call->firstMedia<Media::Video>(Media::Media::Direction::OUT);
+      auto v = call->firstMedia<media::Video>(media::Media::Direction::OUT);
       if (state)
-         v->Media::d_ptr->muteConfirmed();
+         v->media::Media::d_ptr->muteConfirmed();
       else
-         v->Media::d_ptr->unmuteConfirmed();
+         v->media::Media::d_ptr->unmuteConfirmed();
    }
 }
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/callmodel.h ring-20180816.2.e26b79f~ds1/lrc/src/callmodel.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/callmodel.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/callmodel.h	2018-08-16 15:09:52.000000000 +0000
@@ -157,10 +157,10 @@
    ///Emitted when a new Video::Renderer is removed
    void rendererRemoved         ( Call* call, Video::Renderer* renderer   );
    ///Notify when a media is added
-   void mediaAdded              ( Call* call, Media::Media* media         );
+   void mediaAdded              ( Call* call, media::Media* media         );
    ///Notify when the dial (search) field changed
    void dialNumberChanged       ( Call* call, const QString& entry        );
    ///Notify when a media state change
-   void mediaStateChanged( Call* call, Media::Media* media, const Media::Media::State s, const Media::Media::State m);
+   void mediaStateChanged( Call* call, media::Media* media, const media::Media::State s, const media::Media::State m);
 };
 Q_DECLARE_METATYPE(CallModel*)
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/certificate.cpp ring-20180816.2.e26b79f~ds1/lrc/src/certificate.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/certificate.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/certificate.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -892,7 +892,7 @@
 /**
  * get the data by role selection
  * @param role define the role to select
- * @return a QVariant object, wich contains the selection
+ * @return a QVariant object, which contains the selection
  */
 QVariant
 Certificate::roleData(int role) const
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/contactmethod.cpp ring-20180816.2.e26b79f~ds1/lrc/src/contactmethod.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/contactmethod.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/contactmethod.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -833,10 +833,10 @@
    return this->d_ptr== other.d_ptr;
 }
 
-Media::TextRecording* ContactMethod::textRecording() const
+media::TextRecording* ContactMethod::textRecording() const
 {
     if (!d_ptr->m_pTextRecording) {
-        d_ptr->m_pTextRecording = Media::RecordingModel::instance().createTextRecording(this);
+        d_ptr->m_pTextRecording = media::RecordingModel::instance().createTextRecording(this);
     }
 
     return d_ptr->m_pTextRecording;
@@ -889,7 +889,7 @@
       certificate->setContactMethod(q_ptr);
 }
 
-void ContactMethodPrivate::setTextRecording(Media::TextRecording* r)
+void ContactMethodPrivate::setTextRecording(media::TextRecording* r)
 {
    m_pTextRecording = r;
 }
@@ -906,7 +906,7 @@
    auto id = ConfigurationManager::instance().sendTextMessage(selectedAccount->id()
                                                     ,uri().format(URI::Section::SCHEME|URI::Section::USER_INFO|URI::Section::HOSTNAME)
                                                     ,payloads);
-   txtRecording->d_ptr->insertNewMessage(payloads, this, Media::Media::Direction::OUT, id);
+   txtRecording->d_ptr->insertNewMessage(payloads, this, media::Media::Direction::OUT, id);
    return true;
 }
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/contactmethod.h ring-20180816.2.e26b79f~ds1/lrc/src/contactmethod.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/contactmethod.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/contactmethod.h	2018-08-16 15:09:52.000000000 +0000
@@ -41,7 +41,7 @@
 class InstantMessagingModel;
 class Certificate;
 
-namespace Media {
+namespace media {
    class TextRecording;
 }
 
@@ -133,7 +133,7 @@
    QString               uid             () const;
    URI::ProtocolHint     protocolHint    () const;
    QByteArray            sha1            () const;
-   Media::TextRecording* textRecording   () const;
+   media::TextRecording* textRecording   () const;
    bool                  isReachable     () const;
    Certificate*          certificate     () const;
    QString               registeredName  () const;
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/contactmodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/contactmodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/contactmodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/contactmodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -58,7 +58,8 @@
 public:
     ContactModelPimpl(const ContactModel& linked,
                       Database& db,
-                      const CallbacksHandler& callbacksHandler);
+                      const CallbacksHandler& callbacksHandler,
+                      const BehaviorController& behaviorController);
 
     ~ContactModelPimpl();
     /**
@@ -81,6 +82,7 @@
     void addToContacts(ContactMethod* cm, const profile::Type& type, bool banned = false);
 
     // Helpers
+    const BehaviorController& behaviorController;
     const ContactModel& linked;
     Database& db;
     const CallbacksHandler& callbacksHandler;
@@ -154,10 +156,10 @@
 
 using namespace authority;
 
-ContactModel::ContactModel(const account::Info& owner, Database& database, const CallbacksHandler& callbacksHandler)
+ContactModel::ContactModel(const account::Info& owner, Database& database, const CallbacksHandler& callbacksHandler, const BehaviorController& behaviorController)
 : QObject()
 , owner(owner)
-, pimpl_(std::make_unique<ContactModelPimpl>(*this, database, callbacksHandler))
+, pimpl_(std::make_unique<ContactModelPimpl>(*this, database, callbacksHandler, behaviorController))
 {
 }
 
@@ -223,7 +225,7 @@
 
     switch (profile.type) {
     case profile::Type::TEMPORARY:
-        // NOTE: do not set profile::Type::RING, this has to be done when the daemon has emited contactAdded
+        // NOTE: do not set profile::Type::RING, this has to be done when the daemon has emitted contactAdded
 #ifndef ENABLE_TEST // The old LRC doesn't like mocks
         if (auto* account = AccountModel::instance().getById(owner.id.c_str()))
             account->sendContactRequest(URI(profile.uri.c_str()));
@@ -232,9 +234,11 @@
 #endif
         break;
     case profile::Type::PENDING:
-        daemon::addContactFromPending(owner, profile.uri);
-        emit pendingContactAccepted(profile.uri);
-        daemon::addContact(owner, profile.uri); // BUGS?: daemon::addContactFromPending not always add the contact
+        if (daemon::addContactFromPending(owner, profile.uri)) {
+            emit pendingContactAccepted(profile.uri);
+        } else {
+            return;
+        }
         break;
     case profile::Type::RING:
     case profile::Type::SIP:
@@ -276,7 +280,10 @@
         if (!banned && contact != pimpl_->contacts.end()
             && contact->second.profileInfo.type == profile::Type::PENDING) {
             // Discard the pending request and remove profile from db if necessary
-            daemon::discardFromPending(owner, contactUri);
+            if(!daemon::discardFromPending(owner, contactUri)) {
+                qDebug() << "Discard request for account " << owner.id.c_str() << " failed (" << contactUri.c_str() << ")";
+                return;
+            }
             pimpl_->contacts.erase(contactUri);
             database::removeContact(pimpl_->db, owner.profileInfo.uri, contactUri);
             emitContactRemoved = true;
@@ -403,9 +410,11 @@
 
 ContactModelPimpl::ContactModelPimpl(const ContactModel& linked,
                                      Database& db,
-                                     const CallbacksHandler& callbacksHandler)
+                                     const CallbacksHandler& callbacksHandler,
+                                     const BehaviorController& behaviorController)
 : linked(linked)
 , db(db)
+, behaviorController(behaviorController)
 , callbacksHandler(callbacksHandler)
 {
     // Init contacts map
@@ -552,6 +561,10 @@
     auto* cm = PhoneDirectoryModel::instance().getNumber(QString(contactUri.c_str()), account);
     auto contact = contacts.find(contactUri);
 
+    if (contact->second.profileInfo.type == profile::Type::PENDING) {
+        emit behaviorController.trustRequestTreated(linked.owner.id, contactUri);
+    }
+
     bool isBanned = false;
 
     {
@@ -601,6 +614,10 @@
         auto contact = contacts.find(contactUri);
         if (contact == contacts.end()) return;
 
+        if (contact->second.profileInfo.type == profile::Type::PENDING) {
+            emit behaviorController.trustRequestTreated(linked.owner.id, contactUri);
+        }
+
         if (banned) {
             contact->second.isBanned = true;
 
@@ -728,6 +745,7 @@
         return;
     }
 
+    auto emitTrust = false;
     {
         std::lock_guard<std::mutex> lk(contactsMtx_);
         if (contacts.find(contactUri) == contacts.end()) {
@@ -739,6 +757,7 @@
             auto profileInfo = profile::Info {contactUri, photo.toStdString(), alias.toStdString(), profile::Type::PENDING};
             auto contactInfo = contact::Info {profileInfo, cm->bestName().toStdString(), cm->isConfirmed(), cm->isPresent()};
             contacts.emplace(contactUri, contactInfo);
+            emitTrust = true;
             database::getOrInsertProfile(db, contactUri, alias.toStdString(),
                                          photo.toStdString(),
                                          profile::to_string(profile::Type::RING));
@@ -747,6 +766,9 @@
     }
 
     emit linked.contactAdded(contactUri);
+    if (emitTrust) {
+        emit behaviorController.newTrustRequest(linked.owner.id, contactUri);
+    }
 }
 
 void
@@ -773,6 +795,9 @@
         }
         if (emitContactAdded) {
             emit linked.contactAdded(fromId);
+            if (linked.owner.profileInfo.type == profile::Type::RING) {
+                emit behaviorController.newTrustRequest(linked.owner.id, fromId);
+            }
         }
         emit linked.incomingCallFromPending(fromId, callId);
         return;
@@ -790,7 +815,7 @@
         qDebug() << "ContactModel::slotNewAccountMessage(), nullptr";
         return;
     }
-
+    auto emitNewTrust = false;
     {
         std::lock_guard<std::mutex> lk(contactsMtx_);
         if (contacts.find(from) == contacts.end()) {
@@ -798,8 +823,12 @@
             // The conversation model will create an entry and link the incomingCall.
             auto* cm = PhoneDirectoryModel::instance().getNumber(QString(from.c_str()), account);
             addToContacts(cm, profile::Type::PENDING, false);
+            emitNewTrust = true;
         }
     }
+    if (emitNewTrust) {
+        emit behaviorController.newTrustRequest(linked.owner.id, from);
+    }
     emit linked.newAccountMessage(accountId, from, payloads);
 }
 
@@ -812,7 +841,7 @@
         qDebug() << "ContactModel::slotNewAccountTransfer(), nullptr";
         return;
     }
-
+    bool emitNewTrust = false;
     {
         std::lock_guard<std::mutex> lk(contactsMtx_);
         if (contacts.find(info.peerUri) == contacts.end()) {
@@ -820,8 +849,12 @@
             // The conversation model will create an entry and link the incomingCall.
             auto* cm = PhoneDirectoryModel::instance().getNumber(QString(info.peerUri.c_str()), account);
             addToContacts(cm, profile::Type::PENDING, false);
+            emitNewTrust = true;
         }
     }
+    if (emitNewTrust) {
+        emit behaviorController.newTrustRequest(linked.owner.id, info.peerUri);
+    }
     emit linked.newAccountTransfer(dringId, info);
 }
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/contactrequest.cpp ring-20180816.2.e26b79f~ds1/lrc/src/contactrequest.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/contactrequest.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/contactrequest.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -118,7 +118,7 @@
 /**
  * get the data by role selection
  * @param role define the role to select
- * @return a QVariant object, wich contains the selection
+ * @return a QVariant object, which contains the selection
  */
 QVariant
 ContactRequest::roleData(int role) const
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/conversationmodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/conversationmodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/conversationmodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/conversationmodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -31,6 +31,7 @@
 #include <algorithm>
 #include <mutex>
 #include <regex>
+#include <fstream>
 
 // LRC
 #include "api/lrc.h"
@@ -917,6 +918,7 @@
         pimpl_->dirtyConversations = {true, true};
         database::updateInteractionStatus(pimpl_->db, interactionId, newStatus);
         emit interactionStatusUpdated(convId, interactionId, itCopy);
+        emit pimpl_->behaviorController.newReadInteraction(owner.id, convId, interactionId);
     }
 }
 
@@ -1191,6 +1193,10 @@
             auto historyB = conversationB.interactions;
             // A or B is a new conversation (without CONTACT interaction)
             if (conversationA.uid.empty() || conversationB.uid.empty()) return conversationA.uid.empty();
+            if (historyA.empty() && historyB.empty()) {
+                // If no information to compare, sort by Ring ID
+                return conversationA.participants.front() > conversationB.participants.front();
+            }
             if (historyA.empty()) return false;
             if (historyB.empty()) return true;
             // Sort by last Interaction
@@ -1386,6 +1392,11 @@
     conversation.accountId = linked.owner.id;
     conversation.participants = {contactUri};
     try {
+        conversation.confId = linked.owner.callModel->getConferenceFromURI(contactUri).id;
+    } catch (...) {
+        conversation.confId = "";
+    }
+    try {
         conversation.callId = linked.owner.callModel->getCallFromURI(contactUri).id;
     } catch (...) {
         conversation.callId = "";
@@ -1600,7 +1611,7 @@
     auto msg = interaction::Info {authorId, body,
                                   timestamp == 0 ? std::time(nullptr) : static_cast<time_t>(timestamp),
                                   interaction::Type::TEXT, interaction::Status::UNREAD};
-    int msgId = database::addMessageToConversation(db, accountProfileId, conv[0], msg);
+    auto msgId = database::addMessageToConversation(db, accountProfileId, conv[0], msg);
     auto conversationIdx = indexOf(conv[0]);
     // Add the conversation if not already here
     if (conversationIdx == -1) {
@@ -1614,6 +1625,7 @@
         conversations[conversationIdx].lastMessageUid = msgId;
     }
     dirtyConversations = {true, true};
+    emit behaviorController.newUnreadInteraction(linked.owner.id, conv[0], msgId, msg);
     emit linked.newInteraction(conv[0], msgId, msg);
     sortConversations();
     emit linked.modelSorted();
@@ -1769,7 +1781,7 @@
 ConversationModel::cancelTransfer(const std::string& convUid, uint64_t interactionId)
 {
     // For this action, we change interaction status before effective canceling as daemon will
-    // emit Finished event code immediatly (before leaving this method) in non-DBus mode.
+    // emit Finished event code immediately (before leaving this method) in non-DBus mode.
     auto conversationIdx = pimpl_->indexOf(convUid);
     interaction::Info itCopy;
     bool emitUpdated = false;
@@ -1791,6 +1803,7 @@
         pimpl_->lrc.getDataTransferModel().cancel(interactionId);
         pimpl_->dirtyConversations = {true, true};
         emit interactionStatusUpdated(convUid, interactionId, itCopy);
+        emit pimpl_->behaviorController.newReadInteraction(owner.id, convUid, interactionId);
     }
 }
 
@@ -1875,6 +1888,7 @@
         conversations[conversationIdx].lastMessageUid = interactionId;
     }
     dirtyConversations = {true, true};
+    emit behaviorController.newUnreadInteraction(linked.owner.id, convId, interactionId, interaction);
     emit linked.newInteraction(convId, interactionId, interaction);
     sortConversations();
     emit linked.modelSorted();
@@ -1923,7 +1937,13 @@
             auto isImage = std::find(imageExtensions.begin(), imageExtensions.end(), extension) != imageExtensions.end();
             auto destinationDir = lrc.getDataTransferModel().downloadDirectory;
             if (info.totalSize < 20 * 1024 * 1024 && isImage && !destinationDir.empty()) {
-                acceptTransfer(convId, interactionId, destinationDir + info.displayName);
+                auto wantedFilename = destinationDir + info.displayName;
+                auto duplicate = 0;
+                while (std::ifstream(wantedFilename).good()) {
+                    wantedFilename = destinationDir + "(" + std::to_string(duplicate) + ")" + info.displayName;
+                    ++duplicate;
+                }
+                acceptTransfer(convId, interactionId, wantedFilename);
             }
         }
     }
@@ -1955,6 +1975,7 @@
         sendContactRequest(conversations[conversationIdx].participants.front());
         dirtyConversations = {true, true};
         emit linked.interactionStatusUpdated(convUid, interactionId, itCopy);
+        emit behaviorController.newReadInteraction(linked.owner.id, convUid, interactionId);
     }
 }
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/credentialmodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/credentialmodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/credentialmodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/credentialmodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -598,7 +598,7 @@
 
    bool avail = m_smAvailableInProtocol[t][m_pAccount->protocol()];
 
-#if 0 //TODO it mostly work, but make developement/testing harder, to enable in the last patch
+#if 0 //TODO it mostly work, but make development/testing harder, to enable in the last patch
    switch(t) {
       case Credential::Type::STUN:
          avail &= m_pAccount->isSipStunEnabled();
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/database.h ring-20180816.2.e26b79f~ds1/lrc/src/database.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/database.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/database.h	2018-08-16 15:09:52.000000000 +0000
@@ -53,7 +53,7 @@
     ~Database();
 
     /**
-     * A structure wich contains result(s) returned by a database query.
+     * A structure which contains result(s) returned by a database query.
      */
     struct Result {
         int nbrOfCols = -1; ///< store the number of columns returned.
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/callmanager.h ring-20180816.2.e26b79f~ds1/lrc/src/dbus/callmanager.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/callmanager.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/dbus/callmanager.h	2018-08-16 15:09:52.000000000 +0000
@@ -33,6 +33,6 @@
 namespace CallManager {
 
 ///Singleton to access dbus "CallManager" interface
-CallManagerInterface& LIB_EXPORT instance();
+LIB_EXPORT CallManagerInterface& instance();
 
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/configurationmanager.h ring-20180816.2.e26b79f~ds1/lrc/src/dbus/configurationmanager.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/configurationmanager.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/dbus/configurationmanager.h	2018-08-16 15:09:52.000000000 +0000
@@ -33,6 +33,6 @@
 namespace ConfigurationManager {
 
 ///Singleton to access the ConfigurationManager dbus interface
-ConfigurationManagerInterface& LIB_EXPORT instance();
+LIB_EXPORT ConfigurationManagerInterface& instance();
 
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/instancemanager.cpp ring-20180816.2.e26b79f~ds1/lrc/src/dbus/instancemanager.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/instancemanager.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/dbus/instancemanager.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -19,7 +19,11 @@
 
 #include "instancemanager.h"
 
-#include <unistd.h>
+#ifndef _MSC_VER
+#include <unistd.h>
+#else
+#include "../../daemon/MSVC/unistd.h"
+#endif // !_MSC_VER
 
 #include "../globalinstances.h"
 #include "../interfaces/dbuserrorhandleri.h"
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/instancemanager.h ring-20180816.2.e26b79f~ds1/lrc/src/dbus/instancemanager.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/instancemanager.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/dbus/instancemanager.h	2018-08-16 15:09:52.000000000 +0000
@@ -32,6 +32,6 @@
 
 namespace InstanceManager {
 
-InstanceManagerInterface& LIB_EXPORT instance();
+LIB_EXPORT InstanceManagerInterface& instance();
 
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/presencemanager.h ring-20180816.2.e26b79f~ds1/lrc/src/dbus/presencemanager.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/presencemanager.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/dbus/presencemanager.h	2018-08-16 15:09:52.000000000 +0000
@@ -31,6 +31,6 @@
 
 namespace PresenceManager {
 
-PresenceManagerInterface& LIB_EXPORT instance();
+LIB_EXPORT PresenceManagerInterface& instance();
 
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/videomanager.h ring-20180816.2.e26b79f~ds1/lrc/src/dbus/videomanager.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/dbus/videomanager.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/dbus/videomanager.h	2018-08-16 15:09:52.000000000 +0000
@@ -32,6 +32,6 @@
 
 namespace VideoManager {
 
-VideoManagerInterface& LIB_EXPORT instance();
+LIB_EXPORT VideoManagerInterface& instance();
 
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/historytimecategorymodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/historytimecategorymodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/historytimecategorymodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/historytimecategorymodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -21,6 +21,16 @@
 #include <QtCore/QDate>
 #include <time.h>
 
+#ifdef _MSC_VER
+struct tm *localtime_r(const time_t *_clock, struct tm *_result)
+{
+    struct tm *p = localtime(_clock);
+    if (p)
+        *(_result) = *p;
+    return p;
+}
+#endif
+
 class HistoryTimeCategoryModelPrivate
 {
 public:
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/interfaces/itemmodelstateserializeri.h ring-20180816.2.e26b79f~ds1/lrc/src/interfaces/itemmodelstateserializeri.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/interfaces/itemmodelstateserializeri.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/interfaces/itemmodelstateserializeri.h	2018-08-16 15:09:52.000000000 +0000
@@ -60,7 +60,7 @@
     virtual bool isChecked(const CollectionInterface* backend) const = 0;
 
     /**
-     * Allow to overload the default algoritm used to look for a default
+     * Allow to overload the default algorithm used to look for a default
      * collection to store something new.
      *
      * @param manager The likes of PersonModel::instance() or CategorizedHistoryModel::instance()
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/itembase.cpp ring-20180816.2.e26b79f~ds1/lrc/src/itembase.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/itembase.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/itembase.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -50,7 +50,7 @@
    return d_ptr->m_pBackend->save(this);
 }
 
-///Show an implementation dependant dialog to edit the contact
+///Show an implementation dependent dialog to edit the contact
 bool ItemBase::edit()
 {
    if (!d_ptr->m_pBackend)
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/localhistorycollection.cpp ring-20180816.2.e26b79f~ds1/lrc/src/localhistorycollection.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/localhistorycollection.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/localhistorycollection.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -99,8 +99,8 @@
    stream << QString("%1=%2\n").arg(Call::HistoryMapFields::CONTACT_USED    ).arg(false                                   );//TODO
 
    //TODO handle more than one recording
-   if (call->hasRecording(Media::Media::Type::AUDIO,Media::Media::Direction::IN)) {
-      stream << QString("%1=%2\n").arg(Call::HistoryMapFields::RECORDING_PATH  ).arg(((Media::AVRecording*)call->recordings(Media::Media::Type::AUDIO,Media::Media::Direction::IN)[0])->path().path());
+   if (call->hasRecording(media::Media::Type::AUDIO,media::Media::Direction::IN)) {
+      stream << QString("%1=%2\n").arg(Call::HistoryMapFields::RECORDING_PATH  ).arg(((media::AVRecording*)call->recordings(media::Media::Type::AUDIO,media::Media::Direction::IN)[0])->path().path());
    }
 
    if (call->peerContactMethod()->contact()) {
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/localrecordingcollection.cpp ring-20180816.2.e26b79f~ds1/lrc/src/localrecordingcollection.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/localrecordingcollection.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/localrecordingcollection.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -26,23 +26,23 @@
 #include <media/recording.h>
 #include <media/avrecording.h>
 
-class LocalRecordingEditor final : public CollectionEditor<Media::Recording>
+class LocalRecordingEditor final : public CollectionEditor<media::Recording>
 {
 public:
-   LocalRecordingEditor(CollectionMediator<Media::Recording>* m) : CollectionEditor<Media::Recording>(m) {}
-   virtual bool save       ( const Media::Recording* item ) override;
-   virtual bool remove     ( const Media::Recording* item ) override;
-   virtual bool edit       ( Media::Recording*       item ) override;
-   virtual bool addNew     ( Media::Recording*       item ) override;
-   virtual bool addExisting( const Media::Recording* item ) override;
+   LocalRecordingEditor(CollectionMediator<media::Recording>* m) : CollectionEditor<media::Recording>(m) {}
+   virtual bool save       ( const media::Recording* item ) override;
+   virtual bool remove     ( const media::Recording* item ) override;
+   virtual bool edit       (media::Recording*       item ) override;
+   virtual bool addNew     (media::Recording*       item ) override;
+   virtual bool addExisting( const media::Recording* item ) override;
 
 private:
-   virtual QVector<Media::Recording*> items() const override;
+   virtual QVector<media::Recording*> items() const override;
    //Attributes
-   QVector<Media::Recording*> m_lNumbers;
+   QVector<media::Recording*> m_lNumbers;
 };
 
-LocalRecordingCollection::LocalRecordingCollection(CollectionMediator<Media::Recording>* mediator) :
+LocalRecordingCollection::LocalRecordingCollection(CollectionMediator<media::Recording>* mediator) :
    CollectionInterface(new LocalRecordingEditor(mediator))
 {
    load();
@@ -55,43 +55,43 @@
 
 LocalRecordingCollection& LocalRecordingCollection::instance()
 {
-   static auto instance = Media::RecordingModel::instance().addCollection<LocalRecordingCollection>();
+   static auto instance = media::RecordingModel::instance().addCollection<LocalRecordingCollection>();
    return *instance;
 }
 
-bool LocalRecordingEditor::save(const Media::Recording* recording)
+bool LocalRecordingEditor::save(const media::Recording* recording)
 {
    Q_UNUSED(recording)
    return true;
 }
 
-bool LocalRecordingEditor::remove(const Media::Recording* item)
+bool LocalRecordingEditor::remove(const media::Recording* item)
 {
    Q_UNUSED(item)
    //TODO
    return false;
 }
 
-bool LocalRecordingEditor::edit( Media::Recording* item)
+bool LocalRecordingEditor::edit(media::Recording* item)
 {
    Q_UNUSED(item)
    return false;
 }
 
-bool LocalRecordingEditor::addNew( Media::Recording* item)
+bool LocalRecordingEditor::addNew(media::Recording* item)
 {
    addExisting(item);
    return save(item);
 }
 
-bool LocalRecordingEditor::addExisting(const Media::Recording* item)
+bool LocalRecordingEditor::addExisting(const media::Recording* item)
 {
-   m_lNumbers << const_cast<Media::Recording*>(item);
+   m_lNumbers << const_cast<media::Recording*>(item);
    mediator()->addItem(item);
    return false;
 }
 
-QVector<Media::Recording*> LocalRecordingEditor::items() const
+QVector<media::Recording*> LocalRecordingEditor::items() const
 {
    return m_lNumbers;
 }
@@ -148,11 +148,11 @@
    return "localrecording";
 }
 
-Media::Recording* LocalRecordingCollection::addFromPath(const QString& path)
+media::Recording* LocalRecordingCollection::addFromPath(const QString& path)
 {
-   Media::AVRecording* rec = new Media::AVRecording();
+    media::AVRecording* rec = new media::AVRecording();
    rec->setPath(path);
 
-   editor<Media::Recording>()->addExisting(rec);
+   editor<media::Recording>()->addExisting(rec);
    return rec;
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/localrecordingcollection.h ring-20180816.2.e26b79f~ds1/lrc/src/localrecordingcollection.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/localrecordingcollection.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/localrecordingcollection.h	2018-08-16 15:09:52.000000000 +0000
@@ -21,14 +21,14 @@
 #include <typedefs.h>
 #include <collectioneditor.h>
 
-namespace Media {
+namespace media {
    class Recording;
 }
 
 class LIB_EXPORT LocalRecordingCollection : public CollectionInterface
 {
 public:
-   explicit LocalRecordingCollection(CollectionMediator<Media::Recording>* mediator);
+   explicit LocalRecordingCollection(CollectionMediator<media::Recording>* mediator);
    virtual ~LocalRecordingCollection();
 
    virtual bool load  () override;
@@ -44,7 +44,7 @@
    virtual FlagPack<SupportedFeatures> supportedFeatures() const override;
 
    //Mutator
-   Media::Recording* addFromPath(const QString& path);
+   media::Recording* addFromPath(const QString& path);
 
    static LocalRecordingCollection& instance();
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/localtextrecordingcollection.cpp ring-20180816.2.e26b79f~ds1/lrc/src/localtextrecordingcollection.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/localtextrecordingcollection.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/localtextrecordingcollection.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -46,26 +46,26 @@
  * concatenated then hashed in sha1 again.
  */
 
-class LocalTextRecordingEditor final : public CollectionEditor<Media::Recording>
+class LocalTextRecordingEditor final : public CollectionEditor<media::Recording>
 {
 public:
-   LocalTextRecordingEditor(CollectionMediator<Media::Recording>* m) : CollectionEditor<Media::Recording>(m) {}
-   virtual bool save       ( const Media::Recording* item ) override;
-   virtual bool remove     ( const Media::Recording* item ) override;
-   virtual bool edit       ( Media::Recording*       item ) override;
-   virtual bool addNew     ( Media::Recording*       item ) override;
-   virtual bool addExisting( const Media::Recording* item ) override;
+   LocalTextRecordingEditor(CollectionMediator<media::Recording>* m) : CollectionEditor<media::Recording>(m) {}
+   virtual bool save       ( const media::Recording* item ) override;
+   virtual bool remove     ( const media::Recording* item ) override;
+   virtual bool edit       ( media::Recording*       item ) override;
+   virtual bool addNew     ( media::Recording*       item ) override;
+   virtual bool addExisting( const media::Recording* item ) override;
    QString fetch(const QByteArray& sha1);
 
    void clearAll();
 
 private:
-   virtual QVector<Media::Recording*> items() const override;
+   virtual QVector<media::Recording*> items() const override;
    //Attributes
-   QVector<Media::Recording*> m_lNumbers;
+   QVector<media::Recording*> m_lNumbers;
 };
 
-LocalTextRecordingCollection::LocalTextRecordingCollection(CollectionMediator<Media::Recording>* mediator) :
+LocalTextRecordingCollection::LocalTextRecordingCollection(CollectionMediator<media::Recording>* mediator) :
    CollectionInterface(new LocalTextRecordingEditor(mediator))
 {
    load();
@@ -78,14 +78,14 @@
 
 LocalTextRecordingCollection& LocalTextRecordingCollection::instance()
 {
-   static auto instance = Media::RecordingModel::instance().addCollection<LocalTextRecordingCollection>();
+   static auto instance = media::RecordingModel::instance().addCollection<LocalTextRecordingCollection>();
    return *instance;
 }
 
-bool LocalTextRecordingEditor::save(const Media::Recording* recording)
+bool LocalTextRecordingEditor::save(const media::Recording* recording)
 {
    Q_UNUSED(recording)
-   QHash<QByteArray,QByteArray> ret = static_cast<const Media::TextRecording*>(recording)->d_ptr->toJsons();
+   QHash<QByteArray,QByteArray> ret = static_cast<const media::TextRecording*>(recording)->d_ptr->toJsons();
 
    QDir dir(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
 
@@ -110,36 +110,36 @@
 
 void LocalTextRecordingEditor::clearAll()
 {
-    for (Media::Recording *recording : items()) {
-        auto textRecording = qobject_cast<Media::TextRecording*>(recording);
+    for (media::Recording *recording : items()) {
+        auto textRecording = qobject_cast<media::TextRecording*>(recording);
         textRecording->d_ptr->clear();
         save(recording);
     }
 }
 
-bool LocalTextRecordingEditor::remove(const Media::Recording* item)
+bool LocalTextRecordingEditor::remove(const media::Recording* item)
 {
    Q_UNUSED(item)
    //TODO
    return false;
 }
 
-bool LocalTextRecordingEditor::edit( Media::Recording* item)
+bool LocalTextRecordingEditor::edit( media::Recording* item)
 {
    Q_UNUSED(item)
    return false;
 }
 
-bool LocalTextRecordingEditor::addNew( Media::Recording* item)
+bool LocalTextRecordingEditor::addNew( media::Recording* item)
 {
    Q_UNUSED(item)
    addExisting(item);
    return save(item);
 }
 
-bool LocalTextRecordingEditor::addExisting(const Media::Recording* item)
+bool LocalTextRecordingEditor::addExisting(const media::Recording* item)
 {
-   m_lNumbers << const_cast<Media::Recording*>(item);
+   m_lNumbers << const_cast<media::Recording*>(item);
    mediator()->addItem(item);
    return false;
 }
@@ -155,7 +155,7 @@
    return QString::fromUtf8(file.readAll());
 }
 
-QVector<Media::Recording*> LocalTextRecordingEditor::items() const
+QVector<media::Recording*> LocalTextRecordingEditor::items() const
 {
    return m_lNumbers;
 }
@@ -206,9 +206,9 @@
                 QJsonDocument loadDoc = QJsonDocument::fromJson(content.toUtf8(), &err);
 
                 if (err.error == QJsonParseError::ParseError::NoError) {
-                    Media::TextRecording* r = Media::TextRecording::fromJson({loadDoc.object()}, nullptr, this);
+                    media::TextRecording* r = media::TextRecording::fromJson({loadDoc.object()}, nullptr, this);
 
-                    editor<Media::Recording>()->addExisting(r);
+                    editor<media::Recording>()->addExisting(r);
 
                     // get CMs from recording
                     for (ContactMethod *cm : r->peers()) {
@@ -255,7 +255,7 @@
 
 bool LocalTextRecordingCollection::clear()
 {
-    static_cast<LocalTextRecordingEditor *>(editor<Media::Recording>())->clearAll();
+    static_cast<LocalTextRecordingEditor *>(editor<media::Recording>())->clearAll();
 
     QDir dir(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/text");
 
@@ -303,10 +303,10 @@
    return false;
 }
 
-Media::TextRecording* LocalTextRecordingCollection::fetchFor(const ContactMethod* cm)
+media::TextRecording* LocalTextRecordingCollection::fetchFor(const ContactMethod* cm)
 {
    const QByteArray& sha1 = cm->sha1();
-   const QString content = static_cast<LocalTextRecordingEditor*>(editor<Media::Recording>())->fetch(sha1);
+   const QString content = static_cast<LocalTextRecordingEditor*>(editor<media::Recording>())->fetch(sha1);
 
    if (content.isEmpty())
       return nullptr;
@@ -319,19 +319,19 @@
        return nullptr;
    }
 
-   Media::TextRecording* r = Media::TextRecording::fromJson({loadDoc.object()}, cm, this);
+   media::TextRecording* r = media::TextRecording::fromJson({loadDoc.object()}, cm, this);
 
-   editor<Media::Recording>()->addExisting(r);
+   editor<media::Recording>()->addExisting(r);
 
    return r;
 }
 
-Media::TextRecording* LocalTextRecordingCollection::createFor(const ContactMethod* cm)
+media::TextRecording* LocalTextRecordingCollection::createFor(const ContactMethod* cm)
 {
-   Media::TextRecording* r = fetchFor(cm);
+   media::TextRecording* r = fetchFor(cm);
 
    if (!r) {
-      r = new Media::TextRecording();
+      r = new media::TextRecording();
       r->setCollection(this);
       cm->d_ptr->setTextRecording(r);
    }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/localtextrecordingcollection.h ring-20180816.2.e26b79f~ds1/lrc/src/localtextrecordingcollection.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/localtextrecordingcollection.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/localtextrecordingcollection.h	2018-08-16 15:09:52.000000000 +0000
@@ -22,7 +22,7 @@
 
 #include <typedefs.h>
 
-namespace Media {
+namespace media {
    class Recording;
    class TextRecording;
 }
@@ -30,7 +30,7 @@
 class LIB_EXPORT LocalTextRecordingCollection : public CollectionInterface
 {
 public:
-   explicit LocalTextRecordingCollection(CollectionMediator<Media::Recording>* mediator);
+   explicit LocalTextRecordingCollection(CollectionMediator<media::Recording>* mediator);
    virtual ~LocalTextRecordingCollection();
 
    virtual bool load  () override;
@@ -47,8 +47,8 @@
    virtual bool listId(std::function<void(const QList<Element>)> callback) const override;
    virtual QList<Element> listId() const override;
 
-   Media::TextRecording* fetchFor (const ContactMethod* cm);
-   Media::TextRecording* createFor(const ContactMethod* cm);
+   media::TextRecording* fetchFor (const ContactMethod* cm);
+   media::TextRecording* createFor(const ContactMethod* cm);
 
    virtual FlagPack<SupportedFeatures> supportedFeatures() const override;
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/lrc.cpp ring-20180816.2.e26b79f~ds1/lrc/src/lrc.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/lrc.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/lrc.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************
- *   Copyright (C) 2017-2018 Savoir-faire Linux                                  *
+ *   Copyright (C) 2017-2018 Savoir-faire Linux                             *
  *   Author : Nicolas Jäger <nicolas.jager@savoirfairelinux.com>            *
  *   Author : Sébastien Blin <sebastien.blin@savoirfairelinux.com>          *
  *                                                                          *
@@ -24,6 +24,7 @@
 #include "api/behaviorcontroller.h"
 #include "database.h"
 #include "callbackshandler.h"
+#include "dbus/configurationmanager.h"
 #include "dbus/instancemanager.h"
 
 namespace lrc
@@ -75,6 +76,32 @@
     return *lrcPimpl_->dataTransferModel;
 }
 
+void
+Lrc::connectivityChanged() const
+{
+    ConfigurationManager::instance().connectivityChanged();
+}
+
+bool
+Lrc::isConnected()
+{
+#ifdef ENABLE_LIBWRAP
+    return true;
+#else
+    return ConfigurationManager::instance().connection().isConnected();
+#endif
+}
+
+bool
+Lrc::dbusIsValid()
+{
+#ifdef ENABLE_LIBWRAP
+    return true;
+#else
+    return ConfigurationManager::instance().isValid();
+#endif
+}
+
 LrcPimpl::LrcPimpl(Lrc& linked)
 : linked(linked)
 , behaviorController(std::make_unique<BehaviorController>())
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/audio.cpp ring-20180816.2.e26b79f~ds1/lrc/src/media/audio.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/audio.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/audio.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -28,29 +28,30 @@
 {
 };
 
-Media::Audio::Audio(Call* parent, const Media::Direction direction) : Media::Media(parent, direction), d_ptr(new MediaAudioPrivate())
+media::Audio::Audio(Call* parent, const media::Media::Direction direction) :
+    media::Media(parent, direction), d_ptr(new MediaAudioPrivate())
 {
    Q_ASSERT(parent);
 }
 
-Media::Media::Type Media::Audio::type()
+media::Media::Type media::Audio::type()
 {
-   return Media::Media::Type::AUDIO;
+   return media::Media::Type::AUDIO;
 }
 
-bool Media::Audio::mute()
+bool media::Audio::mute()
 {
    CallManagerInterface& callManager = CallManager::instance();
-   return callManager.muteLocalMedia(call()->dringId(),DRing::Media::Details::MEDIA_TYPE_AUDIO,true);
+   return callManager.muteLocalMedia(call()->dringId(), DRing::Media::Details::MEDIA_TYPE_AUDIO,true);
 }
 
-bool Media::Audio::unmute()
+bool media::Audio::unmute()
 {
    CallManagerInterface& callManager = CallManager::instance();
-   return callManager.muteLocalMedia(call()->dringId(),DRing::Media::Details::MEDIA_TYPE_AUDIO,false);
+   return callManager.muteLocalMedia(call()->dringId(), DRing::Media::Details::MEDIA_TYPE_AUDIO,false);
 }
 
-Media::Audio::~Audio()
+media::Audio::~Audio()
 {
    delete d_ptr;
 }
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/audio.h ring-20180816.2.e26b79f~ds1/lrc/src/media/audio.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/audio.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/audio.h	2018-08-16 15:09:52.000000000 +0000
@@ -24,9 +24,9 @@
 class Call;
 class CallPrivate;
 
-namespace Media {
+namespace media {
 
-class LIB_EXPORT Audio : public Media::Media
+class LIB_EXPORT Audio : public media::Media
 {
    friend class ::CallPrivate;
 public:
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/avrecording.cpp ring-20180816.2.e26b79f~ds1/lrc/src/media/avrecording.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/avrecording.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/avrecording.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -23,7 +23,7 @@
 //Ring
 #include <callmodel.h>
 
-namespace Media {
+namespace media {
 
 class AVRecordingPrivate {
 public:
@@ -65,12 +65,12 @@
    RecordingPlaybackManager();
 
    //Attributes
-   QList<Media::AVRecording*>         m_lActiveRecordings;
-   QHash<QString,Media::AVRecording*> m_hActiveRecordings;
+   QList<media::AVRecording*>         m_lActiveRecordings;
+   QHash<QString, media::AVRecording*> m_hActiveRecordings;
 
    //Mutator
-   void activateRecording   (Media::AVRecording* r);
-   void desactivateRecording(Media::AVRecording* r);
+   void activateRecording   (media::AVRecording* r);
+   void desactivateRecording(media::AVRecording* r);
 
    //Singleton
    static RecordingPlaybackManager& instance();
@@ -97,29 +97,29 @@
 }
 
 
-Media::AVRecordingPrivate::AVRecordingPrivate(AVRecording* r) : q_ptr(r),m_Position(0.0),m_Duration(0),m_IsPaused(false),
+media::AVRecordingPrivate::AVRecordingPrivate(AVRecording* r) : q_ptr(r),m_Position(0.0),m_Duration(0),m_IsPaused(false),
 m_Elapsed(0),m_Left(0)
 {
 
 }
 
-Media::AVRecording::AVRecording() : Recording(Recording::Type::AUDIO_VIDEO), d_ptr(new AVRecordingPrivate(this))
+media::AVRecording::AVRecording() : Recording(Recording::Type::AUDIO_VIDEO), d_ptr(new AVRecordingPrivate(this))
 {
 }
 
-Media::AVRecording::~AVRecording()
+media::AVRecording::~AVRecording()
 {
    delete d_ptr;
 }
 
 ///Return this recording path, if any
-QUrl Media::AVRecording::path() const
+QUrl media::AVRecording::path() const
 {
    return d_ptr->m_Path;
 }
 
 ///Get the current playback position (0.0 if not playing)
-Media::AVRecording::Position Media::AVRecording::position() const
+media::AVRecording::Position media::AVRecording::position() const
 {
    return d_ptr->m_Position;
 }
@@ -128,7 +128,7 @@
  * Recording duration (in seconds). This is only available for audio/video
  * recordings and only after playback started.
  */
-int Media::AVRecording::duration() const
+int media::AVRecording::duration() const
 {
    return d_ptr->m_Duration;
 }
@@ -146,31 +146,31 @@
    }
 
 ///Get the a string in format hhh:mm:ss for the time elapsed since the playback started
-QString Media::AVRecording::formattedTimeElapsed() const
+QString media::AVRecording::formattedTimeElapsed() const
 {
    FORMATTED_TIME_MACRO(d_ptr->m_Elapsed);
 }
 
 ///Get the a string in format hhh:mm:ss for the total time of this recording
-QString Media::AVRecording::formattedDuration() const
+QString media::AVRecording::formattedDuration() const
 {
    FORMATTED_TIME_MACRO(d_ptr->m_Duration);
 }
 
 ///Get the a string in format hhh:mm:ss for the time elapsed before the playback end
-QString Media::AVRecording::formattedTimeLeft() const
+QString media::AVRecording::formattedTimeLeft() const
 {
    FORMATTED_TIME_MACRO(d_ptr->m_Left);
 }
 #undef FORMATTED_TIME_MACRO
 
-void Media::AVRecording::setPath(const QUrl& path)
+void media::AVRecording::setPath(const QUrl& path)
 {
    d_ptr->m_Path = path;
 }
 
 ///Play (or resume) the playback
-void Media::AVRecording::play()
+void media::AVRecording::play()
 {
    RecordingPlaybackManager::instance().activateRecording(this);
 
@@ -186,7 +186,7 @@
 }
 
 ///Stop the playback, cancel any pause point
-void Media::AVRecording::stop()
+void media::AVRecording::stop()
 {
    CallManagerInterface& callManager = CallManager::instance();
    Q_NOREPLY callManager.stopRecordedFilePlayback();
@@ -197,7 +197,7 @@
 }
 
 ///Pause (or resume)
-void Media::AVRecording::pause()
+void media::AVRecording::pause()
 {
    if (d_ptr->m_IsPaused) {
       play();
@@ -213,20 +213,20 @@
  * @note only available during playback
  * @args pos The position, in percent
  */
-void Media::AVRecording::seek(AVRecording::Position pos)
+void media::AVRecording::seek(AVRecording::Position pos)
 {
    CallManagerInterface& callManager = CallManager::instance();
    Q_NOREPLY callManager.recordPlaybackSeek(pos);
 }
 
 ///Move the playback position to the origin
-void Media::AVRecording::reset()
+void media::AVRecording::reset()
 {
    seek(0.0);
 }
 
 ///Update all internal playback metadatas
-void Media::AVRecordingPrivate::notifySeek(int position, int size)
+void media::AVRecordingPrivate::notifySeek(int position, int size)
 {
    const int oldElapsed  = m_Elapsed ;
    const int oldDuration = m_Duration;
@@ -258,7 +258,7 @@
 ///Callback when a recording stop
 void RecordingPlaybackManager::slotRecordPlaybackStopped(const QString& filepath)
 {
-   Media::AVRecording* r = m_hActiveRecordings[filepath];
+    media::AVRecording* r = m_hActiveRecordings[filepath];
    if (r) {
       desactivateRecording(r);
    }
@@ -267,7 +267,7 @@
 ///Callback when a recording position changed
 void RecordingPlaybackManager::slotUpdatePlaybackScale(const QString& filepath, int position, int size)
 {
-   Media::AVRecording* r = m_hActiveRecordings[filepath];
+    media::AVRecording* r = m_hActiveRecordings[filepath];
 
    if (r) {
       r->d_ptr->notifySeek(position, size);
@@ -277,14 +277,14 @@
 }
 
 ///To avoid having to keep a list of all recording, manage a small active recording list
-void RecordingPlaybackManager::activateRecording(Media::AVRecording* r)
+void RecordingPlaybackManager::activateRecording(media::AVRecording* r)
 {
    m_lActiveRecordings << r;
    m_hActiveRecordings[r->path().path()] = r;
 }
 
 ///To avoid having to keep a list of all recording, manage a small active recording list
-void RecordingPlaybackManager::desactivateRecording(Media::AVRecording* r)
+void RecordingPlaybackManager::desactivateRecording(media::AVRecording* r)
 {
    m_lActiveRecordings.removeAll(r);
    m_hActiveRecordings.remove(m_hActiveRecordings.key(r));
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/avrecording.h ring-20180816.2.e26b79f~ds1/lrc/src/media/avrecording.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/avrecording.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/avrecording.h	2018-08-16 15:09:52.000000000 +0000
@@ -21,7 +21,7 @@
 
 #include <QtCore/QUrl>
 
-namespace Media {
+namespace media {
 
 class AVRecordingPrivate;
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/file.cpp ring-20180816.2.e26b79f~ds1/lrc/src/media/file.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/file.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/file.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -28,17 +28,17 @@
 {
 };
 
-Media::File::File(Call* parent, const Media::Direction direction) : Media::Media(parent, direction), d_ptr(new MediaFilePrivate())
+media::File::File(Call* parent, const Media::Direction direction) : media::Media(parent, direction), d_ptr(new MediaFilePrivate())
 {
    Q_ASSERT(parent);
 }
 
-Media::Media::Type Media::File::type()
+media::Media::Type media::File::type()
 {
-   return Media::Media::Type::FILE;
+   return media::Media::Type::FILE;
 }
 
-Media::File::~File()
+media::File::~File()
 {
    delete d_ptr;
 }
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/file.h ring-20180816.2.e26b79f~ds1/lrc/src/media/file.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/file.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/file.h	2018-08-16 15:09:52.000000000 +0000
@@ -24,9 +24,9 @@
 class Call;
 class CallPrivate;
 
-namespace Media {
+namespace media {
 
-class LIB_EXPORT File : public Media::Media
+class LIB_EXPORT File : public media::Media
 {
    friend class ::CallPrivate;
 public:
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/media.cpp ring-20180816.2.e26b79f~ds1/lrc/src/media/media.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/media.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/media.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -20,7 +20,7 @@
 #include "../private/media_p.h"
 #include <call.h>
 
-const Matrix2D<Media::Media::State, Media::Media::Action, bool> Media::MediaPrivate::m_mValidTransitions ={{
+const Matrix2D<media::Media::State, media::Media::Action, bool> media::MediaPrivate::m_mValidTransitions ={{
    /*                MUTE   UNMUTE  TERMINATE */
    /* ACTIVE   */ {{ true  , true  , true     }},
    /* MUTED    */ {{ true  , true  , true     }},
@@ -30,7 +30,7 @@
 
 //Use the Media::MediaPrivate wrapper to avoid vtable issues
 #define MEDF &MediaPrivate
-const Matrix2D<Media::Media::State, Media::Media::Action, Media::MediaTransitionFct> Media::MediaPrivate::m_mCallbacks ={{
+const Matrix2D<media::Media::State, media::Media::Action, media::MediaTransitionFct> media::MediaPrivate::m_mCallbacks ={{
    /*                     MUTE           UNMUTE         TERMINATE     */
    /* ACTIVE   */ {{ MEDF::mute    , MEDF::nothing , MEDF::terminate }},
    /* MUTED    */ {{ MEDF::nothing , MEDF::unmute  , MEDF::terminate }},
@@ -39,22 +39,23 @@
 }};
 #undef MEDF
 
-namespace Media {
+namespace media {
 
 MediaPrivate::MediaPrivate(Media* parent) :
- m_State(Media::Media::State::ACTIVE),m_pCall(nullptr),q_ptr(parent),m_Direction(Media::Direction::OUT)
+ m_State(media::Media::State::ACTIVE),m_pCall(nullptr),q_ptr(parent),m_Direction(Media::Direction::OUT)
 {
 
 }
 
-Media::Media(Call* parent, const Direction dir) : QObject(parent), d_ptr(new MediaPrivate(this))
+media::Media::Media(Call* parent, const media::Media::Direction dir) :
+    QObject(parent), d_ptr(new MediaPrivate(this))
 {
    Q_ASSERT(parent);
    d_ptr->m_pCall = parent;
    d_ptr->m_Direction = dir;
 }
 
-Media::~Media()
+media::Media::~Media()
 {
    delete d_ptr;
 }
@@ -68,59 +69,59 @@
  *
  * @return if the operation has already failed
  */
-bool Media::Media::mute()
+bool media::Media::mute()
 {
    return false;
 }
 
-bool Media::Media::unmute()
+bool media::Media::unmute()
 {
    return false;
 }
 
-bool Media::Media::terminate()
+bool media::Media::terminate()
 {
    return false;
 }
 
-bool Media::MediaPrivate::mute()
+bool media::MediaPrivate::mute()
 {
    return q_ptr->mute();
 }
 
-bool Media::MediaPrivate::unmute()
+bool media::MediaPrivate::unmute()
 {
    return q_ptr->unmute();
 }
 
-bool Media::MediaPrivate::terminate()
+bool media::MediaPrivate::terminate()
 {
    return q_ptr->terminate();
 }
 
-bool Media::MediaPrivate::nothing()
+bool media::MediaPrivate::nothing()
 {
    return true;
 }
 
-Call* Media::Media::call() const
+Call* media::Media::call() const
 {
    return d_ptr->m_pCall;
 }
 
-Media::Media::Direction Media::Media::direction() const
+media::Media::Direction media::Media::direction() const
 {
    return d_ptr->m_Direction;
 }
 
-Media::Media::State Media::Media::state() const
+media::Media::State media::Media::state() const
 {
    return d_ptr->m_State;
 }
 
-bool Media::Media::performAction(const Media::Media::Action action)
+bool media::Media::performAction(const media::Media::Action action)
 {
-   const Media::Media::State s = d_ptr->m_State;
+   const media::Media::State s = d_ptr->m_State;
 
    //TODO implement a state machine
    const bool ret = (d_ptr->*(d_ptr->m_mCallbacks)[d_ptr->m_State][action])();
@@ -132,34 +133,34 @@
    return ret;
 }
 
-Media::Media* operator<<(Media::Media* m, Media::Media::Action a)
+media::Media* operator<<(media::Media* m, media::Media::Action a)
 {
    m->performAction(a);
    return m;
 }
 
-void Media::MediaPrivate::muteConfirmed()
+void media::MediaPrivate::muteConfirmed()
 {
    const auto ll = m_State;
-   m_State = Media::Media::State::MUTED;
+   m_State = media::Media::State::MUTED;
    emit q_ptr->stateChanged(m_State, ll);
 }
 
-void Media::MediaPrivate::unmuteConfirmed()
+void media::MediaPrivate::unmuteConfirmed()
 {
    const auto ll = m_State;
    switch(q_ptr->type()) {
-      case Media::Media::Type::AUDIO:
-      case Media::Media::Type::VIDEO:
-      case Media::Media::Type::FILE:
-         m_State = Media::Media::State::ACTIVE;
+      case media::Media::Type::AUDIO:
+      case media::Media::Type::VIDEO:
+      case media::Media::Type::FILE:
+         m_State = media::Media::State::ACTIVE;
          emit q_ptr->stateChanged(m_State, ll);
          break;
-      case Media::Media::Type::TEXT:
-         m_State = Media::Media::State::IDLE;
+      case media::Media::Type::TEXT:
+         m_State = media::Media::State::IDLE;
          emit q_ptr->stateChanged(m_State, ll);
          break;
-      case Media::Media::Type::COUNT__:
+      case media::Media::Type::COUNT__:
          break;
    };
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/media.h ring-20180816.2.e26b79f~ds1/lrc/src/media/media.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/media.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/media.h	2018-08-16 15:09:52.000000000 +0000
@@ -24,11 +24,11 @@
 class Call;
 class CallModelPrivate;
 
-namespace Media {
+namespace media {
    class MediaPrivate;
 }
 
-namespace Media {
+namespace media {
 
 class LIB_EXPORT Media : public QObject
 {
@@ -76,7 +76,7 @@
    Direction direction() const;
 
    //Getters
-   Media::Media::State state() const;
+   media::Media::State state() const;
    bool performAction(const Media::Action);
 
    //TODO add an abstract history getter with specialisation per media
@@ -101,6 +101,6 @@
 };
 
 }
-Q_DECLARE_METATYPE(Media::Media::Direction)
+Q_DECLARE_METATYPE(media::Media::Direction)
 
-Media::Media* operator<<(Media::Media* m, Media::Media::Action a);
+media::Media* operator<<(media::Media* m, media::Media::Action a);
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/recording.cpp ring-20180816.2.e26b79f~ds1/lrc/src/media/recording.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/recording.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/recording.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -17,7 +17,7 @@
  ***************************************************************************/
 #include "recording.h"
 
-namespace Media {
+namespace media {
 
 class RecordingPrivate {
 public:
@@ -49,17 +49,17 @@
 } //Media::
 
 ///Return this Recording type
-Media::Recording::Type Media::Recording::type() const
+media::Recording::Type media::Recording::type() const
 {
    return d_ptr->m_Type;
 }
 
-Call* Media::Recording::call() const
+Call* media::Recording::call() const
 {
    return d_ptr->m_pCall;
 }
 
-void Media::Recording::setCall(Call* call)
+void media::Recording::setCall(Call* call)
 {
    d_ptr->m_pCall = call;
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/recording.h ring-20180816.2.e26b79f~ds1/lrc/src/media/recording.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/recording.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/recording.h	2018-08-16 15:09:52.000000000 +0000
@@ -25,7 +25,7 @@
 class RecordingPlaybackManager;
 class Call;
 
-namespace Media {
+namespace media {
 
 class RecordingPrivate;
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/recordingmodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/media/recordingmodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/recordingmodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/recordingmodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -47,7 +47,7 @@
    RecordingNode::Type     m_Type     ;
    int                     m_Index    ;
    QString                 m_CatName  ;
-   Media::Recording*       m_pRec     ;
+   media::Recording*       m_pRec     ;
    QVector<RecordingNode*> m_lChildren;
    RecordingNode*          m_pParent  ;
 
@@ -57,7 +57,7 @@
 {
    Q_OBJECT
 public:
-   explicit RecordingModelPrivate(Media::RecordingModel* parent);
+   explicit RecordingModelPrivate(media::RecordingModel* parent);
    ~RecordingModelPrivate();
 
    //Attributes
@@ -69,11 +69,11 @@
 
    //RecordingNode*                 m_pFiles     ; //TODO uncomment when implemented in DRing
 
-   void forwardInsertion(const QMap<QString,QString>& message, ContactMethod* cm, Media::Media::Direction direction);
+   void forwardInsertion(const QMap<QString,QString>& message, ContactMethod* cm, media::Media::Direction direction);
    void updateUnreadCount(const int count);
 
 private:
-   Media::RecordingModel* q_ptr;
+    media::RecordingModel* q_ptr;
 };
 
 RecordingNode::RecordingNode(RecordingNode::Type type) :
@@ -88,7 +88,7 @@
       delete c;
 }
 
-RecordingModelPrivate::RecordingModelPrivate(Media::RecordingModel* parent) : q_ptr(parent),m_pText(nullptr),
+RecordingModelPrivate::RecordingModelPrivate(media::RecordingModel* parent) : q_ptr(parent),m_pText(nullptr),
 m_pAudioVideo(nullptr)/*,m_pFiles(nullptr)*/
 {
 
@@ -106,11 +106,11 @@
       delete m_pAudioVideo;
 }
 
-void RecordingModelPrivate::forwardInsertion(const QMap<QString,QString>& message, ContactMethod* cm, Media::Media::Direction direction)
+void RecordingModelPrivate::forwardInsertion(const QMap<QString,QString>& message, ContactMethod* cm, media::Media::Direction direction)
 {
    Q_UNUSED(message)
    Q_UNUSED(direction)
-   emit q_ptr->newTextMessage(static_cast<Media::TextRecording*>(sender()), cm);
+   emit q_ptr->newTextMessage(static_cast<media::TextRecording*>(sender()), cm);
 }
 
 void RecordingModelPrivate::updateUnreadCount(const int count)
@@ -122,17 +122,17 @@
     emit q_ptr->unreadMessagesCountChanged(m_UnreadCount);
 }
 
-Media::RecordingModel::~RecordingModel()
+media::RecordingModel::~RecordingModel()
 {
    delete d_ptr;
 }
 
-Media::RecordingModel::RecordingModel(QObject* parent) : QAbstractItemModel(parent), CollectionManagerInterface<Recording>(this),
+media::RecordingModel::RecordingModel(QObject* parent) : QAbstractItemModel(parent), CollectionManagerInterface<Recording>(this),
 d_ptr(new RecordingModelPrivate(this))
 {
    setObjectName("RecordingModel");
 
-   d_ptr->m_pTextRecordingCollection = addCollection<LocalTextRecordingCollection>();
+   d_ptr->m_pTextRecordingCollection = addCollection<LocalTextRecordingCollection>(LoadOptions::NONE);
 
    d_ptr->m_pTextRecordingCollection->listId([](const QList<CollectionInterface::Element>& e) {
       //TODO
@@ -140,13 +140,13 @@
    });
 }
 
-Media::RecordingModel& Media::RecordingModel::instance()
+media::RecordingModel& media::RecordingModel::instance()
 {
     static auto instance = new RecordingModel(QCoreApplication::instance());
     return *instance;
 }
 
-QHash<int,QByteArray> Media::RecordingModel::roleNames() const
+QHash<int,QByteArray> media::RecordingModel::roleNames() const
 {
    static QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
    /*static bool initRoles = false;
@@ -157,7 +157,7 @@
 }
 
 //Do nothing
-bool Media::RecordingModel::setData( const QModelIndex& index, const QVariant &value, int role)
+bool media::RecordingModel::setData( const QModelIndex& index, const QVariant &value, int role)
 {
    Q_UNUSED(index)
    Q_UNUSED(value)
@@ -166,7 +166,7 @@
 }
 
 ///Get bookmark model data RecordingNode::Type and Call::Role
-QVariant Media::RecordingModel::data( const QModelIndex& index, int role) const
+QVariant media::RecordingModel::data( const QModelIndex& index, int role) const
 {
    if (!index.isValid())
       return QVariant();
@@ -182,7 +182,7 @@
 }
 
 ///Get header data
-QVariant Media::RecordingModel::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant media::RecordingModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
    Q_UNUSED(section)
    if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
@@ -191,7 +191,7 @@
 }
 
 ///Get the number of child of "parent"
-int Media::RecordingModel::rowCount( const QModelIndex& parent ) const
+int media::RecordingModel::rowCount( const QModelIndex& parent ) const
 {
    if (!parent.isValid())
       return d_ptr->m_lCategories.size();
@@ -201,7 +201,7 @@
    }
 }
 
-Qt::ItemFlags Media::RecordingModel::flags( const QModelIndex& index ) const
+Qt::ItemFlags media::RecordingModel::flags( const QModelIndex& index ) const
 {
    if (!index.isValid())
       return Qt::NoItemFlags;
@@ -210,14 +210,14 @@
 }
 
 ///There is only 1 column
-int Media::RecordingModel::columnCount ( const QModelIndex& parent) const
+int media::RecordingModel::columnCount ( const QModelIndex& parent) const
 {
    Q_UNUSED(parent)
    return 1;
 }
 
 ///Get the bookmark parent
-QModelIndex Media::RecordingModel::parent( const QModelIndex& idx) const
+QModelIndex media::RecordingModel::parent( const QModelIndex& idx) const
 {
    if (!idx.isValid())
       return QModelIndex();
@@ -236,7 +236,7 @@
 } //parent
 
 ///Get the index
-QModelIndex Media::RecordingModel::index(int row, int column, const QModelIndex& parent) const
+QModelIndex media::RecordingModel::index(int row, int column, const QModelIndex& parent) const
 {
    if (column || (!parent.isValid() && row >= d_ptr->m_lCategories.size()))
       return QModelIndex();
@@ -249,7 +249,7 @@
    return createIndex(row,0,modelItem->m_lChildren[row]);
 }
 
-bool Media::RecordingModel::addItemCallback(const Recording* item)
+bool media::RecordingModel::addItemCallback(const Recording* item)
 {
    Q_UNUSED(item)
 
@@ -305,13 +305,13 @@
    return false;
 }
 
-bool Media::RecordingModel::removeItemCallback(const Recording* item)
+bool media::RecordingModel::removeItemCallback(const Recording* item)
 {
    Q_UNUSED(item)
    return false;
 }
 
-bool Media::RecordingModel::clearAllCollections() const
+bool media::RecordingModel::clearAllCollections() const
 {
     foreach (CollectionInterface* backend, collections(CollectionInterface::SupportedFeatures::CLEAR)) {
         backend->clear();
@@ -320,53 +320,53 @@
 }
 
 ///Deletes all recordings (which are possible to delete) and clears model
-void Media::RecordingModel::clear()
+void media::RecordingModel::clear()
 {
     beginResetModel();
     clearAllCollections();
     endResetModel();
 }
 
-void Media::RecordingModel::collectionAddedCallback(CollectionInterface* backend)
+void media::RecordingModel::collectionAddedCallback(CollectionInterface* backend)
 {
    Q_UNUSED(backend)
 }
 
 ///Set where the call recordings will be saved
-void Media::RecordingModel::setRecordPath(const QString& path)
+void media::RecordingModel::setRecordPath(const QString& path)
 {
    ConfigurationManagerInterface& configurationManager = ConfigurationManager::instance();
    configurationManager.setRecordPath(path);
 }
 
 ///Return the path where recordings are going to be saved
-QString Media::RecordingModel::recordPath() const
+QString media::RecordingModel::recordPath() const
 {
    ConfigurationManagerInterface& configurationManager = ConfigurationManager::instance();
    return configurationManager.getRecordPath();
 }
 
 ///are all calls recorded by default
-bool Media::RecordingModel::isAlwaysRecording() const
+bool media::RecordingModel::isAlwaysRecording() const
 {
    ConfigurationManagerInterface& configurationManager = ConfigurationManager::instance();
    return configurationManager.getIsAlwaysRecording();
 }
 
 ///Set if all calls needs to be recorded
-void Media::RecordingModel::setAlwaysRecording(bool record)
+void media::RecordingModel::setAlwaysRecording(bool record)
 {
    ConfigurationManagerInterface& configurationManager = ConfigurationManager::instance();
    configurationManager.setIsAlwaysRecording   ( record );
 }
 
-int  Media::RecordingModel::unreadCount() const
+int  media::RecordingModel::unreadCount() const
 {
     return d_ptr->m_UnreadCount;
 }
 
 ///Create or load the recording associated with the ContactMethod cm
-Media::TextRecording* Media::RecordingModel::createTextRecording(const ContactMethod* cm)
+media::TextRecording* media::RecordingModel::createTextRecording(const ContactMethod* cm)
 {
    TextRecording* r = d_ptr->m_pTextRecordingCollection->createFor(cm);
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/recordingmodel.h ring-20180816.2.e26b79f~ds1/lrc/src/media/recordingmodel.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/recordingmodel.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/recordingmodel.h	2018-08-16 15:09:52.000000000 +0000
@@ -30,7 +30,7 @@
 class RecordingModelPrivate;
 class ContactMethod;
 
-namespace Media {
+namespace media {
    class Recording;
    class TextRecording;
    class AVRecording;
@@ -87,7 +87,7 @@
    static RecordingModel& instance();
 
 Q_SIGNALS:
-   void newTextMessage(::Media::TextRecording* t, ContactMethod* cm);
+   void newTextMessage(::media::TextRecording* t, ContactMethod* cm);
    void unreadMessagesCountChanged(int unreadCount);
 
 private:
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/text.cpp ring-20180816.2.e26b79f~ds1/lrc/src/media/text.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/text.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/text.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -59,10 +59,10 @@
 class MediaTextPrivate
 {
 public:
-   MediaTextPrivate(Media::Text* parent);
+   MediaTextPrivate(media::Text* parent);
 
    //Attributes
-   Media::TextRecording* m_pRecording;
+   media::TextRecording* m_pRecording;
    bool                  m_HasChecked;
    QHash<QString,bool>   m_hMimeTypes;
    QStringList           m_lMimeTypes;
@@ -71,7 +71,7 @@
    void updateMimeList(const QMap<QString,QString>& payloads);
 
 private:
-   Media::Text* q_ptr;
+    media::Text* q_ptr;
 };
 
 class ProfileChunk
@@ -163,14 +163,14 @@
       }
    }
 
-   Media::Text* media = call->firstMedia<Media::Text>(Media::Media::Direction::IN);
+   media::Text* media = call->firstMedia<media::Text>(media::Media::Direction::IN);
 
    if (!media) {
-      media = call->d_ptr->mediaFactory<Media::Text>(Media::Media::Direction::IN);
+      media = call->d_ptr->mediaFactory<media::Text>(media::Media::Direction::IN);
    }
 
    media->recording()->setCall(call);
-   media->recording()->d_ptr->insertNewMessage(message,call->peerContactMethod(),Media::Media::Direction::IN);
+   media->recording()->d_ptr->insertNewMessage(message,call->peerContactMethod(),media::Media::Direction::IN);
 
    media->d_ptr->updateMimeList(message);
 
@@ -181,7 +181,7 @@
 {
    if (auto cm = PhoneDirectoryModel::instance().getNumber(from, AccountModel::instance().getById(accountId.toLatin1()))) {
        auto txtRecording = cm->textRecording();
-       txtRecording->d_ptr->insertNewMessage(payloads, cm, Media::Media::Direction::IN);
+       txtRecording->d_ptr->insertNewMessage(payloads, cm, media::Media::Direction::IN);
    }
 }
 
@@ -193,26 +193,26 @@
     }
 }
 
-MediaTextPrivate::MediaTextPrivate(Media::Text* parent) : q_ptr(parent),m_pRecording(nullptr),m_HasChecked(false)
+MediaTextPrivate::MediaTextPrivate(media::Text* parent) : q_ptr(parent),m_pRecording(nullptr),m_HasChecked(false)
 {
 }
 
-Media::Text::Text(Call* parent, const Media::Direction direction) : Media::Media(parent, direction), d_ptr(new MediaTextPrivate(this))
+media::Text::Text(Call* parent, const Media::Direction direction) : media::Media(parent, direction), d_ptr(new MediaTextPrivate(this))
 {
    Q_ASSERT(parent);
 }
 
-Media::Media::Type Media::Text::type()
+media::Media::Type media::Text::type()
 {
-   return Media::Media::Type::TEXT;
+   return media::Media::Type::TEXT;
 }
 
-Media::Text::~Text()
+media::Text::~Text()
 {
    delete d_ptr;
 }
 
-Media::TextRecording* Media::Text::recording() const
+media::TextRecording* media::Text::recording() const
 {
    const bool wasChecked = d_ptr->m_HasChecked;
    d_ptr->m_HasChecked = true;
@@ -239,12 +239,12 @@
 }
 
 
-bool Media::Text::hasMimeType( const QString& mimeType ) const
+bool media::Text::hasMimeType( const QString& mimeType ) const
 {
    return d_ptr->m_hMimeTypes.contains(mimeType);
 }
 
-QStringList Media::Text::mimeTypes() const
+QStringList media::Text::mimeTypes() const
 {
    return d_ptr->m_lMimeTypes;
 }
@@ -291,7 +291,7 @@
  * "text/enriched" : (RTF) The rich text format used by older applications (like WordPad and OS X TextEdit)
  * "text/html"     : The format used by web browsers
  */
-void Media::Text::send(const QMap<QString,QString>& message, const bool isMixed)
+void media::Text::send(const QMap<QString,QString>& message, const bool isMixed)
 {
    CallManagerInterface& callManager = CallManager::instance();
    Q_NOREPLY callManager.sendTextMessage(call()->dringId(), message, isMixed);
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/text.h ring-20180816.2.e26b79f~ds1/lrc/src/media/text.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/text.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/text.h	2018-08-16 15:09:52.000000000 +0000
@@ -26,11 +26,11 @@
 class InstantMessagingModel;
 class IMConversationManagerPrivate;
 
-namespace Media {
+namespace media {
 
 class TextRecording;
 
-class LIB_EXPORT Text : public Media::Media
+class LIB_EXPORT Text : public media::Media
 {
    Q_OBJECT
    friend class ::CallPrivate;
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/textrecording.cpp ring-20180816.2.e26b79f~ds1/lrc/src/media/textrecording.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/textrecording.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/textrecording.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -154,15 +154,15 @@
    return p;
 }
 
-Media::TextRecordingPrivate::TextRecordingPrivate(TextRecording* r) : q_ptr(r),m_pImModel(nullptr),m_pCurrentGroup(nullptr),m_UnreadCount(0)
+media::TextRecordingPrivate::TextRecordingPrivate(TextRecording* r) : q_ptr(r),m_pImModel(nullptr),m_pCurrentGroup(nullptr),m_UnreadCount(0)
 {
 }
 
-Media::TextRecording::TextRecording() : Recording(Recording::Type::TEXT), d_ptr(new TextRecordingPrivate(this))
+media::TextRecording::TextRecording() : Recording(Recording::Type::TEXT), d_ptr(new TextRecordingPrivate(this))
 {
 }
 
-Media::TextRecording::~TextRecording()
+media::TextRecording::~TextRecording()
 {
    delete d_ptr;
 }
@@ -171,7 +171,7 @@
  * Updates the message status and potentially the message id, if a new status is set.
  * Returns true if the Message object was modified, false otherwise.
  */
-bool Media::TextRecordingPrivate::updateMessageStatus(Serializable::Message* m, TextRecording::Status newSatus)
+bool media::TextRecordingPrivate::updateMessageStatus(Serializable::Message* m, TextRecording::Status newSatus)
 {
     bool modified = false;
 
@@ -198,7 +198,7 @@
     return modified;
 }
 
-void Media::TextRecordingPrivate::accountMessageStatusChanged(const uint64_t id, DRing::Account::MessageStates status)
+void media::TextRecordingPrivate::accountMessageStatusChanged(const uint64_t id, DRing::Account::MessageStates status)
 {
     if (auto node = m_hPendingMessages.value(id, nullptr)) {
         if (updateMessageStatus(node->m_pMessage, static_cast<TextRecording::Status>(status))) {
@@ -211,18 +211,18 @@
     }
 }
 
-bool Media::TextRecording::hasMimeType(const QString& mimeType) const
+bool media::TextRecording::hasMimeType(const QString& mimeType) const
 {
    return d_ptr->m_hMimeTypes.contains(mimeType);
 }
 
-QStringList Media::TextRecording::mimeTypes() const
+QStringList media::TextRecording::mimeTypes() const
 {
    return d_ptr->m_lMimeTypes;
 }
 
 ///Get the instant messaging model associated with this recording
-QAbstractItemModel* Media::TextRecording::instantMessagingModel() const
+QAbstractItemModel* media::TextRecording::instantMessagingModel() const
 {
    if (!d_ptr->m_pImModel) {
       d_ptr->m_pImModel = new InstantMessagingModel(const_cast<TextRecording*>(this));
@@ -232,7 +232,7 @@
 }
 
 ///Set all messages as read and then save the recording
-void Media::TextRecording::setAllRead()
+void media::TextRecording::setAllRead()
 {
     bool changed = false;
     for(int row = 0; row < d_ptr->m_lNodes.size(); ++row) {
@@ -257,7 +257,7 @@
     }
 }
 
-QVector<ContactMethod*> Media::TextRecording::peers() const
+QVector<ContactMethod*> media::TextRecording::peers() const
 {
     QVector<ContactMethod*> cms;
 
@@ -291,7 +291,7 @@
    {
       const QModelIndex srcIdx = sourceModel()->index(source_row, filterKeyColumn(), source_parent);
 
-      return srcIdx.data((int)Media::TextRecording::Role::HasText).toBool();
+      return srcIdx.data((int)media::TextRecording::Role::HasText).toBool();
    }
 };
 
@@ -299,7 +299,7 @@
  * Subset of the instantMessagingModel() with only plain text and HTML
  * messages. This model can be displayed directly to the user.
  */
-QAbstractItemModel* Media::TextRecording::instantTextMessagingModel() const
+QAbstractItemModel* media::TextRecording::instantTextMessagingModel() const
 {
    if (!d_ptr->m_pTextMessagesModel) {
       auto p = new TextProxyModel(const_cast<TextRecording*>(this));
@@ -321,7 +321,7 @@
     {
         const QModelIndex srcIdx = sourceModel()->index(source_row, filterKeyColumn(), source_parent);
 
-        return !srcIdx.data((int)Media::TextRecording::Role::IsRead).toBool();
+        return !srcIdx.data((int)media::TextRecording::Role::IsRead).toBool();
     }
 };
 
@@ -329,7 +329,7 @@
  * Subset of the instantTextMessagingModel() with only unread plain text and HTML
  * messages. This model can be used to get the number of unread messages.
  */
-QAbstractItemModel* Media::TextRecording::unreadInstantTextMessagingModel() const
+QAbstractItemModel* media::TextRecording::unreadInstantTextMessagingModel() const
 {
     if (!d_ptr->m_pUnreadTextMessagesModel) {
        auto p = new UnreadProxyModel(instantTextMessagingModel());
@@ -341,20 +341,20 @@
 }
 
 
-bool Media::TextRecording::isEmpty() const
+bool media::TextRecording::isEmpty() const
 {
    return !size();
 }
 
-int Media::TextRecording::size() const
+int media::TextRecording::size() const
 {
     return d_ptr->m_lNodes.size();
 }
 
 // Qt convention compat
-int Media::TextRecording::count() const { return size(); }
+int media::TextRecording::count() const { return size(); }
 
-QHash<QByteArray,QByteArray> Media::TextRecordingPrivate::toJsons() const
+QHash<QByteArray,QByteArray> media::TextRecordingPrivate::toJsons() const
 {
    QHash<QByteArray,QByteArray> ret;
    for (Serializable::Peers* p : m_lAssociatedPeers) {
@@ -372,7 +372,7 @@
    return ret;
 }
 
-Media::TextRecording* Media::TextRecording::fromJson(const QList<QJsonObject>& items, const ContactMethod* cm, CollectionInterface* backend)
+media::TextRecording* media::TextRecording::fromJson(const QList<QJsonObject>& items, const ContactMethod* cm, CollectionInterface* backend)
 {
     TextRecording* t = new TextRecording();
     if (backend)
@@ -448,7 +448,7 @@
     return t;
 }
 
-void Media::TextRecordingPrivate::insertNewMessage(const QMap<QString,QString>& message, ContactMethod* cm, Media::Media::Direction direction, uint64_t id)
+void media::TextRecordingPrivate::insertNewMessage(const QMap<QString,QString>& message, ContactMethod* cm, media::Media::Direction direction, uint64_t id)
 {
     //Only create it if none was found on the disk
     if (!m_pCurrentGroup) {
@@ -475,7 +475,7 @@
    m->authorSha1= cm->sha1()                       ;
    m->id = id;
 
-   if (direction == Media::Media::Direction::OUT)
+   if (direction == media::Media::Direction::OUT)
       m->isRead = true; // assume outgoing messages are read, since we're sending them
 
    static const int profileSize = QString(RingMimes::PROFILE_VCF).size();
@@ -560,10 +560,10 @@
    timestamp  = json["timestamp" ].toInt                (                           );
    authorSha1 = json["authorSha1"].toString             (                           );
    isRead     = json["isRead"    ].toBool               (                           );
-   direction  = static_cast<Media::Media::Direction>    ( json["direction"].toInt() );
+   direction  = static_cast<media::Media::Direction>    ( json["direction"].toInt() );
    type       = static_cast<Serializable::Message::Type>( json["type"     ].toInt() );
    id         = json["id"        ].toVariant().value<uint64_t>(                     );
-   deliveryStatus = static_cast<Media::TextRecording::Status>(json["deliveryStatus"].toInt());
+   deliveryStatus = static_cast<media::TextRecording::Status>(json["deliveryStatus"].toInt());
 
    QJsonArray a = json["payloads"].toArray();
    for (int i = 0; i < a.size(); ++i) {
@@ -751,7 +751,7 @@
 
 
 ///Constructor
-InstantMessagingModel::InstantMessagingModel(Media::TextRecording* recording) : QAbstractListModel(recording),m_pRecording(recording)
+InstantMessagingModel::InstantMessagingModel(media::TextRecording* recording) : QAbstractListModel(recording),m_pRecording(recording)
 {
 }
 
@@ -766,18 +766,18 @@
    static bool initRoles = false;
    if (!initRoles) {
       initRoles = true;
-      roles.insert((int)Media::TextRecording::Role::Direction           , "direction"           );
-      roles.insert((int)Media::TextRecording::Role::AuthorDisplayname   , "authorDisplayname"   );
-      roles.insert((int)Media::TextRecording::Role::AuthorUri           , "authorUri"           );
-      roles.insert((int)Media::TextRecording::Role::AuthorPresenceStatus, "authorPresenceStatus");
-      roles.insert((int)Media::TextRecording::Role::Timestamp           , "timestamp"           );
-      roles.insert((int)Media::TextRecording::Role::IsRead              , "isRead"              );
-      roles.insert((int)Media::TextRecording::Role::FormattedDate       , "formattedDate"       );
-      roles.insert((int)Media::TextRecording::Role::IsStatus            , "isStatus"            );
-      roles.insert((int)Media::TextRecording::Role::DeliveryStatus      , "deliveryStatus"      );
-      roles.insert((int)Media::TextRecording::Role::FormattedHtml       , "formattedHtml"       );
-      roles.insert((int)Media::TextRecording::Role::LinkList            , "linkList"            );
-      roles.insert((int)Media::TextRecording::Role::Id                  , "id"                  );
+      roles.insert((int)media::TextRecording::Role::Direction           , "direction"           );
+      roles.insert((int)media::TextRecording::Role::AuthorDisplayname   , "authorDisplayname"   );
+      roles.insert((int)media::TextRecording::Role::AuthorUri           , "authorUri"           );
+      roles.insert((int)media::TextRecording::Role::AuthorPresenceStatus, "authorPresenceStatus");
+      roles.insert((int)media::TextRecording::Role::Timestamp           , "timestamp"           );
+      roles.insert((int)media::TextRecording::Role::IsRead              , "isRead"              );
+      roles.insert((int)media::TextRecording::Role::FormattedDate       , "formattedDate"       );
+      roles.insert((int)media::TextRecording::Role::IsStatus            , "isStatus"            );
+      roles.insert((int)media::TextRecording::Role::DeliveryStatus      , "deliveryStatus"      );
+      roles.insert((int)media::TextRecording::Role::FormattedHtml       , "formattedHtml"       );
+      roles.insert((int)media::TextRecording::Role::LinkList            , "linkList"            );
+      roles.insert((int)media::TextRecording::Role::Id                  , "id"                  );
    }
    return roles;
 }
@@ -791,13 +791,13 @@
          case Qt::DisplayRole:
             return QVariant(n->m_pMessage->m_PlainText);
          case Qt::DecorationRole         :
-            if (n->m_pMessage->direction == Media::Media::Direction::IN)
+            if (n->m_pMessage->direction == media::Media::Direction::IN)
                return GlobalInstances::pixmapManipulator().decorationRole(n->m_pContactMethod);
             else if (m_pRecording->call() && m_pRecording->call()->account()
               && m_pRecording->call()->account()->contactMethod()->contact()) {
                auto cm = m_pRecording->call()->account()->contactMethod();
                return GlobalInstances::pixmapManipulator().decorationRole(cm);
-            } else if (n->m_pMessage->direction == Media::Media::Direction::OUT && n->m_pContactMethod->account()){
+            } else if (n->m_pMessage->direction == media::Media::Direction::OUT && n->m_pContactMethod->account()){
                 return GlobalInstances::pixmapManipulator().decorationRole(n->m_pContactMethod->account());
             } else {
                 /* It's most likely an account that doesn't exist anymore
@@ -806,45 +806,45 @@
                 return GlobalInstances::pixmapManipulator().decorationRole((ContactMethod*)nullptr);
             }
             break;
-         case (int)Media::TextRecording::Role::Direction            :
+         case (int)media::TextRecording::Role::Direction            :
             return QVariant::fromValue(n->m_pMessage->direction);
-         case (int)Media::TextRecording::Role::AuthorDisplayname    :
+         case (int)media::TextRecording::Role::AuthorDisplayname    :
          case (int)Ring::Role::Name                                 :
-            if (n->m_pMessage->direction == Media::Media::Direction::IN)
+            if (n->m_pMessage->direction == media::Media::Direction::IN)
                return n->m_pContactMethod->roleData(static_cast<int>(Ring::Role::Name));
             else
                return tr("Me");
-         case (int)Media::TextRecording::Role::AuthorUri            :
+         case (int)media::TextRecording::Role::AuthorUri            :
          case (int)Ring::Role::Number                               :
             return n->m_pContactMethod->uri();
-         case (int)Media::TextRecording::Role::AuthorPresenceStatus :
+         case (int)media::TextRecording::Role::AuthorPresenceStatus :
             // Always consider "self" as present
-            if (n->m_pMessage->direction == Media::Media::Direction::OUT)
+            if (n->m_pMessage->direction == media::Media::Direction::OUT)
                return true;
             else
                return n->m_pContactMethod->contact() ?
                   n->m_pContactMethod->contact()->isPresent() : n->m_pContactMethod->isPresent();
-         case (int)Media::TextRecording::Role::Timestamp            :
+         case (int)media::TextRecording::Role::Timestamp            :
             return (uint)n->m_pMessage->timestamp;
-         case (int)Media::TextRecording::Role::IsRead               :
+         case (int)media::TextRecording::Role::IsRead               :
             return (int)n->m_pMessage->isRead;
-         case (int)Media::TextRecording::Role::FormattedDate        :
+         case (int)media::TextRecording::Role::FormattedDate        :
             return QDateTime::fromTime_t(n->m_pMessage->timestamp).toString();
-         case (int)Media::TextRecording::Role::IsStatus             :
+         case (int)media::TextRecording::Role::IsStatus             :
             return n->m_pMessage->type == Serializable::Message::Type::STATUS;
-         case (int)Media::TextRecording::Role::HTML                 :
+         case (int)media::TextRecording::Role::HTML                 :
             return QVariant(n->m_pMessage->m_HTML);
-         case (int)Media::TextRecording::Role::HasText              :
+         case (int)media::TextRecording::Role::HasText              :
             return n->m_pMessage->m_HasText;
-         case (int)Media::TextRecording::Role::ContactMethod        :
+         case (int)media::TextRecording::Role::ContactMethod        :
             return QVariant::fromValue(n->m_pContactMethod);
-         case (int)Media::TextRecording::Role::DeliveryStatus       :
+         case (int)media::TextRecording::Role::DeliveryStatus       :
             return QVariant::fromValue(n->m_pMessage->deliveryStatus);
-         case (int)Media::TextRecording::Role::FormattedHtml        :
+         case (int)media::TextRecording::Role::FormattedHtml        :
             return QVariant::fromValue(n->m_pMessage->getFormattedHtml());
-         case (int)Media::TextRecording::Role::LinkList             :
+         case (int)media::TextRecording::Role::LinkList             :
             return QVariant::fromValue(n->m_pMessage->m_LinkList);
-         case (int)Media::TextRecording::Role::Id                   :
+         case (int)media::TextRecording::Role::Id                   :
             return QVariant::fromValue(n->m_pMessage->id);
          default:
             break;
@@ -878,7 +878,7 @@
 
     ::TextMessageNode* n = m_pRecording->d_ptr->m_lNodes[idx.row()];
     switch (role) {
-        case (int)Media::TextRecording::Role::IsRead               :
+        case (int)media::TextRecording::Role::IsRead               :
             if (n->m_pMessage->isRead != value.toBool()) {
                 n->m_pMessage->isRead = value.toBool();
                 if (n->m_pMessage->m_HasText) {
@@ -913,7 +913,7 @@
    endInsertRows();
 }
 
-void Media::TextRecordingPrivate::clear()
+void media::TextRecordingPrivate::clear()
 {
     m_pImModel->clear();
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/textrecording.h ring-20180816.2.e26b79f~ds1/lrc/src/media/textrecording.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/textrecording.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/textrecording.h	2018-08-16 15:09:52.000000000 +0000
@@ -31,7 +31,7 @@
 class ContactMethod;
 class InstantMessagingModel;
 
-namespace Media {
+namespace media {
 
 class TextRecordingPrivate;
 class Text;
@@ -99,7 +99,7 @@
    void setAllRead();
 
 Q_SIGNALS:
-   void messageInserted(const QMap<QString,QString>& message, ContactMethod* cm, Media::Media::Direction direction);
+   void messageInserted(const QMap<QString,QString>& message, ContactMethod* cm, media::Media::Direction direction);
    void unreadCountChange(int count);
 
 private:
@@ -109,4 +109,4 @@
 
 }
 
-Q_DECLARE_METATYPE(Media::TextRecording::Status)
+Q_DECLARE_METATYPE(media::TextRecording::Status)
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/video.cpp ring-20180816.2.e26b79f~ds1/lrc/src/media/video.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/video.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/video.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -31,29 +31,29 @@
     Video::SourceModel *m_pSourceModel = nullptr;
 };
 
-Media::Video::Video(Call* parent, const Media::Direction direction) : Media::Media(parent, direction), d_ptr(new MediaVideoPrivate())
+media::Video::Video(Call* parent, const Media::Direction direction) : media::Media(parent, direction), d_ptr(new MediaVideoPrivate())
 {
    Q_ASSERT(parent);
 }
 
-Media::Media::Type Media::Video::type()
+media::Media::Type media::Video::type()
 {
-   return Media::Media::Type::VIDEO;
+   return media::Media::Type::VIDEO;
 }
 
-bool Media::Video::mute()
+bool media::Video::mute()
 {
    CallManagerInterface& callManager = CallManager::instance();
    return callManager.muteLocalMedia(call()->dringId(),DRing::Media::Details::MEDIA_TYPE_VIDEO,true);
 }
 
-bool Media::Video::unmute()
+bool media::Video::unmute()
 {
    CallManagerInterface& callManager = CallManager::instance();
    return callManager.muteLocalMedia(call()->dringId(),DRing::Media::Details::MEDIA_TYPE_VIDEO,false);
 }
 
-Video::SourceModel* Media::Video::sourceModel() const
+Video::SourceModel* media::Video::sourceModel() const
 {
     if (!d_ptr->m_pSourceModel) {
         d_ptr->m_pSourceModel = new ::Video::SourceModel();
@@ -62,7 +62,7 @@
     return d_ptr->m_pSourceModel;
 }
 
-Media::Video::~Video()
+media::Video::~Video()
 {
    delete d_ptr;
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/media/video.h ring-20180816.2.e26b79f~ds1/lrc/src/media/video.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/media/video.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/media/video.h	2018-08-16 15:09:52.000000000 +0000
@@ -29,9 +29,9 @@
 class Call;
 class CallPrivate;
 
-namespace Media {
+namespace media {
 
-class LIB_EXPORT Video : public Media::Media
+class LIB_EXPORT Video : public media::Media
 {
    friend class ::CallPrivate;
 public:
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/newaccountmodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/newaccountmodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/newaccountmodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/newaccountmodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -352,6 +352,20 @@
     }
 
     accountInfo->second.fromDetails(convertMap(details));
+
+    // Refresh credentials for SIP accounts
+    if (accountInfo->second.profileInfo.type == profile::Type::SIP) {
+        auto& confProperties = accountInfo->second.confProperties;
+        MapStringString credentials;
+        using namespace DRing::Account;
+        credentials[ConfProperties::USERNAME] = toQString(confProperties.username);
+        credentials[ConfProperties::PASSWORD] = toQString(confProperties.password);
+        credentials[ConfProperties::REALM] = confProperties.realm.empty()? QString("*") : toQString(confProperties.realm);
+        QVector<MapStringString> credentialsVec;
+        credentialsVec.append(credentials);
+        ConfigurationManager::instance().setCredentials(accountId.c_str(), credentialsVec);
+    }
+
     emit linked.accountStatusChanged(accountId);
 }
 
@@ -457,7 +471,7 @@
     owner.profileInfo.avatar = avatar;
     // Init models for this account
     owner.callModel = std::make_unique<NewCallModel>(owner, callbacksHandler);
-    owner.contactModel = std::make_unique<ContactModel>(owner, database, callbacksHandler);
+    owner.contactModel = std::make_unique<ContactModel>(owner, database, callbacksHandler, behaviorController);
     owner.conversationModel = std::make_unique<ConversationModel>(owner, lrc, database, callbacksHandler, behaviorController);
     owner.deviceModel = std::make_unique<NewDeviceModel>(owner, callbacksHandler);
     owner.codecModel = std::make_unique<NewCodecModel>(owner, callbacksHandler);
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/newcallmodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/newcallmodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/newcallmodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/newcallmodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -61,6 +61,15 @@
      */
     std::map<std::string, std::vector<std::string>> vcardsChunks;
 
+    /**
+     * Retrieve active calls from the daemon and init the model
+     */
+    void initCallFromDaemon();
+    /**
+     * Retrieve active conferences from the daemon and init the model
+     */
+    void initConferencesFromDaemon();
+
 public Q_SLOTS:
     /**
      * Listen from CallbacksHandler when a call is incoming
@@ -127,6 +136,23 @@
 }
 
 const call::Info&
+NewCallModel::getConferenceFromURI(const std::string& uri) const
+{
+    if (pimpl_->calls.empty()) throw std::out_of_range("No call at URI " + uri);
+    for (const auto& call: pimpl_->calls) {
+        if (call.second->type == call::Type::CONFERENCE) {
+            QStringList callList = CallManager::instance().getParticipantList(call.first.c_str());
+            foreach(const auto& callId, callList) {
+                if (pimpl_->calls[callId.toStdString()]->peer == uri) {
+                    return *call.second;
+                }
+            }
+        }
+    }
+    throw std::out_of_range("No call at URI " + uri);
+}
+
+const call::Info&
 NewCallModel::getCall(const std::string& uid) const
 {
     return *pimpl_->calls.at(uid);
@@ -362,12 +388,17 @@
 : linked(linked)
 , callbacksHandler(callbacksHandler)
 {
-    // TODO init call list and conferences if client crash but not the daemon in call.
     connect(&callbacksHandler, &CallbacksHandler::incomingCall, this, &NewCallModelPimpl::slotIncomingCall);
     connect(&callbacksHandler, &CallbacksHandler::callStateChanged, this, &NewCallModelPimpl::slotCallStateChanged);
     connect(&VideoRendererManager::instance(), &VideoRendererManager::remotePreviewStarted, this, &NewCallModelPimpl::slotRemotePreviewStarted);
     connect(&callbacksHandler, &CallbacksHandler::incomingVCardChunk, this, &NewCallModelPimpl::slotincomingVCardChunk);
     connect(&callbacksHandler, &CallbacksHandler::conferenceCreated, this , &NewCallModelPimpl::slotConferenceCreated);
+
+#ifndef ENABLE_LIBWRAP
+    // Only necessary with dbus, cause the daemon is separated
+    initCallFromDaemon();
+    initConferencesFromDaemon();
+#endif
 }
 
 NewCallModelPimpl::~NewCallModelPimpl()
@@ -376,6 +407,67 @@
 }
 
 void
+NewCallModelPimpl::initCallFromDaemon()
+{
+    QStringList callList = CallManager::instance().getCallList();
+    for (const auto& callId : callList)
+    {
+        MapStringString details = CallManager::instance().getCallDetails(callId);
+        auto accountId = details["ACCOUNTID"].toStdString();
+        if (accountId == linked.owner.id) {
+            auto callInfo = std::make_shared<call::Info>();
+            callInfo->id = callId.toStdString();
+            auto now = std::chrono::steady_clock::now();
+            auto system_now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+            auto diff = static_cast<int64_t>(system_now) - std::stol(details["TIMESTAMP_START"].toStdString());
+            callInfo->startTime = now - std::chrono::seconds(diff);
+            callInfo->status =  call::to_status(details["CALL_STATE"].toStdString());
+            auto endId = details["PEER_NUMBER"].indexOf("@");
+            callInfo->peer = details["PEER_NUMBER"].left(endId).toStdString();
+            if (linked.owner.profileInfo.type == lrc::api::profile::Type::RING) {
+                callInfo->peer = "ring:" + callInfo->peer;
+            }
+            callInfo->videoMuted = details["VIDEO_MUTED"] == "true";
+            callInfo->audioMuted = details["AUDIO_MUTED"] == "true";
+            callInfo->type = call::Type::DIALOG;
+            calls.emplace(callId.toStdString(), std::move(callInfo));
+            // NOTE/BUG: the videorenderer can't know that the client has restarted
+            // So, for now, a user will have to manually restart the medias until
+            // this renderer is not redesigned.
+        }
+    }
+}
+
+void
+NewCallModelPimpl::initConferencesFromDaemon()
+{
+    QStringList callList = CallManager::instance().getConferenceList();
+    for (const auto& callId : callList)
+    {
+        QMap<QString, QString> details = CallManager::instance().getConferenceDetails(callId);
+        auto callInfo = std::make_shared<call::Info>();
+        callInfo->id = callId.toStdString();
+        QStringList callList = CallManager::instance().getParticipantList(callId);
+        auto isForThisAccount = true;
+        foreach(const auto& call, callList) {
+            MapStringString callDetails = CallManager::instance().getCallDetails(call);
+            isForThisAccount = callDetails["ACCOUNTID"].toStdString() == linked.owner.id;
+            if (!isForThisAccount) break;
+            auto now = std::chrono::steady_clock::now();
+            auto system_now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+            auto diff = static_cast<int64_t>(system_now) - std::stol(callDetails["TIMESTAMP_START"].toStdString());
+            callInfo->status =  details["CONF_STATE"] == "ACTIVE_ATTACHED"? call::Status::IN_PROGRESS : call::Status::PAUSED;
+            callInfo->startTime = now - std::chrono::seconds(diff);
+            emit linked.callAddedToConference(call.toStdString(), callId.toStdString());
+        }
+        if (!isForThisAccount) break;
+        callInfo->type = call::Type::CONFERENCE;
+        calls.emplace(callId.toStdString(), std::move(callInfo));
+    }
+}
+
+
+void
 NewCallModel::sendSipMessage(const std::string& callId, const std::string& body) const
 {
     QMap<QString, QString> payloads;
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/newcodecmodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/newcodecmodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/newcodecmodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/newcodecmodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -53,6 +53,7 @@
     const NewCodecModel& linked;
 
     void setActiveCodecs();
+    void setCodecDetails(const Codec& codec, bool isAudio);
 
 private:
     void addCodec(const unsigned int& id, const QVector<unsigned int>& activeCodecs);
@@ -91,7 +92,7 @@
         }
         while (it != codecs.end()) {
             if (it->id == codecId) {
-                std::swap(*it, *it--);
+                std::iter_swap(it, std::prev(it));
                 break;
             }
             it++;
@@ -114,7 +115,7 @@
         }
         while (it != codecs.end()) {
             if (it->id == codecId) {
-                std::swap(*it, *it++);
+                std::iter_swap(it, std::next(it));
                 break;
             }
             it++;
@@ -129,7 +130,7 @@
     auto redraw = false;
     auto isAudio = true;
     {
-        std::unique_lock<std::mutex> lock(pimpl_->audioCodecsMtx);
+        std::unique_lock<std::mutex> lock(pimpl_->videoCodecsMtx);
         auto allDisabled = true;
         for (auto& codec : pimpl_->videoCodecs) {
             if (codec.id == codecId) {
@@ -175,6 +176,101 @@
     return redraw;
 }
 
+void
+NewCodecModel::autoQuality(const unsigned int& codecId, bool on)
+{
+    auto isAudio = true;
+    Codec finalCodec;
+    {
+        std::unique_lock<std::mutex> lock(pimpl_->videoCodecsMtx);
+        for (auto& codec : pimpl_->videoCodecs) {
+            if (codec.id == codecId) {
+                if (codec.auto_quality_enabled == on) return;
+                codec.auto_quality_enabled = on;
+                isAudio = false;
+                finalCodec = codec;
+                break;
+            }
+        }
+    }
+    if (isAudio) {
+        std::unique_lock<std::mutex> lock(pimpl_->audioCodecsMtx);
+        for (auto& codec : pimpl_->audioCodecs) {
+            if (codec.id == codecId) {
+                if (codec.auto_quality_enabled == on) return;
+                codec.auto_quality_enabled = on;
+                finalCodec = codec;
+                break;
+            }
+        }
+    }
+    pimpl_->setCodecDetails(finalCodec, isAudio);
+}
+
+void
+NewCodecModel::quality(const unsigned int& codecId, double quality)
+{
+    auto isAudio = true;
+    auto qualityStr = std::to_string(static_cast<int>(quality));
+    Codec finalCodec;
+    {
+        std::unique_lock<std::mutex> lock(pimpl_->videoCodecsMtx);
+        for (auto& codec : pimpl_->videoCodecs) {
+            if (codec.id == codecId) {
+                if (codec.quality == qualityStr) return;
+                codec.quality = qualityStr;
+                isAudio = false;
+                finalCodec = codec;
+                break;
+            }
+        }
+    }
+    if (isAudio) {
+        std::unique_lock<std::mutex> lock(pimpl_->audioCodecsMtx);
+        for (auto& codec : pimpl_->audioCodecs) {
+            if (codec.id == codecId) {
+                if (codec.quality == qualityStr) return;
+                codec.quality = qualityStr;
+                finalCodec = codec;
+                break;
+            }
+        }
+    }
+    pimpl_->setCodecDetails(finalCodec, isAudio);
+}
+
+void
+NewCodecModel::bitrate(const unsigned int& codecId, double bitrate)
+{
+    auto isAudio = true;
+    auto bitrateStr = std::to_string(static_cast<int>(bitrate));
+    Codec finalCodec;
+    {
+        std::unique_lock<std::mutex> lock(pimpl_->videoCodecsMtx);
+        for (auto& codec : pimpl_->videoCodecs) {
+            if (codec.id == codecId) {
+                if (codec.bitrate == bitrateStr) return;
+                codec.bitrate = bitrateStr;
+                isAudio = false;
+                finalCodec = codec;
+                break;
+            }
+        }
+    }
+    if (isAudio) {
+        std::unique_lock<std::mutex> lock(pimpl_->audioCodecsMtx);
+        for (auto& codec : pimpl_->audioCodecs) {
+            if (codec.id == codecId) {
+                if (codec.bitrate == bitrateStr) return;
+                codec.bitrate = bitrateStr;
+                finalCodec = codec;
+                break;
+            }
+        }
+    }
+    pimpl_->setCodecDetails(finalCodec, isAudio);
+}
+
 NewCodecModelPimpl::NewCodecModelPimpl(const NewCodecModel& linked, const CallbacksHandler& callbacksHandler)
 : linked(linked)
 , callbacksHandler(callbacksHandler)
@@ -244,6 +340,23 @@
     }
 }
 
+void
+NewCodecModelPimpl::setCodecDetails(const Codec& codec, bool isAudio)
+{
+    MapStringString details;
+    details[ DRing::Account::ConfProperties::CodecInfo::NAME        ] = codec.name.c_str();
+    details[ DRing::Account::ConfProperties::CodecInfo::SAMPLE_RATE ] = codec.samplerate.c_str();
+    details[ DRing::Account::ConfProperties::CodecInfo::BITRATE     ] = codec.bitrate.c_str();
+    details[ DRing::Account::ConfProperties::CodecInfo::MIN_BITRATE ] = codec.min_bitrate.c_str();
+    details[ DRing::Account::ConfProperties::CodecInfo::MAX_BITRATE ] = codec.max_bitrate.c_str();
+    details[ DRing::Account::ConfProperties::CodecInfo::TYPE        ] = isAudio? "AUDIO" : "VIDEO";
+    details[ DRing::Account::ConfProperties::CodecInfo::QUALITY     ] = codec.quality.c_str();
+    details[ DRing::Account::ConfProperties::CodecInfo::MIN_QUALITY ] = codec.min_quality.c_str();
+    details[ DRing::Account::ConfProperties::CodecInfo::MAX_QUALITY ] = codec.max_quality.c_str();
+    details[ DRing::Account::ConfProperties::CodecInfo::AUTO_QUALITY_ENABLED] = codec.auto_quality_enabled? "true" : "false";
+    ConfigurationManager::instance().setCodecDetails(linked.owner.id.c_str(), codec.id, details);
+}
+
 } // namespace lrc
 
 #include "newcodecmodel.moc"
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/person.cpp ring-20180816.2.e26b79f~ds1/lrc/src/person.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/person.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/person.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -559,23 +559,23 @@
  * some ContactMethod level caching need to be implemented and connected to new\
  * recording signals.
  */
-bool Person::hasRecording(Media::Media::Type type, Media::Media::Direction direction) const
+bool Person::hasRecording(media::Media::Type type, media::Media::Direction direction) const
 {
    Q_UNUSED(direction) //TODO implement
 
    switch (type) {
-      case Media::Media::Type::AUDIO:
-      case Media::Media::Type::VIDEO:
+      case media::Media::Type::AUDIO:
+      case media::Media::Type::VIDEO:
          return false; //TODO implement
-      case Media::Media::Type::TEXT:
+      case media::Media::Type::TEXT:
          foreach( ContactMethod* cm, phoneNumbers()) {
             if (cm->textRecording() && !cm->textRecording()->isEmpty())
                return true;
          }
 
          return false;
-      case Media::Media::Type::FILE:
-      case Media::Media::Type::COUNT__:
+      case media::Media::Type::FILE:
+      case media::Media::Type::COUNT__:
          break;
    }
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/person.h ring-20180816.2.e26b79f~ds1/lrc/src/person.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/person.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/person.h	2018-08-16 15:09:52.000000000 +0000
@@ -158,7 +158,7 @@
    bool isPlaceHolder              () const;
    bool hasBeenCalled              () const;
 
-   bool hasRecording(Media::Media::Type type, Media::Media::Direction direction) const;
+   bool hasRecording(media::Media::Type type, media::Media::Direction direction) const;
 
    //Setters
    void setContactMethods ( ContactMethods           );
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/personmodel.h ring-20180816.2.e26b79f~ds1/lrc/src/personmodel.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/personmodel.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/personmodel.h	2018-08-16 15:09:52.000000000 +0000
@@ -37,7 +37,7 @@
 //Typedef
 typedef QVector<Person*> PersonList;
 
-///PersonModel: Allow different way to handle contact without poluting the library
+///PersonModel: Allow different way to handle contact without polluting the library
 class LIB_EXPORT PersonModel :
    public QAbstractItemModel, public CollectionManagerInterface<Person> {
    #pragma GCC diagnostic push
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/phonedirectorymodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/phonedirectorymodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/phonedirectorymodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/phonedirectorymodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -813,7 +813,7 @@
 PhoneDirectoryModelPrivate::slotRegisteredNameFound(const Account* account, NameDirectory::LookupStatus status, const QString& address, const QString& name)
 {
     if (status != NameDirectory::LookupStatus::SUCCESS) {
-        // unsuccessfull lookup, so its useless
+        // unsuccessful lookup, so its useless
         return;
     }
     if (address.isEmpty() || name.isEmpty()) {
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/private/call_p.h ring-20180816.2.e26b79f~ds1/lrc/src/private/call_p.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/private/call_p.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/private/call_p.h	2018-08-16 15:09:52.000000000 +0000
@@ -31,7 +31,6 @@
 //Qt
 class QTimer;
 
-
 //Ring
 class Account;
 class ContactMethod;
@@ -42,7 +41,7 @@
 class CallPrivate;
 typedef  void (CallPrivate::*function)();
 
-namespace Media {
+namespace media {
    class Media;
    class Recording;
 }
@@ -178,11 +177,11 @@
     */
    static const TypedStateMachine< Call::LifeCycleState , Call::State > metaStateMap;
 
-   Matrix2D<Media::Media::Type, Media::Media::Direction, QList<Media::Media*>* > m_mMedias;
+   Matrix2D<media::Media::Type, media::Media::Direction, QList<media::Media*>* > m_mMedias;
 
-   Matrix2D<Media::Media::Type, Media::Media::Direction, QList<Media::Recording*>* > m_mRecordings;
+   Matrix2D<media::Media::Type, media::Media::Direction, QList<media::Recording*>* > m_mRecordings;
 
-   Matrix2D<Media::Media::Type, Media::Media::Direction, bool > m_mIsRecording;
+   Matrix2D<media::Media::Type, media::Media::Direction, bool > m_mIsRecording;
 
    static const Matrix1D<Call::LifeCycleState,function> m_mLifeCycleStateChanges;
 
@@ -236,7 +235,7 @@
    static MapStringString getCallDetailsCommon(const QString& callId);
    void peerHoldChanged(bool onPeerHold);
    template<typename T>
-   T* mediaFactory(Media::Media::Direction dir);
+   T* mediaFactory(media::Media::Direction dir);
    void updateOutgoingMedia(const MapStringString& details);
 
    //Static getters
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/private/contactmethod_p.h ring-20180816.2.e26b79f~ds1/lrc/src/private/contactmethod_p.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/private/contactmethod_p.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/private/contactmethod_p.h	2018-08-16 15:09:52.000000000 +0000
@@ -43,7 +43,7 @@
    QByteArray         m_Sha1             ;
    ContactMethod::Type  m_Type           ;
    QList<URI>         m_lOtherURIs       ;
-   Media::TextRecording* m_pTextRecording;
+   media::TextRecording* m_pTextRecording;
    Certificate*       m_pCertificate;
    QString            m_RegisteredName   ;
    UsageStatistics    m_UsageStats       ;
@@ -63,7 +63,7 @@
    void registeredNameSet(const QString& registeredName);
 
    //Helpers
-   void setTextRecording(Media::TextRecording* r);
+   void setTextRecording(media::TextRecording* r);
    void setCertificate (Certificate*);
    void setRegisteredName(const QString& registeredName);
 
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/private/imconversationmanagerprivate.h ring-20180816.2.e26b79f~ds1/lrc/src/private/imconversationmanagerprivate.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/private/imconversationmanagerprivate.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/private/imconversationmanagerprivate.h	2018-08-16 15:09:52.000000000 +0000
@@ -24,7 +24,7 @@
 class Call;
 class ContactMethod;
 
-namespace Media {
+namespace media {
    class Text;
    class TextRecording;
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/private/media_p.h ring-20180816.2.e26b79f~ds1/lrc/src/private/media_p.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/private/media_p.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/private/media_p.h	2018-08-16 15:09:52.000000000 +0000
@@ -21,19 +21,19 @@
 #include "private/matrixutils.h"
 
 
-namespace Media {
+namespace media {
 class MediaPrivate;
 
 typedef bool (MediaPrivate::*MediaTransitionFct)();
 
 class MediaPrivate
 {
-   friend class Media::Media;
+   friend class media::Media;
 public:
    MediaPrivate(Media* parent);
 
-   static const Matrix2D<Media::Media::State, Media::Media::Action, bool> m_mValidTransitions;
-   static const Matrix2D<Media::Media::State, Media::Media::Action, MediaTransitionFct> m_mCallbacks;
+   static const Matrix2D<media::Media::State, media::Media::Action, bool> m_mValidTransitions;
+   static const Matrix2D<media::Media::State, media::Media::Action, MediaTransitionFct> m_mCallbacks;
 
    //Actions
    bool mute     ();
@@ -47,9 +47,9 @@
 
 private:
    //Attributes
-   Media::Media::State m_State;
+   media::Media::State m_State;
    Call* m_pCall;
-   Media::Media::Direction m_Direction;
+   media::Media::Direction m_Direction;
 
    Media* q_ptr;
 };
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/private/textrecording_p.h ring-20180816.2.e26b79f~ds1/lrc/src/private/textrecording_p.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/private/textrecording_p.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/private/textrecording_p.h	2018-08-16 15:09:52.000000000 +0000
@@ -34,7 +34,7 @@
 class InstantMessagingModel;
 class ContactMethod;
 
-namespace Media {
+namespace media {
    class TextRecording;
 }
 
@@ -69,7 +69,7 @@
    ///The author display name
    QString                 authorSha1;
    ///The direction
-   Media::Media::Direction direction ;
+   media::Media::Direction direction ;
    ///The message Type
    Type                    type      ;
    ///If the message have been read
@@ -79,7 +79,7 @@
    //The token of the message
    uint64_t                id        ;
    //Delivery Status
-   Media::TextRecording::Status deliveryStatus;
+   media::TextRecording::Status deliveryStatus;
 
    static const QRegularExpression m_linkRegex;
 
@@ -155,7 +155,7 @@
 }
 //END Those classes are serializable to JSon
 
-namespace Media {
+namespace media {
 
 /**
  * The Media::Recording private class. This is where the reconstructed
@@ -179,7 +179,7 @@
    QHash<uint64_t, TextMessageNode*> m_hPendingMessages;
 
    //Helper
-   void insertNewMessage(const QMap<QString,QString>& message, ContactMethod* cm, Media::Media::Direction direction, uint64_t id = 0);
+   void insertNewMessage(const QMap<QString,QString>& message, ContactMethod* cm, media::Media::Direction direction, uint64_t id = 0);
    QHash<QByteArray,QByteArray> toJsons() const;
    void accountMessageStatusChanged(const uint64_t id, DRing::Account::MessageStates status);
    bool updateMessageStatus(Serializable::Message* m, TextRecording::Status status);
@@ -235,7 +235,7 @@
 public:
 
    //Constructor
-   explicit InstantMessagingModel(Media::TextRecording*);
+   explicit InstantMessagingModel(media::TextRecording*);
    virtual ~InstantMessagingModel();
 
    //Abstract model function
@@ -248,7 +248,7 @@
    void clear();
 
    //Attributes
-   Media::TextRecording* m_pRecording;
+   media::TextRecording* m_pRecording;
 
    //Helper
    void addRowBegin();
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/private/useractions.h ring-20180816.2.e26b79f~ds1/lrc/src/private/useractions.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/private/useractions.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/private/useractions.h	2018-08-16 15:09:52.000000000 +0000
@@ -266,7 +266,7 @@
       qDebug() << "Error : Muting audio when no item selected. Should not happen.";
       return false;
    }
-   auto audioOut = call->firstMedia<Media::Audio>(Media::Media::Direction::OUT);
+   auto audioOut = call->firstMedia<media::Audio>(media::Media::Direction::OUT);
    if (!audioOut) {
       qDebug() << "Error : No audio media for this call";
       return false;
@@ -291,7 +291,7 @@
       qDebug() << "Error : Muting video when no item selected. Should not happen.";
       return false;
    }
-   auto videoOut = call->firstMedia<Media::Video>(Media::Media::Direction::OUT);
+   auto videoOut = call->firstMedia<media::Video>(media::Media::Direction::OUT);
    if (!videoOut) {
       qDebug() << "Error : No video media for this call";
       return false;
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/private/vcardutils.cpp ring-20180816.2.e26b79f~ds1/lrc/src/private/vcardutils.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/private/vcardutils.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/private/vcardutils.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -256,7 +256,7 @@
          .arg(Delimiter::SEPARATOR_TOKEN)
          .arg(addr.type());
 
-   //First two fiels are left empty for now, they are for Postal box and Extended Address
+   //First two fields are left empty for now, they are for Postal box and Extended Address
    QString value = QString("%1%2%3%4%5%6%7%8%9%10%11")
          .arg(Delimiter::SEPARATOR_TOKEN)
          .arg(Delimiter::SEPARATOR_TOKEN)
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/qtwrapper/configurationmanager_wrap.h ring-20180816.2.e26b79f~ds1/lrc/src/qtwrapper/configurationmanager_wrap.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/qtwrapper/configurationmanager_wrap.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/qtwrapper/configurationmanager_wrap.h	2018-08-16 15:09:52.000000000 +0000
@@ -122,6 +122,10 @@
                 [this] (const std::string &accountId, const std::map<std::string, std::string>& devices) {
                     Q_EMIT this->knownDevicesChanged(QString(accountId.c_str()), convertMap(devices));
                 }),
+            exportable_callback<ConfigurationSignal::DeviceRevocationEnded>(
+                [this] (const std::string &accountId, const std::string &device, int status) {
+                    Q_EMIT this->deviceRevocationEnded(QString(accountId.c_str()), QString(device.c_str()), status);
+            }),
             exportable_callback<ConfigurationSignal::ExportOnRingEnded>(
                 [this] (const std::string &accountId, int status, const std::string &pin) {
                     Q_EMIT this->exportOnRingEnded(QString(accountId.c_str()), status, QString(pin.c_str()));
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/securityevaluationmodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/securityevaluationmodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/securityevaluationmodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/securityevaluationmodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -243,7 +243,7 @@
    };
 
    ///This model expect a certain size, get each sections size
-   constexpr static const short sizes[] = {
+   constexpr static const int sizes[] = {
       enum_class_size< Certificate             :: Checks                > (),
       enum_class_size< Certificate             :: Checks                > (),
       enum_class_size< SecurityEvaluationModel :: AccountSecurityChecks > (),
@@ -270,7 +270,7 @@
 
 };
 
-constexpr const short CombinaisonProxyModel::sizes[];
+constexpr const int CombinaisonProxyModel::sizes[];
 
 ///Create a callback map for signals to avoid a large switch(){} in the code
 static const Matrix1D<SecurityEvaluationModel::Severity, void(SecurityEvaluationModel::*)()> m_lSignalMap = {{
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/typedefs.h ring-20180816.2.e26b79f~ds1/lrc/src/typedefs.h
--- ring-20180712.2.f3b87a6~ds1/lrc/src/typedefs.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/typedefs.h	2018-08-16 15:09:52.000000000 +0000
@@ -73,8 +73,12 @@
 #ifdef LRC_IMPORT
 #define LIB_EXPORT Q_DECL_IMPORT
 #else
+#if defined(_MSC_VER)
+#define LIB_EXPORT
+#else
 #define LIB_EXPORT Q_DECL_EXPORT
 #endif
+#endif
 
 //Doesn't work
 #if ((__GNUC_MINOR__ > 8) || (__GNUC_MINOR__ == 8))
@@ -175,7 +179,13 @@
    uint m_Flags;
 };
 
+#ifdef _MSC_VER
+#define DO_PRAGMA(x) /*do nothing*/
+#define __attribute__(A) /*do nothing*/
+#include <ciso646>
+#else
 #define DO_PRAGMA(x) _Pragma (#x)
+#endif // _MSC_VER
 
 //Globally disable the "-Wunused-function" warning for GCC
 //refs: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55578
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/useractionmodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/useractionmodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/useractionmodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/useractionmodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -290,7 +290,7 @@
 /**
  * This matrix define if an action is stateless or stateful. The only state
  * supported is "checked", but when multiple items are selected, this can
- * cause a heterogenous bunch of checked and unchecked elements, this is
+ * cause a heterogeneous bunch of checked and unchecked elements, this is
  * called "TRISTATE".
  */
 #define ST UserActionModel::ActionStatfulnessLevel::
@@ -447,8 +447,8 @@
    { UAMA::BOOKMARK          , nullptr                                         },
    { UAMA::VIEW_CHAT_HISTORY , P_CB {
       return p->hasRecording(
-        Media::Media::Type::TEXT,
-        Media::Media::Direction::OUT
+        media::Media::Type::TEXT,
+        media::Media::Direction::OUT
       );
    }},
    { UAMA::ADD_CONTACT_METHOD, nullptr                                         },
@@ -705,20 +705,20 @@
          ret += c->state() == Call::State::HOLD? 100 : 1;
          break;
       case UserActionModel::Action::MUTE_AUDIO      : {
-         auto a = c->firstMedia<Media::Audio>(Media::Media::Direction::OUT);
-         ret += a && a->state() == Media::Media::State::MUTED ? 100 : 1;
+         auto a = c->firstMedia<media::Audio>(media::Media::Direction::OUT);
+         ret += a && a->state() == media::Media::State::MUTED ? 100 : 1;
          }
          break;
       case UserActionModel::Action::MUTE_VIDEO      : {
-         auto v = c->firstMedia<Media::Video>(Media::Media::Direction::OUT);
-         ret += v && v->state() == Media::Media::State::MUTED ? 100 : 1;
+         auto v = c->firstMedia<media::Video>(media::Media::Direction::OUT);
+         ret += v && v->state() == media::Media::State::MUTED ? 100 : 1;
          }
          break;
       case UserActionModel::Action::SERVER_TRANSFER :
          ret += c->state() == Call::State::TRANSFERRED? 100 : 1;
          break;
       case UserActionModel::Action::RECORD          :
-         ret += c->isRecording(Media::Media::Type::AUDIO,Media::Media::Direction::OUT) ? 100 : 1;
+         ret += c->isRecording(media::Media::Type::AUDIO,media::Media::Direction::OUT) ? 100 : 1;
          break;
       case UserActionModel::Action::HANGUP          :
          ret += 0;
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/video/device.cpp ring-20180816.2.e26b79f~ds1/lrc/src/video/device.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/video/device.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/video/device.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -85,7 +85,6 @@
       });
       chan->d_ptr->m_lValidResolutions = validResolutions;
    }
-   Q_UNUSED(cap)
 }
 
 ///Destructor
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/video/devicemodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/video/devicemodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/video/devicemodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/video/devicemodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -137,7 +137,7 @@
       emit currentIndexChanged(idx.row());
 
       //If the only renderer is the preview, reload it
-      if (Video::PreviewManager::instance().isPreviewing() && VideoRendererManager::instance().size() == 1) {
+      if (Video::PreviewManager::instance().isPreviewing() && ::VideoRendererManager::instance().size() == 1) {
          Video::PreviewManager::instance().stopPreview();
          Video::PreviewManager::instance().startPreview();
       }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/video/previewmanager.cpp ring-20180816.2.e26b79f~ds1/lrc/src/video/previewmanager.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/video/previewmanager.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/video/previewmanager.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -29,23 +29,23 @@
 //Getters
 bool Video::PreviewManager::isPreviewing()
 {
-   return VideoRendererManager::instance().isPreviewing();
+   return ::VideoRendererManager::instance().isPreviewing();
 }
 
 Video::Renderer* Video::PreviewManager::previewRenderer()
 {
-   return VideoRendererManager::instance().previewRenderer();
+   return ::VideoRendererManager::instance().previewRenderer();
 }
 
-Video::PreviewManager::PreviewManager() : QObject(&VideoRendererManager::instance())
+Video::PreviewManager::PreviewManager() : QObject(&::VideoRendererManager::instance())
 {
-   connect(&VideoRendererManager::instance(), &VideoRendererManager::previewStateChanged, [this](bool startStop) {
+   connect(&::VideoRendererManager::instance(), &::VideoRendererManager::previewStateChanged, [this](bool startStop) {
       emit previewStateChanged(startStop);
    });
-   connect(&VideoRendererManager::instance(), &VideoRendererManager::previewStarted     , [this](Video::Renderer* renderer) {
+   connect(&::VideoRendererManager::instance(), &::VideoRendererManager::previewStarted     , [this](Video::Renderer* renderer) {
       emit previewStarted(renderer);
    });
-   connect(&VideoRendererManager::instance(), &VideoRendererManager::previewStopped     , [this](Video::Renderer* renderer) {
+   connect(&::VideoRendererManager::instance(), &::VideoRendererManager::previewStopped     , [this](Video::Renderer* renderer) {
       emit previewStopped(renderer);
    });
 }
@@ -57,10 +57,10 @@
 
 void Video::PreviewManager::stopPreview()
 {
-   return VideoRendererManager::instance().stopPreview();
+   return ::VideoRendererManager::instance().stopPreview();
 }
 
 void Video::PreviewManager::startPreview()
 {
-   return VideoRendererManager::instance().startPreview();
+   return ::VideoRendererManager::instance().startPreview();
 }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/src/video/sourcemodel.cpp ring-20180816.2.e26b79f~ds1/lrc/src/video/sourcemodel.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/src/video/sourcemodel.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/src/video/sourcemodel.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -210,7 +210,7 @@
            .arg(DRing::Media::VideoProtocolPrefix::SEPARATOR);
         Video::Device* dev = Video::DeviceModel::instance().getDevice(deviceStr.replace(fullPrefix,""));
         if (dev == nullptr) {
-            // Device not found we dont know what camera is used
+            // Device not found we don't know what camera is used
             idx = ExtendedDeviceList::NONE;
             return;
         }
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/test/conversationmodeltester.cpp ring-20180816.2.e26b79f~ds1/lrc/test/conversationmodeltester.cpp
--- ring-20180712.2.f3b87a6~ds1/lrc/test/conversationmodeltester.cpp	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/test/conversationmodeltester.cpp	2018-08-16 15:09:52.000000000 +0000
@@ -743,7 +743,7 @@
     // Place a call
     accInfo_.conversationModel->placeCall(firstConversation.uid);
 
-    // Get first conversation again and make sure it isn't empty anymore (call suceeded)
+    // Get first conversation again and make sure it isn't empty anymore (call succeeded)
     conversations = accInfo_.conversationModel->allFilteredConversations();
     CPPUNIT_ASSERT(conversations.size() != 0);
     auto newConv = accInfo_.conversationModel->filteredConversation(0);
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/test/datatransfertester.h ring-20180816.2.e26b79f~ds1/lrc/test/datatransfertester.h
--- ring-20180712.2.f3b87a6~ds1/lrc/test/datatransfertester.h	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/test/datatransfertester.h	2018-08-16 15:09:52.000000000 +0000
@@ -62,7 +62,7 @@
      */
     void testReceivesImage5MbNoPref();
     /**
-     * Receives a new image with a prefedred dir, should accept tranfer
+     * Receives a new image with a prefedred dir, should accept transfer
      */
     void testReceivesImage5Mb();
     /**
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ar.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ar.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ar.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ar.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>المكالمات</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>حساب باطل</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>اليوم</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>البارحة</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>منذ أسبوعان</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>منذ ثلاثة أسابيع</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>منذ أسبوع</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>منذ شهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>منذ شهرين</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>منذ ثلاثة أشهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>منذ أربعة أشهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>منذ خمسة أشهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>منذ ستة أشهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>منذ سبعة أشهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>منذ ثمانية أشهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>منذ تسعة أشهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>منذ عشرة أشهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>منذ إحدى عشرة شهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>منذ إثنى عشرة شهر</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>منذ سنة</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>منذ زمن طويل جدا</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>أبدا</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>التسجيلات</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>رسائل نصية</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>صوت/فيديو</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>ملف</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>التسجيلات</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>رسائل نصية</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>صوت/فيديو</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_bg.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_bg.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_bg.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_bg.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Обаждания</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Грешен акаунт</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Днес</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Вчера</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Преди две седмици</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Преди три седмици</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Преди седмица</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Преди месец</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Преди два месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Преди три месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Преди четири месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Преди пет месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Преди шест месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Преди седем месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Преди осем месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Преди девет месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Преди десет месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Преди единадесет месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Преди дванадесет месеца</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Преди година</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Много отдавна</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Никога</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Записи</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Текстови съобщения</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Звук/видео</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>ФАЙЛ</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Записи</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Текстови съобщения</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Звук/видео</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ca.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ca.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ca.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ca.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Trucades</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_cs_CZ.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_cs_CZ.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_cs_CZ.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_cs_CZ.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Hovory</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Neplatný účet</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Dnes</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Včera</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Před dvěma týdny</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Před třemi týdny</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Před týdnem</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Před měsícem</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Před dvěma měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Před třemi měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Před čtyřmi měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Před pěti měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Před šesti měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Před sedmi měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Před osmi měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Před devíti měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Před deseti měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Před jedenácti měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Před dvanácti měsíci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Před rokem</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Velmi dávno</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nikdy</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Nahrávky</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Textové zprávy</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Obraz/Zvuk</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Sbírka profilů peerů</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>SOUBOR</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Nahrávky</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Textové zprávy</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Zvuk/Obraz</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_da_DK.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_da_DK.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_da_DK.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_da_DK.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Opkald</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Ugyldig konto</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>I dag</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>I går</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>For to uger siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>For tre uger siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>For en uge siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>For en måned siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>For to måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>For tre måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>For fire måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>For fem måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>For seks måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>For syv måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>For otte måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>For ni måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>For ti måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>For elleve måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>For tolv måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>For et år siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>For meget lang tid siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Aldrig</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Optagelser</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Tekstbeskeder</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Lyd/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Partners Profil-samling</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Invitation modtaget</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Kontakt tilføjet</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Invitation accepteret</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 Udgående opkald</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>📞 Indgående opkald</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 Udgående opkald - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>📞 Indgående opkald - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 Mistede udgående opkald</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 Misteede indgående opkald</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>FILE</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Optagelser</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Tekstbeskeder</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Lyd/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_de_DE.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_de_DE.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_de_DE.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_de_DE.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Anrufe</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Ungültiges Konto</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Gestern</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Vor zwei Wochen</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Vor drei Wochen</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Vor einer Woche</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Vor einem Monat.</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Vor zwei Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Vor drei Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Vor vier Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Vor funf Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Vor sechs Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Vor sieben Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Vor acht Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Vor neun Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Vor zehn Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Vor elf Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Vor zwölf Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Vor einem Jahr</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Vor langer Zeit</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nie</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Textnachrichten</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>DATEI</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Textnachrichten</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_de.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_de.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_de.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_de.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Anrufe</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Ungültiges Konto</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Gestern</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Vor zwei Wochen</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Vor drei Wochen</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Vor einer Woche</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Vor einem Monat</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Vor zwei Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Vor drei Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Vor vier Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Vor fünf Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Vor sechs Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Vor sieben Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Vor acht Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Vor neun Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Vor zehn Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Vor elf Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Vor zwölf Monaten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Vor einem Jahr</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Vor sehr langer Zeit</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Niemals</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Aufzeichnungen</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Textnachrichten</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Sammlung der Teilnehmerprofile</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Einladung erhalten</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Kontakt hinzugefügt</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Einladung angenommen</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 Ausgehender Anruf</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>📞 Eingehender Anruf</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 Ausgehender Anruf - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>📞 Eingehender Anruf - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 Verpasster ausgehender Anruf</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 Verpasster eingehender Anruf</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>DATEI</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Aufzeichnungen</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Textnachrichten</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_el.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_el.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_el.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_el.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Κλήσεις</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Λανθασμένος λογαριασμός</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Σήμερα</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Χθες</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Δύο εβδομάδες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Τρεις εβδομάδες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Μία εβδομάδα πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Ένας μήνας πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Δύο μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Τρεις μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Τέσσερις μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Πέντε μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Έξι μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Επτά μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Οκτώ μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Εννιά μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Δέκα μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Έντεκα μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Δώδεκα μήνες πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Ένας χρόνος πριν</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Πριν από πολύ καιρό</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Ποτέ</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Εγγραφές</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Μηνύματα</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Ήχος/Βίντεο</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Εγγραφές</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Μηνύματα</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Ήχος/Βίντεο</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_en_GB.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_en_GB.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_en_GB.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_en_GB.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_en.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_en.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_en.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_en.ts	2018-08-16 15:09:56.000000000 +0000
@@ -240,7 +240,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"></translation>
     </message>
@@ -248,8 +248,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"></translation>
     </message>
@@ -393,102 +393,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -528,24 +528,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1412,50 +1394,50 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1515,4 +1497,22 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_eo.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_eo.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_eo.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_eo.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Vokoj</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Nevalida konto</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Hodiaŭ</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Hieraŭ</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Antaŭ du semajnoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Antaŭ tri semajnoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Antaŭ semajno</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Antaŭ monato</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Antaŭ du monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Antaŭ tri monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Antaŭ kvar monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Antaŭ kvin monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Antaŭ ses monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Antaŭ sep monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Antaŭ ok monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Antaŭ naŭ monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Antaŭ dek monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Antaŭ dek unu monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Antaŭ dek du monatoj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Antaŭ jaro</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Antaŭ tre longe</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Neniam</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Registraĵoj</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Tekstmesaĝoj</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Aŭdio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Kolekto de Samtavolanaj Profiloj</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>DOSIERO</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Registraĵoj</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Tekstmesaĝoj</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Aŭdio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_es_AR.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_es_AR.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_es_AR.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_es_AR.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Llamadas</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Cuenta inválida</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Ayer</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Hace dos semanas</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Hace tres semanas</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Hace una semana</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Hace un mes</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Hace dos meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Hace tres meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Hace cuatro meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Hace cinco meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Hace seis meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Hace siete meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Hace ocho meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Hace nueve meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Hace diez meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Hace once meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Hace doce meses</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Hace un año</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Hace un largo tiempo</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Grabaciones</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Mensajes de texto</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Invitación recibida</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Contacto añadido</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Invitación aceptada</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Grabaciones</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Mensajes de texto</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_es.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_es.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_es.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_es.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Llamadas</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Cuenta inválida</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Ayer</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>dos semanas atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>tres semanas atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>una semana atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>un mes atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>dos meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>tres meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>cuatro meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>cinco meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>seis meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>siete meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>ocho meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>nueve meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>diez meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>once meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>doce meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>un año antes</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>mucho tiempo antes</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Grabaciones</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Mensajes de Texto</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Colección de perfiles de pares</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Invitación recibida</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Contacto añadido</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Invitación aceptada</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 Llamada saliente</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>📞 Llamada entrante</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 Llamada saliente - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>📞 Llamada entrante - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 Llamada saliente perdida</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 Llamada entrante perdida</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>ARCHIVO</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Grabaciones</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Mensajes de Texto</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_et_EE.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_et_EE.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_et_EE.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_et_EE.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_eu.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_eu.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_eu.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_eu.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Grabaketak</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Grabaketak</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fa_IR.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fa_IR.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fa_IR.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fa_IR.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>تماس‌ها</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>حساب کاربری نامعتبر</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>امروز</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>دیروز</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>دو هفته پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>سه هفته پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>هفته پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>دو ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>سه ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>چهار ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>پنج ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>شش ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>هفت ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>هشت ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>نه ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>ده ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>یازده ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>دوازده ماه پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>سال پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>خیلی وقت پیش</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>هرگز</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>ضبط شده‌ها</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>پیام‌های متنی</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>صدا/تصویر</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1240,7 +1222,7 @@
     <message>
         <location filename="../src/api/call.h" line="69"/>
         <source>Incoming</source>
-        <translation type="unfinished"/>
+        <translation>تماس ورودی</translation>
     </message>
     <message>
         <location filename="../src/api/call.h" line="71"/>
@@ -1255,7 +1237,7 @@
     <message>
         <location filename="../src/api/call.h" line="75"/>
         <source>Searching</source>
-        <translation type="unfinished"/>
+        <translation>در حال  جستجو</translation>
     </message>
     <message>
         <location filename="../src/api/call.h" line="79"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
-        <translation type="unfinished"/>
+        <translation>دعوت نامه دریافت شد</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
-        <translation type="unfinished"/>
+        <translation>مخاطب افزوده شد</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>ضبط شده‌ها</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>پیام‌های متنی</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>صدا/تصویر</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fi.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fi.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fi.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fi.ts	2018-08-16 15:09:56.000000000 +0000
@@ -239,7 +239,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Puhelut</translation>
     </message>
@@ -247,8 +247,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Epäkelpo tunnus</translation>
     </message>
@@ -392,102 +392,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Tänään</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Eilen</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Kaksi viikkoa sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Kolme viikkoa sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Viikko sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Kuukausi sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Kaksi kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Kolme kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Neljä kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Viisi kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Kuusi kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Seitsemän kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Kahdeksan kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Yhdeksän kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Kymmenen kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Yksitoista kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Kaksitoistas kuukautta sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Vuosi sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Kauan aikaa sitten</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Ei koskaan</translation>
     </message>
@@ -527,24 +527,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Tallenteet</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Tekstiviestit</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Ääni/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1411,50 +1393,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1514,4 +1496,22 @@
         <translation>TIEDOSTO</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Tallenteet</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Tekstiviestit</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Ääni/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fr_CA.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fr_CA.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fr_CA.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fr_CA.ts	2018-08-16 15:09:56.000000000 +0000
@@ -59,7 +59,7 @@
         <location filename="../src/account.cpp" line="349"/>
         <source>Stun configuration error</source>
         <extracomment>Account state</extracomment>
-        <translation>Erreur de configuration Stun</translation>
+        <translation>Erreur de configuration STUN</translation>
     </message>
     <message>
         <location filename="../src/account.cpp" line="351"/>
@@ -232,13 +232,13 @@
     <message>
         <location filename="../src/call.cpp" line="2243"/>
         <source>Account: </source>
-        <translation>Compte:</translation>
+        <translation>Compte :</translation>
     </message>
 </context>
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Appels</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Compte invalide</translation>
     </message>
@@ -262,7 +262,7 @@
     <message>
         <location filename="../src/call.cpp" line="1815"/>
         <source>No account registered!</source>
-        <translation>Aucun compte créé!</translation>
+        <translation>Aucun compte créé !</translation>
     </message>
 </context>
 <context>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Hier</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Il y a deux semaines</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Il y a trois semaines</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Il y a une semaine</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Il y a un mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Il y a deux mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Il y a trois mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Il y a quatre mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Il y a cinq mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Il y a six mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Il y a sept mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Il y a huit mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Il y a neuf mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Il y a dix mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Il y a onze mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Il y a douze mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Il y a un an</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Il y a très longtemps</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Jamais</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Enregistrements</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Messages textes</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Vidéo</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Enregistrements</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Messages textes</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Vidéo</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fr_CH.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fr_CH.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fr_CH.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fr_CH.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fr_FR.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fr_FR.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fr_FR.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fr_FR.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fr.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fr.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_fr.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_fr.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Appels</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Compte invalide</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Hier</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Il y a deux semaines</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Il y a trois semaines</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Il y a une semaine</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Il y a un mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Il y a deux mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Il y a trois mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Il y a quatre mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Il y a cinq mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Il y a six mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Il y a sept mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Il y a huit mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Il y a neuf mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Il y a dix mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Il y a onze mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Il y a douze mois</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Il y a un an</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Il y a très longtemps</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Jamais</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Enregistrements</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Tchat</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Vidéo</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Liste des profils paires</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Invitation reçue</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Contact ajouté</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Invitation acceptée</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>ð Appel sortant</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>ð Appel entrant</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>ð Appel sortant -</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>ð Appel entrant -</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 Appel sortant raté</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 Appels entrants ratés</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>FICHIER</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Enregistrements</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Tchat</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Vidéo</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_he.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_he.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_he.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_he.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>קריאות</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>היום</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>אתמול</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>לפני שבועיים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>לפני שלושה שבועות</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>לפני שבוע</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>לפני חודש</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>לפני חודשיים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>לפני שלושה חודשים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>לפני ארבעה חודשים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>לפני חמישה חודשים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>לפני שישה חודשים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>לפני שבעה חודשים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>לפני שמונה חודשים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>לפני תשעה חודשים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>לפני עשרה חודשים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>לפני אחד עשר חודשים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>לפני שנים עשר חודשים</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>לפני שנה</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>לפני זמן רב מאוד</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>אף פעם</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>הקלטות</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>הודעות טקסט</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>אודיו/וידאו</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>הקלטות</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>הודעות טקסט</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>אודיו/וידאו</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_hi_IN.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_hi_IN.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_hi_IN.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_hi_IN.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_hr.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_hr.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_hr.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_hr.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Pozivi</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Neispravan račun</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Danas</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Jučer</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Prije dva tjedna</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Prije tri tjedna</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Prije tjedan dana</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Prije mjesec dana</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Prije dva mjeseca</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Prije tri mjeseca</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Prije četiri mjeseca</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Prije pet mjeseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Prije šest mjeseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Prije sedam mjeseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Prije osam mjeseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Prije devet mjeseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Prije deset mjeseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Prije jedanaest mjeseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Prije dvanaest mjeseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Prije godinu dana</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Vrlo davno</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nikada</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Snimke</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Tekstualne poruke</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>DATOTEKA</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Snimke</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Tekstualne poruke</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_hu.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_hu.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_hu.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_hu.ts	2018-08-16 15:09:56.000000000 +0000
@@ -59,13 +59,13 @@
         <location filename="../src/account.cpp" line="349"/>
         <source>Stun configuration error</source>
         <extracomment>Account state</extracomment>
-        <translation>STUN (Session Traversal Utilities for NAT) konfigurációs hiba</translation>
+        <translation>STUN konfigurációs hiba</translation>
     </message>
     <message>
         <location filename="../src/account.cpp" line="351"/>
         <source>Stun server invalid</source>
         <extracomment>Account state</extracomment>
-        <translation>STUN (Session Traversal Utilities for NAT) kiszolgáló érvénytelen</translation>
+        <translation>STUN kiszolgáló érvénytelen</translation>
     </message>
     <message>
         <location filename="../src/account.cpp" line="353"/>
@@ -125,13 +125,13 @@
         <location filename="../src/call.cpp" line="723"/>
         <source>Ringing</source>
         <extracomment>Call state</extracomment>
-        <translation>Csörögni…</translation>
+        <translation>Csörögni</translation>
     </message>
     <message>
         <location filename="../src/call.cpp" line="726"/>
         <source>Calling</source>
         <extracomment>Call state</extracomment>
-        <translation>Hívás…</translation>
+        <translation>Hívás</translation>
     </message>
     <message>
         <location filename="../src/call.cpp" line="729"/>
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Hívások</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Érvénytelen fiók</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Tegnap</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Két héttel ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Három héttel ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Egy héttel ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Egy hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Két hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Három hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Négy hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Öt hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Hat hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Hét hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Nyolc hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Kilenc hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Tíz hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Tizenegy hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Tizenkét hónappal ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Egy évvel ezelőtt</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Nagyon régen</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Soha</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Felvételek</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Szöveges üzenetek</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Hang/videó</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -682,7 +664,7 @@
     <message>
         <location filename="../src/phonedirectorymodel.cpp" line="307"/>
         <source>Uid</source>
-        <translation>Egyéni azonosító (UID)</translation>
+        <translation>Egyéni azonosító</translation>
     </message>
     <message>
         <location filename="../src/phonedirectorymodel.cpp" line="307"/>
@@ -943,12 +925,12 @@
     <message>
         <location filename="../src/certificate.cpp" line="102"/>
         <source>Md5 fingerprint</source>
-        <translation>MD5 (Message-Digest algoritmus) ujjlenyomat</translation>
+        <translation>MD5 ujjlenyomat</translation>
     </message>
     <message>
         <location filename="../src/certificate.cpp" line="103"/>
         <source>Sha1 fingerprint</source>
-        <translation>SHA-1 (Secure Hash Algorithm 1) ujjlenyomat</translation>
+        <translation>SHA-1 ujjlenyomat</translation>
     </message>
     <message>
         <location filename="../src/certificate.cpp" line="104"/>
@@ -1410,50 +1392,50 @@
         <translation>Peer profilgyűjtemény</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Meghívó érkezett</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Kapcsolat hozzáadva</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Meghívó elfogadva</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 Kimenő hívás</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>ð Bejövő hívás</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 Kimenő hívás - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>ð Bejövő hívás - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 Nem fogadott kimenő hívás</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 Nem fogadott bejövő hívás</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>FÁJL</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Felvételek</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Szöveges üzenetek</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Hang/videó</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_id.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_id.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_id.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_id.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Hari ini</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Kemarin</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Dua minggu yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Tiga minggu yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Seminggu yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Tidak Pernah</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_it_IT.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_it_IT.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_it_IT.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_it_IT.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Chiamate</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Account non valido</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Ieri</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Due settimane fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Tre settimane fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Una settimana fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Un mese fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Due mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Tre mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Quattro mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Cinque mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Sei mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Sette mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Otto mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Nove mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Dieci mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Undici mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Dodici mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Un anno fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Molto tempo fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Mai</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Registrazioni</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Messaggi di testo</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Collezione profili dei peer</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>FILE</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Registrazioni</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Messaggi di testo</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_it.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_it.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_it.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_it.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Chiamate</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Profilo non valido</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Ieri</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Due settimane fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Tre settimane fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Una settimana fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Un mese fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Due mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Tre mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Quattro mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Cinque mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Sei mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Sette mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Otto mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Nove mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Dieci mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Undici mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Dodici mesi fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Un anno fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Molto tempo fa</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Mai</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Registrando</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Messagio di testo</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Elenco dei profili peer</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>FILE</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Registrando</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Messagio di testo</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ja.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ja.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ja.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ja.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>発信</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>不正なアカウント</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>今日</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>昨日</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>2週間前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>3週間前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>1週間前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>1か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>2か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>3か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>4か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>5か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>6か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>7か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>8か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>9か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>10か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>11か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>12か月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>1年前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>さらに昔</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>録音</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>テキストメッセージ</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>音声/動画</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>録音</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>テキストメッセージ</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>音声/動画</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ko_KR.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ko_KR.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ko_KR.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ko_KR.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>오디오/비디오</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>오디오/비디오</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_lt.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_lt.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_lt.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_lt.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Skambučiai</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Neteisinga paskyra</translation>
     </message>
@@ -305,7 +305,7 @@
     <message>
         <location filename="../src/private/sortproxies.cpp" line="147"/>
         <source>Other</source>
-        <translation type="unfinished"/>
+        <translation>Kita</translation>
     </message>
 </context>
 <context>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Šiandien</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Vakar</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Prieš dvi savaites</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Prieš tris savaites</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Prieš savaitę</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Prieš mėnesį</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Prieš du mėnesius</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Prieš tris mėnesius</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Prieš keturis mėnesius</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Prieš penkis mėnesius</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Prieš šešis mėnesius</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Prieš septynis mėnesius</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Prieš aštuonis mėnesius</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Prieš devynis mėnesius</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Prieš dešimt mėnesių</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Prieš vienuolika mėnesių</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Prieš dvylika mėnesių</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Prieš metus</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Prieš labai daug laiko</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Niekada</translation>
     </message>
@@ -514,7 +514,7 @@
     <message>
         <location filename="../src/macromodel.cpp" line="264"/>
         <source>Other</source>
-        <translation type="unfinished"/>
+        <translation>Kita</translation>
     </message>
 </context>
 <context>
@@ -522,25 +522,7 @@
     <message>
         <location filename="../src/macromodel.cpp" line="77"/>
         <source>Other</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Įrašai</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Tekstinės žinutės</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Garsas/Vaizdas</translation>
+        <translation>Kita</translation>
     </message>
 </context>
 <context>
@@ -763,7 +745,7 @@
     <message>
         <location filename="../src/accountstatusmodel.cpp" line="179"/>
         <source>Code</source>
-        <translation type="unfinished"/>
+        <translation>Kodas</translation>
     </message>
     <message>
         <location filename="../src/accountstatusmodel.cpp" line="181"/>
@@ -848,7 +830,7 @@
     <message>
         <location filename="../src/certificate.cpp" line="56"/>
         <source>The file is a valid certificate</source>
-        <translation type="unfinished"/>
+        <translation>Failas yra galiojantis liudijimas</translation>
     </message>
     <message>
         <location filename="../src/certificate.cpp" line="57"/>
@@ -888,7 +870,7 @@
     <message>
         <location filename="../src/certificate.cpp" line="91"/>
         <source>Activation date</source>
-        <translation type="unfinished"/>
+        <translation>Aktyvavimo data</translation>
     </message>
     <message>
         <location filename="../src/certificate.cpp" line="92"/>
@@ -994,7 +976,7 @@
     <message>
         <location filename="../src/certificatemodel.cpp" line="397"/>
         <source>An organisation</source>
-        <translation type="unfinished"/>
+        <translation>Organizacija</translation>
     </message>
     <message>
         <location filename="../src/certificatemodel.cpp" line="420"/>
@@ -1120,12 +1102,12 @@
     <message>
         <location filename="../src/numbercategory.cpp" line="72"/>
         <source>Phone number types</source>
-        <translation type="unfinished"/>
+        <translation>Telefono numerio tipai</translation>
     </message>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="186"/>
         <source>Other</source>
-        <translation type="unfinished"/>
+        <translation>Kita</translation>
     </message>
     <message>
         <location filename="../src/protocolmodel.cpp" line="50"/>
@@ -1410,52 +1392,52 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Kontaktas pridėtas</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
-        <translation type="unfinished"/>
+        <translation>Pakvietimas priimtas</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 Išsiunčiamasis skambutis</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>📞 Gaunamasis skambutis</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 Išsiunčiamasis skambutis - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>📞 Gaunamasis skambutis - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
-        <translation type="unfinished"/>
+        <translation>🕽 Praleistas gaunamasis skambutis</translation>
     </message>
 </context>
 <context>
@@ -1513,4 +1495,22 @@
         <translation>FAILAS</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Įrašai</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Tekstinės žinutės</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Garsas/Vaizdas</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ms.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ms.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ms.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ms.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Panggilan</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Akaun tidak sah</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Hari ini</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Semalam</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Dua minggu yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Tiga minggu yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Seminggu yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Sebulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Dua bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Tiga bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Empat bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Lima bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Enam bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Tujuh bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Lapan bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Sembilan bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Sepuluh bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Sebelas bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Dua belas bulan yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Setahun yang lalu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Masa yang lama dahulu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Tidak pernah</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Rakaman</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Pesanan teks</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1411,50 +1393,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1514,4 +1496,22 @@
         <translation>FAIL</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Rakaman</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Pesanan teks</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_nb.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_nb.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_nb.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_nb.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Samtaler</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Ugyldig konto</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Idag</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Igår</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>To uker siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Tre uker siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>En uke siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>En måned siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>To måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Tre måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Fire måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Fem måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Seks måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Syv måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Åtte måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Ni måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Ti måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Elleve måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Tolv måneder siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Et år siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Veldig lenge siden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Aldri</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Opptak</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Tekstmeldinger</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Lyd/Bilde</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Samling av likemannsprofiler</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Invitasjon mottatt</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Kontakt lagt til</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Invitasjon godtatt</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 Utgående anrop</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>📞 Innkommende anrop</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 Utgående anrop - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>📞 Innkommende anrop - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 Ubesvart utgående anrop</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 Tapt innkommende anrop</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>FIL</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Opptak</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Tekstmeldinger</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Lyd/bilde</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_nl_BE.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_nl_BE.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_nl_BE.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_nl_BE.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Oproepen</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Ongeldigen account</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Vandaag</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Gisteren</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Twee weken geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Drie weken geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Een week geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Een maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Twee maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Drie maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Vier maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Vijf maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Zes maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Zeven maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Acht maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Negen maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Tien maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Elf maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Twaalf maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Een jaar geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Zeer lang geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nooit</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Opnames</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Tekstberichten</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Peerprofielverzameling</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Uitnodiging ontvangen</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Contact toegevoegd</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Uitnodiging aanvaard</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 Uitgaanden oproep</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>📞 Inkomenden oproep</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 Uitgaanden oproep - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>📞 Inkomenden oproep - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 Gemisten uitgaanden oproep</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 Gemisten inkomenden oproep</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>BESTAND</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Opnames</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Tekstberichten</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_nl_NL.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_nl_NL.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_nl_NL.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_nl_NL.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_nl.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_nl.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_nl.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_nl.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Oproepen</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Ongeldige account</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Vandaag</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Gisteren</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Twee weken geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Drie weken geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Een week geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Een maand geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Twee maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Drie maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Vier maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Vijf maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Zes maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Zeven maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Acht maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Negen maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Tien maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Elf maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Twaalf maanden geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Een jaar geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Heel lang geleden</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nooit</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Opnamen</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Tekstberichten</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Peerprofielverzameling</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Uitnodiging ontvangen</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Contact toegevoegd</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Uitnodiging aanvaard</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>ð Uitgaande oproep</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>ð Inkomende oproep</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>ð Uitgaande oproep -</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>ð Inkomende oproep -</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>ð½ Gemiste uitgaande oproep</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>ð½ Gemiste inkomende oproep</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>BESTAND</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Opnamen</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Tekstberichten</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_pa.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_pa.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_pa.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_pa.ts	2018-08-16 15:09:56.000000000 +0000
@@ -116,121 +116,121 @@
 <context>
     <name>Call</name>
     <message>
-        <location filename="../src/call.cpp" line="713"/>
+        <location filename="../src/call.cpp" line="720"/>
         <source>New</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="716"/>
+        <location filename="../src/call.cpp" line="723"/>
         <source>Ringing</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="719"/>
+        <location filename="../src/call.cpp" line="726"/>
         <source>Calling</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="722"/>
+        <location filename="../src/call.cpp" line="729"/>
         <source>Talking</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="725"/>
+        <location filename="../src/call.cpp" line="732"/>
         <source>Dialing</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="728"/>
+        <location filename="../src/call.cpp" line="735"/>
         <source>Hold</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="731"/>
+        <location filename="../src/call.cpp" line="738"/>
         <source>Failed</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="734"/>
+        <location filename="../src/call.cpp" line="741"/>
         <source>Busy</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="737"/>
+        <location filename="../src/call.cpp" line="744"/>
         <source>Transfer</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="740"/>
+        <location filename="../src/call.cpp" line="747"/>
         <source>Transfer hold</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="743"/>
+        <location filename="../src/call.cpp" line="750"/>
         <source>Over</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="746"/>
+        <location filename="../src/call.cpp" line="753"/>
         <source>Error</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="749"/>
-        <location filename="../src/call.cpp" line="854"/>
+        <location filename="../src/call.cpp" line="756"/>
+        <location filename="../src/call.cpp" line="861"/>
         <source>Conference</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="752"/>
+        <location filename="../src/call.cpp" line="759"/>
         <source>Conference (hold)</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="755"/>
+        <location filename="../src/call.cpp" line="762"/>
         <source>ERROR</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="758"/>
+        <location filename="../src/call.cpp" line="765"/>
         <source>Searching for</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="761"/>
+        <location filename="../src/call.cpp" line="768"/>
         <source>Aborted</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="764"/>
+        <location filename="../src/call.cpp" line="771"/>
         <source>Communication established</source>
         <extracomment>Call state</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="858"/>
+        <location filename="../src/call.cpp" line="865"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="2209"/>
+        <location filename="../src/call.cpp" line="2243"/>
         <source>Account: </source>
         <translation type="unfinished"/>
     </message>
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -255,12 +255,12 @@
 <context>
     <name>CallPrivate</name>
     <message>
-        <location filename="../src/call.cpp" line="1760"/>
+        <location filename="../src/call.cpp" line="1794"/>
         <source>Aborted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/call.cpp" line="1781"/>
+        <location filename="../src/call.cpp" line="1815"/>
         <source>No account registered!</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="867"/>
-        <location filename="../src/conversationmodel.cpp" line="1174"/>
-        <location filename="../src/conversationmodel.cpp" line="1382"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="868"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="897"/>
-        <location filename="../src/conversationmodel.cpp" line="904"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1063"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1065"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1078"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1081"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1085"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1087"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_pl.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_pl.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_pl.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_pl.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Rozmowy</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Nieważne konto</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Dzisiaj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Wczoraj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Dwa tygodnie temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Trzy tygodnie temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Tydzień temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Miesiąc temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Dwa miesiące temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Trzy miesiące temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Cztery miesiące temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Pięć miesięcy temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Sześć miesięcy temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Siedem miesięcy temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Osiem miesięcy temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Dziewięć miesięcy temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Dziesięć miesięcy temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Jedenaście miesięcy temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Dwanaście miesięcy temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Rok temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Bardzo dawno temu</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nigdy</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Nagrania</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Wiadomości tekstowe</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Wideo</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Kolekcja profil peer</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>PLIK</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Nagrania</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Wiadomości tekstowe</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Wideo</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_pt_BR.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_pt_BR.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_pt_BR.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_pt_BR.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Chamadas</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Conta Inválida</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Ontem</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Duas semanas atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Três semanas atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Uma semana atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Um mês atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Dois meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Três meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Quatro meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Cinco meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Seis meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Sete meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Oito meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Nove meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Dez meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Onze meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Doze meses atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Uma ano atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Muito tempo atrás</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Gravações</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Mensagens de texto</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Áudio/Vídeo</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Coleção de Perfis de pares</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Convite recebido</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Contato adicionado</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Convite aceito</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 Chamada efetuada</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>📞 Chamada recebida</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 Chamada efetuada - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>📞 Chamada recebida - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 Chamada efetuada não atendida</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 Chamada recebida não atendida</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>ARQUIVO</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Gravações</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Mensagens de texto</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Áudio/Vídeo</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_pt.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_pt.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_pt.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_pt.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ro.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ro.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ro.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ro.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Apeluri</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ru_RU.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ru_RU.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ru_RU.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ru_RU.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Звонки</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Неверная учётная запись</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Вчера</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Две недели назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Три недели назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Неделя назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Месяц назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Два месяца назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Три месяца назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Четыре месяца назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Пять месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Шесть месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Семь месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Восемь месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Девять месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Десять месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Одиннадцать месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Двенадцать месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Год назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Давным давно</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Никогда</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Записи</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Текстовые сообщения</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Звук/Видео</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>ФАЙЛ</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Записи</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Текстовые сообщения</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Звук/Видео</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ru.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ru.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_ru.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_ru.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Звонки</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Недопустимый аккаунт</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Вчера</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Две недели назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Три недели назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Неделю назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Месяц назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Два месяца назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Три месяца назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Четыре месяца назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Пять месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Шесть месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Семь месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Восемь месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Девять месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Десять месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Одиннадцать месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Двенадцать месяцев назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Год назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Очень давно</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Никогда</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Записи</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Текстовые сообщения</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Аудио/Видео</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Коллекция профилей участников</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Получено приглашение</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Контакт добавлен</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Приглашение принято</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 Исходящий вызов</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>📞 Входящий вызов</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 Исходящий вызов - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>📞 Входящий вызов - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 Непринятый исходящий вызов</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 Пропущенный входящий вызов</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>ФАЙЛ</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Записи</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Текстовые сообщения</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Аудио/Видео</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_sk_SK.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_sk_SK.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_sk_SK.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_sk_SK.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Hovory</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Neplatný účet</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Dnes</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Včera</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Pred dvoma týždňami</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Pred troma týždňami</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Pred týždňom</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Pred mesiacom</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Pred dvoma mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Pred troma mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>pred štyrmi mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>pred piatimi mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Pred šiestimi mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Pred siedmimi mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Pred ôsmimi mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Pred deviatimi mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Pred desiatimi mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Pred jedenástimi mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Pred dvanástimi mesiacmi</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Pred rokom</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Veľmi, veľmi dávno</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nikdy</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Nahrávky</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Textové správy</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Nahrávky</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Textové správy</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_sl.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_sl.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_sl.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_sl.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Klici</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Neveljaven račun</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Včeraj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Pred dvema tednoma</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Pred tremi tedni</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Pred tednom</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Pred mesecem</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Pred dvema mesecema</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Pred tremi meseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Pred štirimi meseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Pred petimi meseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Pred šestimi meseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Pred sedmimi meseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Pred osmimi meseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Pred devetimi meseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Pred desetimi meseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Pred enajstimi meseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Pred dvanajstimi meseci</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Pred enim letom</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Zelo dolgo nazaj</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Nikoli</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Posnetki</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Besedilna sporočila</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Avdio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>DATOTEKA</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Posnetki</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Besedilna sporočila</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Avdio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_sq_AL.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_sq_AL.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_sq_AL.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_sq_AL.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Thirrje</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Llogari e pavlefshme</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Sot</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Dje</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Dy javë më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Tre javë më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Një javë më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Një muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Dy muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Tre muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Katër muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Pesë muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Gjashtë muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Shtatë muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Tetë muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Nëntë muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Dhjetë muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Njëmbëdhjetë muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Dymbëdhjetë muaj më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Një vit më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Shumë kohë më parë</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Kurrë</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Incizime</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Mesazhe tekst</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Koleksion Profilesh Personash</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Ftesa u mor</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Kontakti u shtua</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Ftesa u pranua</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>Thirrje ikëse ð</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>Tirrje ardhëse ð</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>Thirrje ikëse ð - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>Tirrje ardhëse ð - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>Thirrje ikëse të humbura 🕽</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>Thirrje ardhëse të humbura 🕽</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>KARTELË</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Incizime</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Mesazhe tekst</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_sv.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_sv.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_sv.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_sv.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Samtal</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Ogiltigt konto</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>I dag</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>I går</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Två veckor sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Tre veckor sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>En vecka sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>En månad sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>2 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>3 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>4 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>5 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>6 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>7 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>8 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>9 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>10 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>11 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>12 månader sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Ett år sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Mycket länge sedan</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Aldrig</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Inspelningar</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Textmeddelanden</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Ljud/Video</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Deltagarprofilsamling</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>Inbjudan mottagen</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>Kontakt tillagt</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>Inbjudan accepterad</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 Utgående samtal</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>📞 Inkommande samtal</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 Utgående samtal - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>📞 Inkommande samtal - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 Missat utgående samtal</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 Missat inkommande samtal</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>FIL</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Inspelningar</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Textmeddelanden</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Ljud/Video</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_tr.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_tr.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_tr.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_tr.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Aramalar</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Geçersiz hesap</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Bugün</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Dün</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>İki hafta önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Üç hafta önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Bir hafta önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Bir ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>İki ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Üç ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Dört ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>Beş ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Altı ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Yedi ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Sekiz ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Dokuz ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>On ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>On bir ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>On iki ay önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Bir yıl önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Çok uzun zaman önce</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Asla</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Kayıtlar</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Metin iletileri</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Ses/Görüntü</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>Eş Profil Koleksiyonları</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>DOSYA</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Kayıtlar</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Metin iletileri</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Ses/Görüntü</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_uk.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_uk.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_uk.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_uk.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>Дзвінки</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>Неправильний обліковий запис</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>Сьогодні</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>Вчора</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>Два тижні тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>Три тіжні тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>Тиждень тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>Місяць тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>Два місяця тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>Три місяця тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>Чотири місяця тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>П’ять місяців тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>Шість місяців тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>Сім місяців тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>Вісім місяців тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>Дев’ять місяців тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>Десять місяців тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>Одинадцять місяців тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>Дванадцять місяців тому</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>Рік назад</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>Вже дуже давно</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>Ніколи</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>Записи</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>Текстові повідомлення</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>Аудіо/Відео</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>ФАЙЛ</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>Записи</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>Текстові повідомлення</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>Аудіо/Відео</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_zh_CN.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_zh_CN.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_zh_CN.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_zh_CN.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>呼叫</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>非法帐户</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>今天</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>昨天</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>两周前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>三周前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>一周前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>一个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>两个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>三个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>四个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>五个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>六个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>七个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>八个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>九个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>十个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>十一个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>十二个月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>一年前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>很久以前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>从不</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>录音</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>文字消息</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>音频/视频</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>节点资料集</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>文件</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>录音</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>文字消息</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>音频/视频</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_zh.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_zh.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_zh.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_zh.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation type="unfinished"/>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation type="unfinished"/>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation type="unfinished"/>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>音訊/視訊</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,4 +1495,22 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>音訊/視訊</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_zh_TW.ts ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_zh_TW.ts
--- ring-20180712.2.f3b87a6~ds1/lrc/translations/lrc_zh_TW.ts	2018-07-12 21:48:42.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/lrc/translations/lrc_zh_TW.ts	2018-08-16 15:09:56.000000000 +0000
@@ -238,7 +238,7 @@
 <context>
     <name>CallModel</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="920"/>
+        <location filename="../src/callmodel.cpp" line="924"/>
         <source>Calls</source>
         <translation>通話</translation>
     </message>
@@ -246,8 +246,8 @@
 <context>
     <name>CallModelPrivate</name>
     <message>
-        <location filename="../src/callmodel.cpp" line="555"/>
-        <location filename="../src/callmodel.cpp" line="580"/>
+        <location filename="../src/callmodel.cpp" line="559"/>
+        <location filename="../src/callmodel.cpp" line="584"/>
         <source>Invalid account</source>
         <translation>無效的帳號</translation>
     </message>
@@ -391,102 +391,102 @@
 <context>
     <name>HistoryTimeCategoryModel</name>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="40"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
         <source>Today</source>
         <translation>今天</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="41"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
         <source>Yesterday</source>
         <translation>昨天</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="48"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
         <source>Two weeks ago</source>
         <translation>兩週前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="49"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
         <source>Three weeks ago</source>
         <translation>三週前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="47"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
         <source>A week ago</source>
         <translation>一週前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="50"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
         <source>A month ago</source>
         <translation>一個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="51"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
         <source>Two months ago</source>
         <translation>兩個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="52"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
         <source>Three months ago</source>
         <translation>三個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="53"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
         <source>Four months ago</source>
         <translation>四個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="54"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
         <source>Five months ago</source>
         <translation>五個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="55"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="65"/>
         <source>Six months ago</source>
         <translation>六個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="56"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="66"/>
         <source>Seven months ago</source>
         <translation>七個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="57"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="67"/>
         <source>Eight months ago</source>
         <translation>八個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="58"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="68"/>
         <source>Nine months ago</source>
         <translation>九個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="59"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="69"/>
         <source>Ten months ago</source>
         <translation>十個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="60"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="70"/>
         <source>Eleven months ago</source>
         <translation>十一個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="61"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="71"/>
         <source>Twelve months ago</source>
         <translation>十二個月前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="62"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="72"/>
         <source>A year ago</source>
         <translation>一年前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="63"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="73"/>
         <source>Very long time ago</source>
         <translation>非常久以前</translation>
     </message>
     <message>
-        <location filename="../src/historytimecategorymodel.cpp" line="64"/>
+        <location filename="../src/historytimecategorymodel.cpp" line="74"/>
         <source>Never</source>
         <translation>永不</translation>
     </message>
@@ -526,24 +526,6 @@
     </message>
 </context>
 <context>
-    <name>Media::RecordingModel</name>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="189"/>
-        <source>Recordings</source>
-        <translation>記錄</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="259"/>
-        <source>Text messages</source>
-        <translation>文字訊息</translation>
-    </message>
-    <message>
-        <location filename="../src/media/recordingmodel.cpp" line="264"/>
-        <source>Audio/Video</source>
-        <translation>音訊／視訊</translation>
-    </message>
-</context>
-<context>
     <name>NumberCategoryModel</name>
     <message>
         <location filename="../src/numbercategorymodel.cpp" line="56"/>
@@ -1410,50 +1392,50 @@
         <translation>對方的基本資料收集</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1231"/>
-        <location filename="../src/conversationmodel.cpp" line="1596"/>
-        <location filename="../src/conversationmodel.cpp" line="1846"/>
+        <location filename="../src/conversationmodel.cpp" line="1237"/>
+        <location filename="../src/conversationmodel.cpp" line="1602"/>
+        <location filename="../src/conversationmodel.cpp" line="1854"/>
         <source>Invitation received</source>
         <translation>已收到邀請</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1232"/>
+        <location filename="../src/conversationmodel.cpp" line="1238"/>
         <source>Contact added</source>
         <translation>已新增聯絡人</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1267"/>
-        <location filename="../src/conversationmodel.cpp" line="1274"/>
+        <location filename="../src/conversationmodel.cpp" line="1273"/>
+        <location filename="../src/conversationmodel.cpp" line="1280"/>
         <source>Invitation accepted</source>
         <translation>已接受邀請</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1478"/>
+        <location filename="../src/conversationmodel.cpp" line="1484"/>
         <source>📞 Outgoing call</source>
         <translation>📞 撥出電話</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1480"/>
+        <location filename="../src/conversationmodel.cpp" line="1486"/>
         <source>📞 Incoming call</source>
         <translation>📞 來電</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1493"/>
+        <location filename="../src/conversationmodel.cpp" line="1499"/>
         <source>📞 Outgoing call - </source>
         <translation>📞 撥出電話 - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1496"/>
+        <location filename="../src/conversationmodel.cpp" line="1502"/>
         <source>📞 Incoming call - </source>
         <translation>📞 來電 - </translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1500"/>
+        <location filename="../src/conversationmodel.cpp" line="1506"/>
         <source>🕽 Missed outgoing call</source>
         <translation>🕽 未接去電</translation>
     </message>
     <message>
-        <location filename="../src/conversationmodel.cpp" line="1502"/>
+        <location filename="../src/conversationmodel.cpp" line="1508"/>
         <source>🕽 Missed incoming call</source>
         <translation>🕽 未接來電</translation>
     </message>
@@ -1513,4 +1495,22 @@
         <translation>檔案</translation>
     </message>
 </context>
+<context>
+    <name>media::RecordingModel</name>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="189"/>
+        <source>Recordings</source>
+        <translation>記錄</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="259"/>
+        <source>Text messages</source>
+        <translation>文字訊息</translation>
+    </message>
+    <message>
+        <location filename="../src/media/recordingmodel.cpp" line="264"/>
+        <source>Audio/Video</source>
+        <translation>音訊／視訊</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file
diff -Nru ring-20180712.2.f3b87a6~ds1/Makefile.packaging ring-20180816.2.e26b79f~ds1/Makefile.packaging
--- ring-20180712.2.f3b87a6~ds1/Makefile.packaging	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/Makefile.packaging	2018-08-16 15:09:36.000000000 +0000
@@ -1,5 +1,5 @@
 # -*- mode: makefile; -*-
-# Copyright (C) 2016-2017 Savoir-faire Linux Inc.
+# Copyright (C) 2016-2018 Savoir-faire Linux Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff -Nru ring-20180712.2.f3b87a6~ds1/make-ring.py ring-20180816.2.e26b79f~ds1/make-ring.py
--- ring-20180712.2.f3b87a6~ds1/make-ring.py	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/make-ring.py	2018-08-16 15:09:36.000000000 +0000
@@ -15,25 +15,27 @@
 import multiprocessing
 import shutil
 
-IOS_DISTRIBUTION_NAME="iOS"
-OSX_DISTRIBUTION_NAME="OSX"
-ANDROID_DISTRIBUTION_NAME="Android"
+IOS_DISTRIBUTION_NAME="ios"
+OSX_DISTRIBUTION_NAME="osx"
+ANDROID_DISTRIBUTION_NAME="android"
 
 APT_BASED_DISTROS = [
-    'Debian',
-    'Ubuntu',
+    'debian',
+    'ubuntu',
+    'linuxmint',
+    'raspbian',
 ]
 
 DNF_BASED_DISTROS = [
-    'Fedora',
+    'fedora',
 ]
 
 PACMAN_BASED_DISTROS = [
-    'Arch Linux',
+    'arch',
 ]
 
 ZYPPER_BASED_DISTROS = [
-    'openSUSE',
+    'opensuse',
 ]
 
 APT_INSTALL_SCRIPT = [
@@ -71,10 +73,10 @@
     'autoconf', 'autoconf-archive', 'automake', 'cmake', 'patch', 'gcc-c++', 'libtool',
 # daemon
     'speexdsp-devel', 'speex-devel', 'libdbus-c++-devel', 'jsoncpp-devel', 'yaml-cpp-devel',
-    'libupnp-devel', 'boost-devel', 'yasm', 'libuuid-devel', 'libsamplerate-devel',
-    'libnettle-devel', 'libopus-devel', 'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel',
-    'libavdevice-devel', 'pcre-devel', 'libogg-devel', 'libsndfile-devel', 'libvorbis-devel',
-    'flac-devel', 'libgsm-devel', 'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-devel',
+    'libupnp-devel', 'boost-devel', 'yasm', 'libuuid-devel', 'libnettle-devel',
+    'libopus-devel', 'libgnutls-devel', 'msgpack-devel', 'libavcodec-devel',
+    'libavdevice-devel', 'pcre-devel', 'libogg-devel', 'libvorbis-devel', 'flac-devel',
+    'libgsm-devel', 'alsa-devel', 'libpulse-devel', 'libudev-devel', 'libva-devel',
     'libvdpau-devel', 'libopenssl-devel',
 # lrc
     'libQt5Core-devel', 'libQt5DBus-devel', 'libqt5-linguist-devel',
@@ -102,9 +104,9 @@
 
 DNF_DEPENDENCIES = [
     'autoconf', 'autoconf-archive', 'automake', 'cmake', 'speexdsp-devel', 'pulseaudio-libs-devel',
-    'libsamplerate-devel', 'libtool', 'dbus-devel', 'expat-devel', 'pcre-devel',
+    'libtool', 'dbus-devel', 'expat-devel', 'pcre-devel',
     'yaml-cpp-devel', 'boost-devel', 'dbus-c++-devel', 'dbus-devel',
-    'libsndfile-devel', 'libXext-devel', 'libXfixes-devel', 'yasm',
+    'libXext-devel', 'libXfixes-devel', 'yasm',
     'speex-devel', 'chrpath', 'check', 'astyle', 'uuid-c++-devel', 'gettext-devel',
     'gcc-c++', 'which', 'alsa-lib-devel', 'systemd-devel', 'libuuid-devel',
     'uuid-devel', 'gnutls-devel', 'nettle-devel', 'opus-devel', 'speexdsp-devel',
@@ -115,15 +117,15 @@
 ]
 
 APT_DEPENDENCIES = [
-    'autoconf', 'autoconf-archive', 'autopoint', 'cmake', 'dbus', 'doxygen', 'g++', 'gettext',
-    'gnome-icon-theme-symbolic', 'libasound2-dev', 'libavcodec-dev',
+    'autoconf', 'autoconf-archive', 'autopoint', 'automake', 'cmake', 'dbus', 'doxygen', 'g++',
+    'gettext', 'gnome-icon-theme-symbolic', 'libasound2-dev', 'libavcodec-dev',
     'libavdevice-dev', 'libavformat-dev', 'libboost-dev',
     'libclutter-gtk-1.0-dev', 'libcppunit-dev', 'libdbus-1-dev',
     'libdbus-c++-dev', 'libebook1.2-dev', 'libexpat1-dev', 'libgnutls28-dev',
     'libgsm1-dev', 'libgtk-3-dev', 'libjack-dev', 'libnotify-dev',
-    'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libsamplerate0-dev', 'libssl-dev',
-    'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
-    'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
+    'libopus-dev', 'libpcre3-dev', 'libpulse-dev', 'libssl-dev',
+    'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
+    'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'libqt5sql5-sqlite', 'sip-tester', 'swig',
     'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
     'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-dev', 'libvdpau-dev', 'libmsgpack-dev', 'libcanberra-gtk3-dev'
 ]
@@ -131,8 +133,8 @@
 PACMAN_DEPENDENCIES = [
     'autoconf', 'autoconf-archive', 'gettext', 'cmake', 'dbus', 'doxygen', 'gcc', 'gnome-icon-theme-symbolic',
     'ffmpeg', 'boost', 'clutter-gtk', 'cppunit', 'libdbus', 'dbus-c++', 'libe-book',
-    'expat', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse', 'libsamplerate',
-    'libsndfile', 'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base',
+    'expat', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse',
+    'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base',
     'swig', 'yasm', 'qrencode', 'evolution-data-server', 'make', 'patch', 'pkg-config',
     'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanbera', 'openssl'
 ]
@@ -216,7 +218,8 @@
         )
         execute_script(
             BREW_INSTALL_SCRIPT,
-            {"packages": ' '.join(OSX_DEPENDENCIES)}
+            {"packages": ' '.join(OSX_DEPENDENCIES)},
+            False
         )
 
     elif args.distribution == IOS_DISTRIBUTION_NAME:
@@ -227,7 +230,8 @@
         )
         execute_script(
             BREW_INSTALL_SCRIPT,
-            {"packages": ' '.join(IOS_DEPENDENCIES)}
+            {"packages": ' '.join(IOS_DEPENDENCIES)},
+            False
         )
 
     elif args.distribution == ANDROID_DISTRIBUTION_NAME:
@@ -416,7 +420,7 @@
         '--stop', action='store_true',
         help='Stop the Ring processes')
 
-    ap.add_argument('--distribution', default='Automatic')
+    ap.add_argument('--distribution')
     ap.add_argument('--static', default=False, action='store_true')
     ap.add_argument('--global-install', default=False, action='store_true')
     ap.add_argument('--debug', default=False, action='store_true')
@@ -424,11 +428,13 @@
 
     parsed_args = ap.parse_args()
 
-    if parsed_args.distribution == 'Automatic':
+    if (parsed_args.distribution is not None):
+        parsed_args.distribution = parsed_args.distribution.lower()
+    else:
         parsed_args.distribution = choose_distribution()
 
     if parsed_args.distribution in ['mingw32', 'mingw64']:
-        if choose_distribution() != "Fedora":
+        if choose_distribution() != "fedora":
             print('Windows version must be built on a Fedora distribution (>=23)')
             sys.exit(1)
 
@@ -440,11 +446,11 @@
     system = platform.system().lower()
     if system == "linux" or system == "linux2":
         if os.path.isfile("/etc/arch-release"):
-            return "Arch Linux"
+            return "arch"
         with open("/etc/os-release") as f:
             for line in f:
                 k,v = line.split("=")
-                if k.strip() == 'NAME':
+                if k.strip() == 'ID':
                     return v.strip().replace('"','').split(' ')[0]
     elif system == "darwin":
         return OSX_DISTRIBUTION_NAME
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/control ring-20180816.2.e26b79f~ds1/packaging/rules/debian/control
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/control	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/control	2018-08-16 15:09:36.000000000 +0000
@@ -1,6 +1,6 @@
 Source: ring
 Section: comm
-Priority: extra
+Priority: optional
 Maintainer: Alexandre Viau <aviau@debian.org>
 Build-Depends: debhelper (>= 9),
                autoconf,
@@ -34,7 +34,6 @@
                libpcre3-dev,
                libyaml-cpp-dev,
                libboost-dev,
-               libsndfile1-dev,
                libxext-dev,
                libxfixes-dev,
                libspeex-dev,
@@ -55,11 +54,29 @@
                libvdpau-dev,
 # other
                yasm,
-               libsamplerate0-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.1.5
 Homepage: https://ring.cx
-Vcs-Git: https://anonscm.debian.org/git/pkg-voip/ring.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/ring.git
+Vcs-Git: https://git.ring.cx/savoirfairelinux/ring-project.git
+Vcs-Browser: https://git.ring.cx/savoirfairelinux/ring-project
+
+Package: ring-all
+Architecture: any
+Depends: libqt5sql5-sqlite,
+         gnupg,
+         ${shlibs:Depends},
+         ${misc:Depends}
+Replaces: ring,
+          ring-gnome,
+          ring-daemon
+Conflicts: ring,
+           ring-gnome,
+           ring-daemon
+Description: Secure and distributed voice, video and chat platform - all in one package
+ Ring (ring.cx) is a secure and distributed voice, video and chat communication
+ platform that requires no centralized server and leaves the power of privacy
+ in the hands of the user.
+ .
+ This package contains the GNOME desktop client and dring, the Ring daemon.
 
 Package: ring
 Architecture: any
@@ -85,11 +102,3 @@
  in the hands of the user.
  .
  This package contains the Ring daemon: dring.
-
-Package: ring-gnome
-Depends: ring, ${misc:Depends}
-Architecture: all
-Priority: extra
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/copyright ring-20180816.2.e26b79f~ds1/packaging/rules/debian/copyright
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/copyright	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/copyright	2018-08-16 15:09:36.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ring
 Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net>
 Source: https://dl.ring.cx/ring-release/tarballs/
@@ -11,7 +11,7 @@
                 client-gnome/libqrencode/*
 
 Files: *
-Copyright: 2004-2017 Savoir-faire Linux Inc.
+Copyright: 2004-2018 Savoir-faire Linux Inc.
            1999 Tom Tromey
            1994-2009 Red Hat, Inc.
            2010 Michael Kerrisk
@@ -66,7 +66,7 @@
        daemon/src/media/audio/opensl/audio_recorder.h
        daemon/src/media/audio/opensl/buf_manager.h
 Copyright: 2015 The Android Open Source Project
-           2015-2017 Savoir-faire Linux Inc.
+           2015-2018 Savoir-faire Linux Inc.
 License: Apache-2.0
 
 Files: daemon/extras/tools/bootstrap
@@ -107,13 +107,25 @@
 ##################
 
 Files: lrc/*
-Copyright: 2009-2017 by Savoir-faire Linux
+Copyright: 2009-2018 by Savoir-faire Linux
 License: LGPL-2.1+
 
 ################
 ## End of lrc ##
 ################
 
+###########################
+## Start of gnome client ##
+###########################
+
+Files: client-gnome/web/linkify*
+Copyright: 2016 SoapBox Innovations Inc.
+License: Expat
+
+#########################
+## End of gnome client ##
+#########################
+
 ######################
 ## Start of msgpack ##
 ######################
@@ -168,7 +180,7 @@
 ######################
 
 Files: daemon/contrib/tarballs-unpacked/opendht*/opendht*/include/opendht/securedht.h
-Copyright: 2014-2017 Savoir-faire Linux Inc.
+Copyright: 2014-2018 Savoir-faire Linux Inc.
 License: GPL-3-with-openssl-exception
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -198,7 +210,7 @@
 Files: daemon/contrib/tarballs-unpacked/opendht-*/opendht-*/include/opendht/dht.h
        daemon/contrib/tarballs-unpacked/opendht-*/opendht-*/src/dht.cpp
 Copyright: 2009-2014 Juliusz Chroboczek
-           2014-2017 Savoir-faire Linux Inc
+           2014-2018 Savoir-faire Linux Inc
 License: Expat
 
 Files: daemon/contrib/tarballs-unpacked/opendht-*/opendht-*/m4/ax_cxx_compile_stdcxx.m4
@@ -219,6 +231,10 @@
            2015 Thomas Pornin
 License: CC0
 
+Files: daemon/src/ringdht/eth/*
+Copyright: Ethereum Contributors
+License: GPL-3+
+
 License: CC0
  /Statement of Purpose/
  .
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/gbp.conf ring-20180816.2.e26b79f~ds1/packaging/rules/debian/gbp.conf
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/gbp.conf	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[DEFAULT]
-pristine-tar = True
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/patches/check-for-gsm.patch ring-20180816.2.e26b79f~ds1/packaging/rules/debian/patches/check-for-gsm.patch
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/patches/check-for-gsm.patch	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/patches/check-for-gsm.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-Description: Assume gsm is installed to avoid internet access
-Origin: vendor
-Author: Alexandre Viau <aviau@debian.org>
-Reviewed-by: Alexandre Viau <aviau@debian.org>
-Last-Update: 2016-04-22
-
---- a/daemon/contrib/src/gsm/rules.mak
-+++ b/daemon/contrib/src/gsm/rules.mak
-@@ -4,6 +4,8 @@
- 
- PKGS += gsm
- 
-+PKGS_FOUND += gsm
-+
- $(TARBALLS)/libgsm_$(GSM_VERSION).tar.gz:
- 	$(call download,$(GSM_URL))
- 
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/patches/series ring-20180816.2.e26b79f~ds1/packaging/rules/debian/patches/series
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/patches/series	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-check-for-gsm.patch
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/README.Debian ring-20180816.2.e26b79f~ds1/packaging/rules/debian/README.Debian
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/README.Debian	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/README.Debian	2018-08-16 15:09:36.000000000 +0000
@@ -1,3 +1,31 @@
+# Differences and compatibility with official debian.org package
+
+This source package provides binary packages ring, ring-all and ring-daemon.
+It differs slightly from the official Debian package (the one from debian.org).
+
+ring & ring-daemon: structurally identical to the Debian package, the only
+ difference potentially being the shipped version of Ring (the debian.org
+ package from stable is usually older).
+
+ring-all: all-in-one package, ships both the Ring Daemon and the GNOME client.
+ This package is not available in the debian.org repositories (not needed in the
+ Debian case).
+
+ ring-all allows
+ - easy installation of Ring as a single package from ring.cx
+ - installation of release keys and ring.cx package repository as trusted peers
+   so Ring can be updated from ring.cx along with system updates
+
+ two packages ring and ring-daemon vs. single all package ?
+ -> One cannot register a repository in source.list.d and directly use it to
+    fetch the dependencies. That would require something like an apt update in
+    the maintscripts and we don't want that. So, it is not possible to have a
+    one-click-install with two packages. That's why we build ring-all for
+    one-click install.
+
+ ring-all conflicts with ring and ring-daemon since they are distributing the
+ same files.
+
 # Notes
 
 ## Importing a new version
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/ring-all.lintian-overrides ring-20180816.2.e26b79f~ds1/packaging/rules/debian/ring-all.lintian-overrides
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/ring-all.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/ring-all.lintian-overrides	2018-08-16 15:09:36.000000000 +0000
@@ -0,0 +1,3 @@
+# We are shipping a .so, but this isn't a library package
+package-name-doesnt-match-sonames
+no-symbols-control-file
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/ring-all.manpages ring-20180816.2.e26b79f~ds1/packaging/rules/debian/ring-all.manpages
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/ring-all.manpages	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/ring-all.manpages	2018-08-16 15:09:36.000000000 +0000
@@ -0,0 +1,2 @@
+client-gnome/doc/gnome-ring.1
+daemon/dring.1
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/ring-all.postinst ring-20180816.2.e26b79f~ds1/packaging/rules/debian/ring-all.postinst
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/ring-all.postinst	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/ring-all.postinst	2018-08-16 15:09:56.000000000 +0000
@@ -0,0 +1,173 @@
+#!/bin/sh
+set -e
+
+###############################################################################
+# RING PACKAGE POSTINST                                                       #
+#                                                                             #
+# Install Ring's package repository to the trusted sources and add Ring's     #
+# release key to trusted keyring.                                             #
+#                                                                             #
+# NOTE: We follow https://wiki.debian.org/DebianRepository/UseThirdParty      #
+###############################################################################
+
+
+###############################################################################
+# [1] Configuration                                                           #
+###############################################################################
+
+# All package repo urls are expected to start with this string, regardless
+# of the distribution or version. The end tag is automatically appended,
+# depending on the system the postinst script is run on. Examples:
+#
+# Ubuntu 18.04:
+# $RING_REPO = $RING_REPO_BASE/ubuntu_18.04/
+#
+# Debian 9:
+# $RING_REPO = $RING_REPO_BASE/debian_9
+#
+# To update the appended end tags, modify the switch in [2].
+RING_REPO_BASE="https://dl.ring.cx/ring-nightly"
+
+# Ring release key.
+RING_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
+RING_KEY="\
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQENBFVSdlcBCAC9zC1rp12O2K08PGozI14Y+t4qC931eHicvkuEMF1B9gAhjdRF
+aIJS+UXwgQzoamDIHenxz1Q3fXUjKCMXytjGymB/0LUKccSbtH0Rcsl8kZ2z57KN
+E+GLS7SvlP93ZOxco7eAEBWF/fvMrCsm10sNI6bW7UK0bgql9iIetd6Wrp9xXFVs
+gmoV8Av714OlswsthSNtN+xQls3ozQ/dVGsOkZEyDbBzi88/rQEtuIDztTSWyD0V
+x7WaY5+mVRwsJKzyPlgvsXpbP7A41IFykeOzPKh+vYz3k7dcLIRdOwse79oT2RXt
+2VYEyTyTZIQlCJjGNTJYsU7GVffU4LnI7p/bABEBAAG0QFJpbmcgLSBTYXZvaXIt
+RmFpcmUgTGludXgsIEluYyA8cmluZ0BsaXN0cy5zYXZvaXJmYWlyZWxpbnV4Lm5l
+dD6JATkEEwEIACMFAlVSdlcCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRBkzV+hdTSPhMqSB/9aaKXVByoE7zwPM8DDSntS/jYhhaV1CcZ78WeC1LY2UnHL
+R/yvABnDMikgqbMHBDu1R9dnjgZNntp7p0blxcT6ScxdZ6FpMZG6ZW5YNZIVctnF
+jdExStcdpcbbycW8GeCmQdVcKLBl8G55mick02ayVNOH5ETtWahPwBvMWk5hSaH3
+E18yvnmdqa9nCEST4UKvBOpmn58mwJDIR2YLdEFcL8z4FkxQUNkx/hiHSn+YLorZ
+H3iBrf9y9vSYhQ5pxx7seWkoaGAQBgfktRCUKvVY6E1oSZ/WR1WsR1ftDO/RD0E8
+APKzibVynUEQrCcQX16uDOa/YgavVkts9HmR7Vf7iQEcBBABCAAGBQJVUoJZAAoJ
+EFZ3uE+o8K8j0RkH/2sv4L3X0hPIwAzf3CUJZQuHihUOPRAoru5RqW/5nWqsroa1
+WChJq79uDEecDAizTA1MvaTFmLxTjCkJso+5UHMSHi6LARvYXSOeBPFizEJT4qZZ
+CXti5zh9d5z1u6L986mrnArA39IZ2F+9wV2q0VIDnq1Tt6+cJ745zSeZmbM6jip4
+oEBsKbCkAhq78sqCc7DIilsGbd2tgrLsh3fitvamEJCTCYKdDMog3TP0+EekQTA2
+Qp4jG0Uf7Gg1YvDDcsawXyNDrMBXEFPVhBNnRisX+YQBRWgDE58+fpsQfeTkblL5
+UaLWhDGlyfAc1ebL3InzhUWJswjt0BN3GPoP55m5AQ0EVVJ2VwEIAMXhg0w1IM0C
+rGXMGayaJ3EWd9YXkqq0sAN7b75tD0cOimyPNafnzChG9//3tt82aPRm8fG5Lk5U
+fwCS2MSt2Ml8UZeujmEBnvU9hsJBWcGgzXhtBQwZqzmV2vQg8436nTFY5L24TFBc
+QNOUJNzSy/dqps0SxcYleE57o24KHlW6ICBaEhz0JoZHv5+7GtYz6XN2D7pkwTPY
+UIahyt4dY3geFrkuMzZdTS4qyFb8EE/Ypi/WgewO9ib53kt7FBrxmm0l+d9GR4jH
+CKGqaYjm8xzTsNa3m2C0Cf/C13bOaQVicgntfQ32IjjZdaDMlRLQluYNQ0ETA1FE
+9+EVvrQYZ+kAEQEAAYkBHwQYAQgACQUCVVJ2VwIbDAAKCRBkzV+hdTSPhMIaB/9D
+CrIZBDy7YOK3gdnNm57jemJRz6Cum7RTUiqCQ8ivSmEgv1KmMIqMpjmnKKP43iHO
+mR4i7XDml6RBGynPys6cQcAlBWSuhOv9PGpRCaGyjJ4vmQUsYhyD/+tCDZVdBuGg
+CxteSMbawxtMHESqX7dDlctc+njDjBcbcGj73sj36qoFIjorjymZlT5IdK39oXVM
+Hi1TssiWPOU0hQgn4BIreYnEZUA6xuFX10C7k2DVRFZrXF7lpNgPQ8eNZTnQBIuw
+HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
+4sRdAfS333T4Uifq4uOu
+=s2aQ
+-----END PGP PUBLIC KEY BLOCK-----"
+
+# System paths and generated variables
+# In general: you will not need to modify these variables.
+# WARNING: When modifying the paths, keep in mind that the corresponding
+# postrm paths should be modified as well
+APT_FILE="/etc/apt/sources.list.d/ring-main.sources"
+APT_PREFS_FILE="/etc/apt/preferences.d/ring-main.pref"
+UPDATE_MANAGER_PATH="/etc/update-manager/release-upgrades.d/"
+RING_UPDATE_MANAGER_ID="ring-main"
+
+RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
+UPDATE_MANAGER_CFG_PATH="${UPDATE_MANAGER_PATH}/${RING_UPDATE_MANAGER_CFG}"
+
+
+###############################################################################
+# [2] Set package repo url depending on distribution and version              #
+###############################################################################
+
+CAN_ADD_DEB_SOURCE=true
+
+# Detect currently running system using /etc/os-release
+# Debian-based systems are supposed to provide /etc/os-release so if it's not
+# the case then we simply don't want to provide automatic updates
+if [ -f /etc/os-release ]; then
+    . /etc/os-release
+
+    # Set-up Ring repository end tag
+    if [ "${DEBIAN_CODENAME}" = "stretch" ] || [ "${ID}_${VERSION_ID}" = "debian_9" ]; then
+        ENDTAG="debian_9"
+    elif [ "${UBUNTU_CODENAME}" = "xenial" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_16.04" ]; then
+        ENDTAG="ubuntu_16.04"
+    elif [ "${UBUNTU_CODENAME}" = "bionic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_18.04" ]; then
+        ENDTAG="ubuntu_18.04"
+    else
+        # Distribution is not supported. Don't provide automatic updates.
+        CAN_ADD_DEB_SOURCE=false
+    fi
+else
+    CAN_ADD_DEB_SOURCE=false
+fi
+
+
+###############################################################################
+# [3] Maintainer script main switch                                           #
+###############################################################################
+
+case "$1" in
+    configure)
+        if [ "`command -v apt-key`" = "" ]; then
+            # we can only add key if apt-key is present
+            CAN_ADD_DEB_SOURCE=false
+        fi
+
+        if [ "${CAN_ADD_DEB_SOURCE}" = "true" ]; then
+            RING_REPO="${RING_REPO_BASE}/${ENDTAG}"
+
+            # We first add the key to the trusted keyring.
+            apt-key add - > /dev/null 2>&1 << EOF
+$RING_KEY
+EOF
+
+            # Add an entry for the package repository to the trusted package
+            # sources (DEB822 format)
+            cat > $APT_FILE <<EOF
+# This file makes sure that Ring is kept up-to-date
+# as part of regular system upgrades
+
+Types: deb
+URIs: $RING_REPO
+Suites: ring
+Architectures: i386 amd64
+Components: main
+Signed-By: $RING_KEY_FINGERPRINT
+EOF
+
+            # It is recommended to also restrict the range of the newly added
+            # source.
+            cat > $APT_PREFS_FILE <<EOF
+# forbid upgrading already installed packages from official repositories but
+# allow upgrades to be performed for the ring repository
+Package: *
+Pin: origin dl.ring.cx
+Pin-Priority: 100
+EOF
+
+            # Additionally, if update manager is installed we inform it about
+            # the repository so it doesn't get scrapped after system updates
+            if [ -d /etc/update-manager -a ! -f $UPDATE_MANAGER_CFG_PATH ]
+            then
+                mkdir -p $UPDATE_MANAGER_PATH
+                cat > $UPDATE_MANAGER_CFG_PATH <<EOF
+# Added by Ring to prevent disabling of Ring repository sources on
+# distribution release upgrade.
+[ThirdPartyMirrors]
+ring/${RING_UPDATE_MANAGER_ID}=${RING_REPO}
+EOF
+            fi
+        fi
+        ;;
+esac
+
+# exit with a zero status as everything went well, important for maintscripts
+exit 0
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/ring-all.postrm ring-20180816.2.e26b79f~ds1/packaging/rules/debian/ring-all.postrm
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/ring-all.postrm	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/ring-all.postrm	2018-08-16 15:09:36.000000000 +0000
@@ -0,0 +1,43 @@
+#!/bin/sh
+set -e
+
+###############################################################################
+# RING PACKAGE POSTRM                                                         #
+#                                                                             #
+# If we installed our key and source to trusted stores, remove them.          #
+#                                                                             #
+# NOTE: We follow https://wiki.debian.org/DebianRepository/UseThirdParty      #
+###############################################################################
+
+
+###############################################################################
+# [1] Configuration                                                           #
+###############################################################################
+
+RING_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
+
+# System paths and generated variables
+APT_FILE="/etc/apt/sources.list.d/ring-main.sources"
+APT_PREFS_FILE="/etc/apt/preferences.d/ring-main.pref"
+UPDATE_MANAGER_PATH="/etc/update-manager/release-upgrades.d/"
+RING_UPDATE_MANAGER_ID="ring-main"
+
+RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
+UPDATE_MANAGER_CFG_PATH="${UPDATE_MANAGER_PATH}/${RING_UPDATE_MANAGER_CFG}"
+
+
+###############################################################################
+# [2] Maintainer script main switch                                           #
+###############################################################################
+
+case "$1" in
+    purge)
+        # Remove key from trusted keyring
+        command -v apt-key > /dev/null && apt-key del "$RING_KEY_FINGERPRINT"
+        rm -f "$APT_FILE"
+        rm -f "$APT_PREFS_FILE"
+        rm -f "$UPDATE_MANAGER_CFG_PATH"
+        ;;
+esac
+
+exit 0
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/ring-all.triggers ring-20180816.2.e26b79f~ds1/packaging/rules/debian/ring-all.triggers
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/ring-all.triggers	1970-01-01 00:00:00.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/ring-all.triggers	2018-08-16 15:09:36.000000000 +0000
@@ -0,0 +1 @@
+activate-noawait ldconfig
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/rules ring-20180816.2.e26b79f~ds1/packaging/rules/debian/rules
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/debian/rules	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/debian/rules	2018-08-16 15:09:36.000000000 +0000
@@ -12,6 +12,11 @@
 NO_CPUS=1
 endif
 
+# Binary package names
+RING_ALL_IN_ONE_PKG_NAME="ring-all"
+RING_CLIENT_PKG_NAME="ring"
+RING_DAEMON_PKG_NAME="ring-daemon"
+
 %:
 	dh $@
 
@@ -132,29 +137,53 @@
 
 override_dh_auto_install:
 	#########################
-	## Ring Daemon install ##
+	## Ring daemon install ##
 	#########################
-	cd daemon && make DESTDIR=$(CURDIR)/debian/ring-daemon install
-	rm -rfv $(CURDIR)/debian/ring-daemon/usr/include
-	rm -rfv $(CURDIR)/debian/ring-daemon/usr/lib/*.a
-	rm -rfv $(CURDIR)/debian/ring-daemon/usr/lib/*.la
 
-	###########################
-	## libringclient install ##
-	###########################
-	cd lrc/build && make DESTDIR=$(CURDIR)/debian/ring install
-	rm -rfv $(CURDIR)/debian/ring/usr/include
+	cd daemon && make DESTDIR=$(CURDIR)/debian/$(RING_DAEMON_PKG_NAME) install
+	rm -rfv $(CURDIR)/debian/$(RING_DAEMON_PKG_NAME)/usr/include
+	rm -rfv $(CURDIR)/debian/$(RING_DAEMON_PKG_NAME)/usr/lib/*.a
+	rm -rfv $(CURDIR)/debian/$(RING_DAEMON_PKG_NAME)/usr/lib/*.la
+
+	#########################
+	## Ring client install ##
+	#########################
+
+        ## LibRingClient
+	cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(RING_CLIENT_PKG_NAME) install
+	rm -rfv $(CURDIR)/debian/$(RING_CLIENT_PKG_NAME)/usr/include
+
+	# This is a symlink, should be in -dev package
+	rm -v $(CURDIR)/debian/$(RING_CLIENT_PKG_NAME)/usr/lib/libringclient.so
+
+	# cmake files
+	rm -rfv $(CURDIR)/debian/$(RING_CLIENT_PKG_NAME)/usr/lib/cmake
+
+        ## GNOME client
+	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_CLIENT_PKG_NAME) install
+
+	######################
+	## Ring AiO install ##
+	######################
+
+        ## daemon
+	cd daemon && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
+	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/include
+	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/*.a
+	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/*.la
+
+        ## LibRingClient
+	cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
+	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/include
 
 	# This is a symlink, should be in -dev package
-	rm -v $(CURDIR)/debian/ring/usr/lib/libringclient.so
+	rm -v $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/libringclient.so
 
 	# cmake files
-	rm -rfv $(CURDIR)/debian/ring/usr/lib/cmake
+	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/cmake
 
-	##########################
-	## gnome client install ##
-	##########################
-	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/ring install
+        ## GNOME client
+	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
 
 tmpdir:= $(shell mktemp -d)
 workdir:= $(shell pwd)
@@ -209,7 +238,7 @@
 	rm -rf ${tmpdir}/ring-project/daemon/contrib/tarballs
 
 	# Create the new tarball
-	cd  ${tmpdir} && tar -czf ${workdir}/ring_${version_to_download}~dfsg1.orig.tar.gz ring-project
+	cd ${tmpdir} && tar -czf ${workdir}/ring_${version_to_download}~dfsg1.orig.tar.gz ring-project
 
 	# Clear the temp dir
 	rm -rf ${tmpdir}
diff -Nru ring-20180712.2.f3b87a6~ds1/packaging/rules/fedora/ring.spec ring-20180816.2.e26b79f~ds1/packaging/rules/fedora/ring.spec
--- ring-20180712.2.f3b87a6~ds1/packaging/rules/fedora/ring.spec	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/packaging/rules/fedora/ring.spec	2018-08-16 15:09:36.000000000 +0000
@@ -19,7 +19,6 @@
 BuildRequires: cmake
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: libcanberra-devel
-BuildRequires: libsamplerate-devel
 BuildRequires: libtool
 BuildRequires: dbus-devel
 BuildRequires: expat-devel
@@ -28,7 +27,6 @@
 BuildRequires: boost-devel
 BuildRequires: dbus-c++-devel
 BuildRequires: dbus-devel
-BuildRequires: libsndfile-devel
 BuildRequires: libXext-devel
 BuildRequires: yasm
 BuildRequires: speex-devel
diff -Nru ring-20180712.2.f3b87a6~ds1/scripts/build-package-debian.sh ring-20180816.2.e26b79f~ds1/scripts/build-package-debian.sh
--- ring-20180712.2.f3b87a6~ds1/scripts/build-package-debian.sh	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/scripts/build-package-debian.sh	2018-08-16 15:09:36.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2016 Savoir-faire Linux Inc.
+# Copyright (C) 2016-2018 Savoir-faire Linux Inc.
 #
 # Author: Alexandre Viau <alexandre.viau@savoirfairelinux.com>
 #
@@ -41,17 +41,12 @@
 mk-build-deps --remove --install debian/control -t "apt-get -y --no-install-recommends"
 
 # create changelog file
-dch --create --package ring --newversion ${DEBIAN_VERSION} "Automatic nightly release"
-dch --release --distribution "unstable" debian/changelog
+DEBEMAIL="The Ring project <ring@gnu.org>" dch --create --package ring --newversion ${DEBIAN_VERSION} "Automatic nightly release"
+DEBEMAIL="The Ring project <ring@gnu.org>" dch --release --distribution "unstable" debian/changelog
 
 # create orig tarball
-# mk-origtargz isn't in ubuntu_14.04
-if [ "${DISTRIBUTION}" = "ubuntu_14.04" ] || [ "${DISTRIBUTION}" = "ubuntu_14.04_i386" ]; then
-    mv ${RELEASE_TARBALL_FILENAME} ../ring_${DEBIAN_VERSION}.orig.tar.gz
-else
-    mk-origtargz ${RELEASE_TARBALL_FILENAME}
-    rm --verbose ${RELEASE_TARBALL_FILENAME}
-fi
+mk-origtargz ${RELEASE_TARBALL_FILENAME}
+rm --verbose ${RELEASE_TARBALL_FILENAME}
 
 GET_ORIG_SOURCE_OVERRIDE_USCAN_TARBALL=$(readlink -f ../ring_*.orig.tar.gz) debian/rules get-orig-source
 
diff -Nru ring-20180712.2.f3b87a6~ds1/scripts/make-packaging-target.py ring-20180816.2.e26b79f~ds1/scripts/make-packaging-target.py
--- ring-20180712.2.f3b87a6~ds1/scripts/make-packaging-target.py	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/scripts/make-packaging-target.py	2018-08-16 15:09:36.000000000 +0000
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Creates packaging targets for a distribution and architecture.
-# This helps reduce the lenght of the top Makefile.
+# This helps reduce the length of the top Makefile.
 #
 
 import argparse
diff -Nru ring-20180712.2.f3b87a6~ds1/scripts/ubuntu-15.10-android-install-all-devices.sh ring-20180816.2.e26b79f~ds1/scripts/ubuntu-15.10-android-install-all-devices.sh
--- ring-20180712.2.f3b87a6~ds1/scripts/ubuntu-15.10-android-install-all-devices.sh	2018-07-12 21:48:26.000000000 +0000
+++ ring-20180816.2.e26b79f~ds1/scripts/ubuntu-15.10-android-install-all-devices.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# Build the Android app and install it on all connected devices.
-set -e
-./ubuntu-15.10-dependencies.sh
-cd client-android
-./compile.sh
-# TODO use gradlew instead.
-# From: http://stackoverflow.com/questions/8610733/how-can-i-adb-install-an-apk-to-multiple-connected-devices
-adb devices | tail -n +2 | cut -sf 1 | xargs -i'{}' adb -s '{}' install ring-android/app/build/outputs/apk/app-debug.apk