l10n: automatic bump

Change-Id: If5ee011a0797dc4b45419c5bcc2e0882a0c6bffc
diff --git a/Ring/Ring/Resources/ace.lproj/Localizable.strings b/Ring/Ring/Resources/ace.lproj/Localizable.strings
index 9871fe9..a628a01 100644
--- a/Ring/Ring/Resources/ace.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ace.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "كود QR يڠ براوسيا";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "تيدق بوليه منچاريكن ڤڠاره حساب يڠ دبريكن.";
 "alerts.recordVideoMessage" = "ڤرچاي ڤمبلاجرن";
 "alerts.recordAudioMessage" = "سلاكو ڤرساتوان اودي";
-"alerts.uploadFile" = "ڤڠاجرن ڤڠاجرن";
-"alerts.uploadPhoto" = "ڤرلو مڠهادڤ ڤوتو اتاو فلم";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "مڠهادڤي \"خدمات موقعيت\" اونتوق ممبريكن \"جامي\" ممبنتو موقعيت.";
 "alerts.locationSharing" = "مڠمبيل موقعيت ساي";
 "alerts.alreadylocationSharing" = "ڤد ماس اين مڠمبيل ڤڠڬونا اين";
diff --git a/Ring/Ring/Resources/ar.lproj/Localizable.strings b/Ring/Ring/Resources/ar.lproj/Localizable.strings
index 5ffa569..261ab47 100644
--- a/Ring/Ring/Resources/ar.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "رمز QR غير صالح";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "لا يمكن الاتصال بمدير الحساب المقدم، يرجى التحقق من إثباتاتك";
 "alerts.recordVideoMessage" = "تسجيل رسالة فيديو";
 "alerts.recordAudioMessage" = "تسجيل رسالة صوتية";
-"alerts.uploadFile" = "تحميل الملف";
-"alerts.uploadPhoto" = "تحميل الصورة أو الفيلم";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "أفتح \"خدمات الموقع\" للسماح \"جامي\" بتحديد موقعك.";
 "alerts.locationSharing" = "شارك موقعي";
 "alerts.alreadylocationSharing" = "مشاركة الموقع مع هذا المستخدم";
diff --git a/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings b/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
index 089965e..b67780c 100644
--- a/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar_EG.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "رمز QR غير صالح";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "لا يمكن الاتصال بمدير الحساب المقدم، يرجى التحقق من إثباتاتك";
 "alerts.recordVideoMessage" = "تسجيل رسالة فيديو";
 "alerts.recordAudioMessage" = "تسجيل رسالة صوتية";
-"alerts.uploadFile" = "تحميل الملف";
-"alerts.uploadPhoto" = "تحميل الصورة أو الفيلم";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "أفتح \"خدمات الموقع\" للسماح \"جامي\" بتحديد موقعك.";
 "alerts.locationSharing" = "شارك موقعي";
 "alerts.alreadylocationSharing" = "مشاركة الموقع مع هذا المستخدم";
diff --git a/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings b/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
index 3b1ba18..8b12d63 100644
--- a/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ast_ES.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Un codiciu QR malo";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Nun se puede conectar al administrador de cuenta proporcionáu.";
 "alerts.recordVideoMessage" = "Grabar un mensaxe de video";
 "alerts.recordAudioMessage" = "Grabar un mensaxe d'únicu audio";
-"alerts.uploadFile" = "Archiváu dende l' oxetivu";
-"alerts.uploadPhoto" = "Cargar foto o película";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Enviada \"Servicios de localización\" pa dexar a \"Jami\" determinar la so localización.";
 "alerts.locationSharing" = "Compartir la mio localización";
 "alerts.alreadylocationSharing" = "Al traviés de la páxina web, el nome del usuariu ye'l nome de la páxina web.";
diff --git a/Ring/Ring/Resources/az.lproj/Localizable.strings b/Ring/Ring/Resources/az.lproj/Localizable.strings
index b534a4f..f11e4e5 100644
--- a/Ring/Ring/Resources/az.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/az.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "سيخين QR کد";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "حساب مدیرینه باغلی اولمامیش. لطفاً اعتباراتینیزینی چک ائدیرین";
 "alerts.recordVideoMessage" = "ویدئو پیغام ثبت کنید";
 "alerts.recordAudioMessage" = "آدیو پيغامي ضبط ائدير";
-"alerts.uploadFile" = "فایل آپلود";
-"alerts.uploadPhoto" = "عکس یا فیلم آپلود";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "\"جامی\" یئرلشن مکانینی تعیین ائتمه یه \"ماکان خدمات\" نی فعال ات.";
 "alerts.locationSharing" = "مکانیمی بؤلوم";
 "alerts.alreadylocationSharing" = "بو ایستیفاده چیله یئرلشمه یه چالیشمیش";
diff --git a/Ring/Ring/Resources/az_IR.lproj/Localizable.strings b/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
index 93ece34..b0ce72e 100644
--- a/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/az_IR.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "سيخين QR کد";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "حساب مدیرینه باغلی اولمامیش. لطفاً اعتباراتینیزینی چک ائدیرین";
 "alerts.recordVideoMessage" = "ویدئو پیغام ثبت کنید";
 "alerts.recordAudioMessage" = "آدیو پيغامي ضبط ائدير";
-"alerts.uploadFile" = "فایل آپلود";
-"alerts.uploadPhoto" = "عکس یا فیلم آپلود";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "\"جامی\" یئرلشن مکانینی تعیین ائتمه یه \"ماکان خدمات\" نی فعال ات.";
 "alerts.locationSharing" = "مکانیمی بؤلوم";
 "alerts.alreadylocationSharing" = "بو ایستیفاده چیله یئرلشمه یه چالیشمیش";
diff --git a/Ring/Ring/Resources/be.lproj/Localizable.strings b/Ring/Ring/Resources/be.lproj/Localizable.strings
index 1168f2c..30ed2c8 100644
--- a/Ring/Ring/Resources/be.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/be.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Дрэнны QR-код";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Не можа падключыцца да прадстаўленага кіраўніка рахунку. Калі ласка, праверце свае даведкі.";
 "alerts.recordVideoMessage" = "Запіс відэапаведамлення";
 "alerts.recordAudioMessage" = "Запіс аўдыёпаведамлення";
-"alerts.uploadFile" = "Загрузка файла";
-"alerts.uploadPhoto" = "Загрузіць фота або фільм";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Уключыце \"Сэрвісы месцазнаходжання\", каб \"Джамі\" вызначыць ваша месцазнаходжанне.";
 "alerts.locationSharing" = "Падзяліцеся маім месцам";
 "alerts.alreadylocationSharing" = "Ужо дзяліцца месцазнаходжаннем з гэтым карыстальнікам";
diff --git a/Ring/Ring/Resources/be_BY.lproj/Localizable.strings b/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
index 1168f2c..30ed2c8 100644
--- a/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/be_BY.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Дрэнны QR-код";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Не можа падключыцца да прадстаўленага кіраўніка рахунку. Калі ласка, праверце свае даведкі.";
 "alerts.recordVideoMessage" = "Запіс відэапаведамлення";
 "alerts.recordAudioMessage" = "Запіс аўдыёпаведамлення";
-"alerts.uploadFile" = "Загрузка файла";
-"alerts.uploadPhoto" = "Загрузіць фота або фільм";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Уключыце \"Сэрвісы месцазнаходжання\", каб \"Джамі\" вызначыць ваша месцазнаходжанне.";
 "alerts.locationSharing" = "Падзяліцеся маім месцам";
 "alerts.alreadylocationSharing" = "Ужо дзяліцца месцазнаходжаннем з гэтым карыстальнікам";
diff --git a/Ring/Ring/Resources/bg.lproj/Localizable.strings b/Ring/Ring/Resources/bg.lproj/Localizable.strings
index a81f894..1512f2b 100644
--- a/Ring/Ring/Resources/bg.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Грешен QR-код";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Не мога да се свържа с предоставения мениджър на акаунта.";
 "alerts.recordVideoMessage" = "Записване на видео съобщение";
 "alerts.recordAudioMessage" = "Записване на гласово съобщение";
-"alerts.uploadFile" = "Закачване на файл";
-"alerts.uploadPhoto" = "Качване на снимка или филм";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Включете \"Услуги за местоположение\", за да позволите на \"Джами\" да определи местоположението ви.";
 "alerts.locationSharing" = "Споделете местоположението ми.";
 "alerts.alreadylocationSharing" = "Вече споделяме местоположението с този потребител";
diff --git a/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings b/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
index a81f894..1512f2b 100644
--- a/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg_BG.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Грешен QR-код";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Не мога да се свържа с предоставения мениджър на акаунта.";
 "alerts.recordVideoMessage" = "Записване на видео съобщение";
 "alerts.recordAudioMessage" = "Записване на гласово съобщение";
-"alerts.uploadFile" = "Закачване на файл";
-"alerts.uploadPhoto" = "Качване на снимка или филм";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Включете \"Услуги за местоположение\", за да позволите на \"Джами\" да определи местоположението ви.";
 "alerts.locationSharing" = "Споделете местоположението ми.";
 "alerts.alreadylocationSharing" = "Вече споделяме местоположението с този потребител";
diff --git a/Ring/Ring/Resources/bn.lproj/Localizable.strings b/Ring/Ring/Resources/bn.lproj/Localizable.strings
index 029fd52..073a701 100644
--- a/Ring/Ring/Resources/bn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bn.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "খারাপ QR কোড";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "প্রদত্ত অ্যাকাউন্ট ম্যানেজারের সাথে সংযোগ স্থাপন করতে পারছি না. দয়া করে আপনার শংসাপত্রগুলি পরীক্ষা করুন";
 "alerts.recordVideoMessage" = "ভিডিও বার্তা রেকর্ড করুন";
 "alerts.recordAudioMessage" = "একটি অডিও বার্তা রেকর্ড করুন";
-"alerts.uploadFile" = "ফাইল আপলোড";
-"alerts.uploadPhoto" = "ছবি বা সিনেমা আপলোড করুন";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "\"অবস্থান পরিষেবা\" চালু করুন যাতে \"জামি\" আপনার অবস্থান নির্ধারণ করতে পারে।";
 "alerts.locationSharing" = "আমার অবস্থান শেয়ার করুন";
 "alerts.alreadylocationSharing" = "ইতিমধ্যে এই ব্যবহারকারীর সাথে অবস্থান ভাগ";
diff --git a/Ring/Ring/Resources/ca.lproj/Localizable.strings b/Ring/Ring/Resources/ca.lproj/Localizable.strings
index a575eae..fa6f364 100644
--- a/Ring/Ring/Resources/ca.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ca.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Mal codi QR";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "No es pot connectar amb el gestor de compte proporcionat. Si us plau, comproveu les vostres credencials";
 "alerts.recordVideoMessage" = "Gravar un missatge de vídeo";
 "alerts.recordAudioMessage" = "Gravar un missatge d'àudio";
-"alerts.uploadFile" = "Carrega ficher";
-"alerts.uploadPhoto" = "Carrega foto o pel·lícula";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Activa \"Serviços de localització\" per permetre que \"Jami\" determineixi la seva ubicació.";
 "alerts.locationSharing" = "Comparteix la meva ubicació";
 "alerts.alreadylocationSharing" = "Ja comparteix ubicació amb aquest usuari";
diff --git a/Ring/Ring/Resources/cmn.lproj/Localizable.strings b/Ring/Ring/Resources/cmn.lproj/Localizable.strings
index d29e31a..1de5f47 100644
--- a/Ring/Ring/Resources/cmn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cmn.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "无法连接到提供的账户管理器。请检查您的凭据。";
 "alerts.recordVideoMessage" = "录制视频信息";
 "alerts.recordAudioMessage" = "录制语音信息";
-"alerts.uploadFile" = "上传文件";
-"alerts.uploadPhoto" = "上传照片或视频";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "打开”位置服务“以允许 Jami 确定您的位置。";
 "alerts.locationSharing" = "分享我的位置";
 "alerts.alreadylocationSharing" = "已与此用户分享位置";
diff --git a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
index c2979b2..ad18fa2 100644
--- a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Špatný kód QR";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Nelze se připojit k danému správci účtů. Prosím zkontrolujte své přihlašovací údaje.";
 "alerts.recordVideoMessage" = "Nahrát video zprávu";
 "alerts.recordAudioMessage" = "Nahrát zvukovou zprávu";
-"alerts.uploadFile" = "Nahrát soubor";
-"alerts.uploadPhoto" = "Nahrát fotografii nebo film";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Zapněte „Služby polohy“, aby Jami mohl určit vaši polohu.";
 "alerts.locationSharing" = "Sdílet mou polohu";
 "alerts.alreadylocationSharing" = "Poloha je již sdílena s tímto uživatelem.";
diff --git a/Ring/Ring/Resources/da.lproj/Localizable.strings b/Ring/Ring/Resources/da.lproj/Localizable.strings
index abe2eab..0aa9c9c 100644
--- a/Ring/Ring/Resources/da.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/da.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Ugyldigt QR-kode";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Kan ikke oprette forbindelse til den kontoansvarlige.";
 "alerts.recordVideoMessage" = "Optag en video meddelelse";
 "alerts.recordAudioMessage" = "Optag en audio samtale";
-"alerts.uploadFile" = "Upload fil";
-"alerts.uploadPhoto" = "Upload billede eller film";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Tænd \"Lokationstjenester\" for at lade \"Jami\" bestemme din placering.";
 "alerts.locationSharing" = "Del min lokation";
 "alerts.alreadylocationSharing" = "Du deler allerede din lokation med denne bruger";
diff --git a/Ring/Ring/Resources/de.lproj/Localizable.strings b/Ring/Ring/Resources/de.lproj/Localizable.strings
index e59b75f..3dc48f2 100644
--- a/Ring/Ring/Resources/de.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Spenden";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "QR-Code ungültig";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Es kann keine Verbindung mit dem angegebenen Kontoverwalter hergestellt werden. Bitte prüfe deine Zugangsdaten.";
 "alerts.recordVideoMessage" = "Videonachricht aufzeichnen";
 "alerts.recordAudioMessage" = "Sprachmitteilung aufzeichnen";
-"alerts.uploadFile" = "Datei hochladen";
-"alerts.uploadPhoto" = "Foto oder Film hochladen";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Schalten Sie den \"Standort Service\" ein, damit \"Jami\" Ihren Standort bestimmen kann.\n";
 "alerts.locationSharing" = "Meinen Standort freigeben";
 "alerts.alreadylocationSharing" = "Teile bereits den Standort mit dem Benutzer";
diff --git a/Ring/Ring/Resources/el.lproj/Localizable.strings b/Ring/Ring/Resources/el.lproj/Localizable.strings
index 5813f97..7d8b0fd 100644
--- a/Ring/Ring/Resources/el.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/el.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Κακό QR κωδικό";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Δεν μπορώ να συνδεθώ με τον διευθυντή λογαριασμού. Παρακαλούμε ελέγξτε τα στοιχεία σας.";
 "alerts.recordVideoMessage" = "Καταγράψτε ένα μήνυμα βίντεο";
 "alerts.recordAudioMessage" = "Καταγράψτε ένα ήχο μήνυμα";
-"alerts.uploadFile" = "Εφορτώστε αρχείο";
-"alerts.uploadPhoto" = "Ανάρτηση φωτογραφίας ή ταινίας";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Ενεργοποιήστε τις υπηρεσίες τοποθεσίας για να επιτρέψετε στον Τζάμι να προσδιορίσει την τοποθεσία σας.";
 "alerts.locationSharing" = "Μοιραστείτε την τοποθεσία μου";
 "alerts.alreadylocationSharing" = "Ήδη μοιράζεται τοποθεσία με αυτόν τον χρήστη";
diff --git a/Ring/Ring/Resources/eo.lproj/Localizable.strings b/Ring/Ring/Resources/eo.lproj/Localizable.strings
index 59df819..2b00709 100644
--- a/Ring/Ring/Resources/eo.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eo.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Malbona QR-kodo";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Ne eblas konektiĝi al la provizita kontadministratoro. Bonvolu kontroli viajn kreditajn informojn";
 "alerts.recordVideoMessage" = "Enregistru videan mesaĝon";
 "alerts.recordAudioMessage" = "Surbendi aŭdajn mesaĝojn";
-"alerts.uploadFile" = "Alŝutu dosieron";
-"alerts.uploadPhoto" = "Alŝutu foton aŭ filmon";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Ŝaltu \"Lokadajn Servojn\" por permesi al \"Jami\" determini vian lokon.";
 "alerts.locationSharing" = "Dividu mian lokon";
 "alerts.alreadylocationSharing" = "Jam dividante lokon kun tiu uzanto";
diff --git a/Ring/Ring/Resources/es.lproj/Localizable.strings b/Ring/Ring/Resources/es.lproj/Localizable.strings
index 363ba89..b2acd66 100644
--- a/Ring/Ring/Resources/es.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donar";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Código QR incorrecto";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "No se pudo conectar al administrador de cuenta proporcionado. Por favor verifica tus credenciales";
 "alerts.recordVideoMessage" = "Grabar mensaje de video";
 "alerts.recordAudioMessage" = "Grabar mensaje de audio";
-"alerts.uploadFile" = "Subir archivo";
-"alerts.uploadPhoto" = "Subir foto o película";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Activa los \"Servicios de ubicación\" para permitir a \"Jami\" determinar tu ubicación.";
 "alerts.locationSharing" = "Compartir mi ubicación";
 "alerts.alreadylocationSharing" = "Ya se está compartiendo la ubicación con este usuario";
diff --git a/Ring/Ring/Resources/es_419.lproj/Localizable.strings b/Ring/Ring/Resources/es_419.lproj/Localizable.strings
index 68bd63d..5323ee0 100644
--- a/Ring/Ring/Resources/es_419.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_419.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donar";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Código QR erróneo";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "No se puede conectar con el administrador de cuenta proporcionado. Por favor revise sus credenciales";
 "alerts.recordVideoMessage" = "Grabar un mensaje de video";
 "alerts.recordAudioMessage" = "Grabar un mensaje de audio";
-"alerts.uploadFile" = "Subir archivo";
-"alerts.uploadPhoto" = "Subir foto o película";
+"alerts.uploadFile" = "Send file";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Activa los \"Servicios de ubicación\" para permitir a \"Jami\" determinar tu ubicación.";
 "alerts.locationSharing" = "Compartir mi ubicación";
 "alerts.alreadylocationSharing" = "Ya se está compartiendo la ubicación con este usuario";
diff --git a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
index 62c7aca..e44b1f2 100644
--- a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donar";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Código QR erróneo";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "No se puede conectar con el administrador de cuenta proporcionado. Por favor revise sus credenciales";
 "alerts.recordVideoMessage" = "Grabar un mensaje de video";
 "alerts.recordAudioMessage" = "Grabar un mensaje de audio";
-"alerts.uploadFile" = "Subir archivo";
-"alerts.uploadPhoto" = "Subir foto o película";
+"alerts.uploadFile" = "Enviar archivo";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Activa los \"Servicios de ubicación\" para permitir a \"Jami\" determinar tu ubicación.";
 "alerts.locationSharing" = "Compartir mi ubicación";
 "alerts.alreadylocationSharing" = "Ya se está compartiendo la ubicación con este usuario";
diff --git a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
index fb154dc..5192845 100644
--- a/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_CO.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donar";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Código QR erróneo";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "No se puede conectar con el administrador de cuenta proporcionado. Por favor revise sus credenciales";
 "alerts.recordVideoMessage" = "Grabar un mensaje de video";
 "alerts.recordAudioMessage" = "Grabar un mensaje de audio";
-"alerts.uploadFile" = "Subir archivo";
-"alerts.uploadPhoto" = "Subir foto o película";
+"alerts.uploadFile" = "Enviar archivo";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Activa los \"Servicios de ubicación\" para permitir a \"Jami\" determinar tu ubicación.";
 "alerts.locationSharing" = "Compartir mi ubicación";
 "alerts.alreadylocationSharing" = "Ya se está compartiendo la ubicación con este usuario";
diff --git a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
index 68eab47..364f585 100644
--- a/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_MX.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donar";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Código QR erróneo";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "No se puede conectar con el administrador de cuenta proporcionado. Por favor revise sus credenciales";
 "alerts.recordVideoMessage" = "Grabar un mensaje de video";
 "alerts.recordAudioMessage" = "Grabar un mensaje de audio";
-"alerts.uploadFile" = "Subir archivo";
-"alerts.uploadPhoto" = "Subir foto o película";
+"alerts.uploadFile" = "Enviar archivo";
+"alerts.uploadPhoto" = "Galeria abierta";
 "alerts.locationServiceIsDisabled" = "Activa los \"Servicios de ubicación\" para permitir a \"Jami\" determinar tu ubicación.";
 "alerts.locationSharing" = "Compartir mi ubicación";
 "alerts.alreadylocationSharing" = "Ya se está compartiendo la ubicación con este usuario";
diff --git a/Ring/Ring/Resources/et.lproj/Localizable.strings b/Ring/Ring/Resources/et.lproj/Localizable.strings
index c56b43f..618f08b 100644
--- a/Ring/Ring/Resources/et.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/et.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Halb QR-kood";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Ma ei saa ühendust võtta antud kontomanijaga.";
 "alerts.recordVideoMessage" = "Salvestada video sõnum";
 "alerts.recordAudioMessage" = "Salvestada audiosõnumi";
-"alerts.uploadFile" = "Laadima faili";
-"alerts.uploadPhoto" = "Laadige üles foto või film";
+"alerts.uploadFile" = "Saada fail";
+"alerts.uploadPhoto" = "Avatud galeriid";
 "alerts.locationServiceIsDisabled" = "Pane \"Lokatsiooni teenused\" sisse, et \"Jami\" saaks su asukohta kindlaks teha.";
 "alerts.locationSharing" = "Jaage minu asukoht.";
 "alerts.alreadylocationSharing" = "Kasutajaga juba jagatakse asukohta";
diff --git a/Ring/Ring/Resources/et_EE.lproj/Localizable.strings b/Ring/Ring/Resources/et_EE.lproj/Localizable.strings
index c56b43f..618f08b 100644
--- a/Ring/Ring/Resources/et_EE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/et_EE.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Halb QR-kood";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Ma ei saa ühendust võtta antud kontomanijaga.";
 "alerts.recordVideoMessage" = "Salvestada video sõnum";
 "alerts.recordAudioMessage" = "Salvestada audiosõnumi";
-"alerts.uploadFile" = "Laadima faili";
-"alerts.uploadPhoto" = "Laadige üles foto või film";
+"alerts.uploadFile" = "Saada fail";
+"alerts.uploadPhoto" = "Avatud galeriid";
 "alerts.locationServiceIsDisabled" = "Pane \"Lokatsiooni teenused\" sisse, et \"Jami\" saaks su asukohta kindlaks teha.";
 "alerts.locationSharing" = "Jaage minu asukoht.";
 "alerts.alreadylocationSharing" = "Kasutajaga juba jagatakse asukohta";
diff --git a/Ring/Ring/Resources/eu.lproj/Localizable.strings b/Ring/Ring/Resources/eu.lproj/Localizable.strings
index ba6bf1c..59624c5 100644
--- a/Ring/Ring/Resources/eu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eu.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "QR kodea txarra";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Ezin naiz konektatu kontu kudeatzailearekin.";
 "alerts.recordVideoMessage" = "Grabatu bideo mezua";
 "alerts.recordAudioMessage" = "Grabatu audio mezua";
-"alerts.uploadFile" = "Fitxategia kargatzea";
-"alerts.uploadPhoto" = "Sartu argazki edo film bat";
+"alerts.uploadFile" = "Bidali fitxategia";
+"alerts.uploadPhoto" = "Galeria irekia";
 "alerts.locationServiceIsDisabled" = "Piztu \"Location Services\" eta utzi \"Jami\"ri zure kokapena zehazten.";
 "alerts.locationSharing" = "Nire kokapena partekatu.";
 "alerts.alreadylocationSharing" = "Jada erabiltzaile honekin kokapena partekatzea";
diff --git a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
index 2b40046..d21ea32 100644
--- a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "اهدا کنید";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "کد QR بد";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "توانایی اتصال به مدیریت حساب ارائه‌شده را نداریم. لطفا اعتبارنامه‌های خود را بررسی کنید.";
 "alerts.recordVideoMessage" = "ضبط یک پیام تصویری";
 "alerts.recordAudioMessage" = "ضبط یک پیام صوتی";
-"alerts.uploadFile" = "بارگذاری فایل";
-"alerts.uploadPhoto" = "بارگذاری عکس یا فیلم";
+"alerts.uploadFile" = "ارسال فایل";
+"alerts.uploadPhoto" = "گالری را باز کن";
 "alerts.locationServiceIsDisabled" = "\"خدمات موقعیت مکانی\" را روشن کنید تا به \"جمی\" اجازه دهید مکان شما را تعیین کند.";
 "alerts.locationSharing" = "هم‌رسانی مکان من";
 "alerts.alreadylocationSharing" = "در حال حاضر مکان را با این کاربر به اشتراک می‌گذارید";
diff --git a/Ring/Ring/Resources/fa.lproj/Localizable.strings b/Ring/Ring/Resources/fa.lproj/Localizable.strings
index cb268b1..dd6a0f2 100644
--- a/Ring/Ring/Resources/fa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "اهدا کنید";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "کد QR بد";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "توانایی اتصال به مدیریت حساب ارائه‌شده را نداریم. لطفا اعتبارنامه‌های خود را بررسی کنید.";
 "alerts.recordVideoMessage" = "ضبط یک پیام تصویری";
 "alerts.recordAudioMessage" = "ضبط یک پیام صوتی";
-"alerts.uploadFile" = "بارگذاری فایل";
-"alerts.uploadPhoto" = "بارگذاری عکس یا فیلم";
+"alerts.uploadFile" = "ارسال فایل";
+"alerts.uploadPhoto" = "گالری را باز کن";
 "alerts.locationServiceIsDisabled" = "\"خدمات موقعیت مکانی\" را روشن کنید تا به \"جمی\" اجازه دهید مکان شما را تعیین کند.";
 "alerts.locationSharing" = "هم‌رسانی مکان من";
 "alerts.alreadylocationSharing" = "در حال حاضر مکان را با این کاربر به اشتراک می‌گذارید";
diff --git a/Ring/Ring/Resources/fi.lproj/Localizable.strings b/Ring/Ring/Resources/fi.lproj/Localizable.strings
index d27f648..977ca09 100644
--- a/Ring/Ring/Resources/fi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fi.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Väärä QR-koodi";
@@ -203,7 +205,7 @@
 "alerts.recordVideoMessage" = "Tallenna videoviesti";
 "alerts.recordAudioMessage" = "Tallenna ääniviesti";
 "alerts.uploadFile" = "Lähetä tiedosto";
-"alerts.uploadPhoto" = "Lähetä kuva tai video";
+"alerts.uploadPhoto" = "Avoin galleri";
 "alerts.locationServiceIsDisabled" = "Ota \"sijaintipalvelut\" käyttöön, jotta \"Jami\" voi määrittää sijaintisi.";
 "alerts.locationSharing" = "Jaa minun sijainti";
 "alerts.alreadylocationSharing" = "Jaat jo sijaintia tämän käyttäjän kanssa";
diff --git a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
index 1b10988..515e6da 100644
--- a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Répondre";
 "global.search" = "Recherche...";
 "global.donate" = "Donnez ";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Supprimer le message";
+"global.deleteFile" = "Supprime le fichier de l'appareil";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Code QR incorrect";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Si vous appréciez Jami et que vous croyez à notre mission, feriez-vous une donation ?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Écrire à";
 "conversation.explanationSendingLocationTo" = "Vous partagez actuellement votre position avec";
 "conversation.explanationReceivingLocationFrom" = "Vous recevez actuellement la position de ";
 "conversation.errorSavingImage" = "Impossible de sauvegarder l'image dans la galerie";
@@ -115,8 +117,8 @@
 "conversation.synchronizationMessage" = "Nous attendons que %@ se connecte afin de synchroniser la conversation.";
 "conversation.inReplyTo" = "En réponse à";
 "conversation.repliedTo" = "répondre à";
-"conversation.yourself" = "yourself";
-"conversation.edited" = "edited";
+"conversation.yourself" = "vous-même";
+"conversation.edited" = "Modifié";
 "conversation.deletedMessage" = "a supprimé le message";
 
 //Invitations
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Je n'arrive pas à me connecter à votre gestionnaire de compte. Vérifiez vos éléments d'authentification.";
 "alerts.recordVideoMessage" = "Enregistrer un message vidéo";
 "alerts.recordAudioMessage" = "Enregistrer un message audio";
-"alerts.uploadFile" = "Télécharger un fichier";
-"alerts.uploadPhoto" = "Télécharger une photo ou un film";
+"alerts.uploadFile" = "Envoyer fichier";
+"alerts.uploadPhoto" = "Ouvrir la galerie";
 "alerts.locationServiceIsDisabled" = "Activez le service de géolocalisation pour permettre à Jami de déterminer votre localisation.";
 "alerts.locationSharing" = "Partager votre position";
 "alerts.alreadylocationSharing" = "Vous partagez déjà votre position avec cet utilisateur";
diff --git a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
index b953379..583a158 100644
--- a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Répondre";
 "global.search" = "Recherche...";
 "global.donate" = "Donnez ";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Supprimer le message";
+"global.deleteFile" = "Supprime le fichier de l'appareil";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Code QR incorrect";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Si vous appréciez Jami et que vous croyez à notre mission, feriez-vous une donation ?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Écrire à";
 "conversation.explanationSendingLocationTo" = "Vous partagez actuellement votre position avec";
 "conversation.explanationReceivingLocationFrom" = "Vous recevez actuellement la position de ";
 "conversation.errorSavingImage" = "Impossible de sauvegarder l'image dans la galerie";
@@ -115,8 +117,8 @@
 "conversation.synchronizationMessage" = "Nous attendons que %@ se connecte afin de synchroniser la conversation.";
 "conversation.inReplyTo" = "En réponse à";
 "conversation.repliedTo" = "répondre à";
-"conversation.yourself" = "yourself";
-"conversation.edited" = "edited";
+"conversation.yourself" = "vous-même";
+"conversation.edited" = "Modifié";
 "conversation.deletedMessage" = "a supprimé le message";
 
 //Invitations
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Je n'arrive pas à me connecter à votre gestionnaire de compte. Vérifiez vos éléments d'authentification.";
 "alerts.recordVideoMessage" = "Enregistrer un message vidéo";
 "alerts.recordAudioMessage" = "Enregistrer un message audio";
-"alerts.uploadFile" = "Télécharger un fichier";
-"alerts.uploadPhoto" = "Télécharger une photo ou un film";
+"alerts.uploadFile" = "Envoyer le fichier";
+"alerts.uploadPhoto" = "Ouvrir la galerie";
 "alerts.locationServiceIsDisabled" = "Activez le service de géolocalisation pour permettre à Jami de déterminer votre localisation.";
 "alerts.locationSharing" = "Partager votre position";
 "alerts.alreadylocationSharing" = "Vous partagez déjà votre position avec cet utilisateur";
diff --git a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
index 1b10988..515e6da 100644
--- a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Répondre";
 "global.search" = "Recherche...";
 "global.donate" = "Donnez ";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Supprimer le message";
+"global.deleteFile" = "Supprime le fichier de l'appareil";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Code QR incorrect";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Si vous appréciez Jami et que vous croyez à notre mission, feriez-vous une donation ?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Écrire à";
 "conversation.explanationSendingLocationTo" = "Vous partagez actuellement votre position avec";
 "conversation.explanationReceivingLocationFrom" = "Vous recevez actuellement la position de ";
 "conversation.errorSavingImage" = "Impossible de sauvegarder l'image dans la galerie";
@@ -115,8 +117,8 @@
 "conversation.synchronizationMessage" = "Nous attendons que %@ se connecte afin de synchroniser la conversation.";
 "conversation.inReplyTo" = "En réponse à";
 "conversation.repliedTo" = "répondre à";
-"conversation.yourself" = "yourself";
-"conversation.edited" = "edited";
+"conversation.yourself" = "vous-même";
+"conversation.edited" = "Modifié";
 "conversation.deletedMessage" = "a supprimé le message";
 
 //Invitations
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Je n'arrive pas à me connecter à votre gestionnaire de compte. Vérifiez vos éléments d'authentification.";
 "alerts.recordVideoMessage" = "Enregistrer un message vidéo";
 "alerts.recordAudioMessage" = "Enregistrer un message audio";
-"alerts.uploadFile" = "Télécharger un fichier";
-"alerts.uploadPhoto" = "Télécharger une photo ou un film";
+"alerts.uploadFile" = "Envoyer fichier";
+"alerts.uploadPhoto" = "Ouvrir la galerie";
 "alerts.locationServiceIsDisabled" = "Activez le service de géolocalisation pour permettre à Jami de déterminer votre localisation.";
 "alerts.locationSharing" = "Partager votre position";
 "alerts.alreadylocationSharing" = "Vous partagez déjà votre position avec cet utilisateur";
diff --git a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
index db1cd86..5a0117d 100644
--- a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Répondre";
 "global.search" = "Recherche...";
 "global.donate" = "Donnez ";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Supprimer le message";
+"global.deleteFile" = "Supprime le fichier de l'appareil";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Code QR incorrect";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Si vous appréciez Jami et que vous croyez à notre mission, feriez-vous une donation ?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Écrire à";
 "conversation.explanationSendingLocationTo" = "Vous partagez actuellement votre position avec";
 "conversation.explanationReceivingLocationFrom" = "Vous recevez actuellement la position de ";
 "conversation.errorSavingImage" = "Impossible de sauvegarder l'image dans la galerie";
@@ -115,8 +117,8 @@
 "conversation.synchronizationMessage" = "Nous attendons que %@ se connecte afin de synchroniser la conversation.";
 "conversation.inReplyTo" = "En réponse à";
 "conversation.repliedTo" = "répondre à";
-"conversation.yourself" = "yourself";
-"conversation.edited" = "edited";
+"conversation.yourself" = "vous-même";
+"conversation.edited" = "Modifié";
 "conversation.deletedMessage" = "a supprimé le message";
 
 //Invitations
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Je n'arrive pas à me connecter à votre gestionnaire de compte. Vérifiez vos éléments d'authentification.";
 "alerts.recordVideoMessage" = "Enregistrer un message vidéo";
 "alerts.recordAudioMessage" = "Enregistrer un message audio";
-"alerts.uploadFile" = "Télécharger un fichier";
-"alerts.uploadPhoto" = "Télécharger une photo ou un film";
+"alerts.uploadFile" = "Envoyer le fichier";
+"alerts.uploadPhoto" = "Ouvrir la galerie";
 "alerts.locationServiceIsDisabled" = "Activez le service de géolocalisation pour permettre à Jami de déterminer votre localisation.";
 "alerts.locationSharing" = "Partager votre position";
 "alerts.alreadylocationSharing" = "Vous partagez déjà votre position avec cet utilisateur";
diff --git a/Ring/Ring/Resources/fr.lproj/Localizable.strings b/Ring/Ring/Resources/fr.lproj/Localizable.strings
index 13dfa73..98ab2ab 100644
--- a/Ring/Ring/Resources/fr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Répondre";
 "global.search" = "Recherche en cours ...";
 "global.donate" = "Donnez ";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Supprimer le message";
+"global.deleteFile" = "Supprime le fichier de l'appareil";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Code QR incorrect";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Si vous appréciez Jami et que vous croyez à notre mission, feriez-vous une donation ?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Écrire à";
 "conversation.explanationSendingLocationTo" = "Vous partagez actuellement votre position avec";
 "conversation.explanationReceivingLocationFrom" = "Vous recevez actuellement la position de ";
 "conversation.errorSavingImage" = "Impossible de sauvegarder l'image dans la galerie";
@@ -115,8 +117,8 @@
 "conversation.synchronizationMessage" = "Nous attendons que %@ se connecte afin de synchroniser la conversation.";
 "conversation.inReplyTo" = "En réponse à";
 "conversation.repliedTo" = "répondre à";
-"conversation.yourself" = "yourself";
-"conversation.edited" = "edited";
+"conversation.yourself" = "vous-même";
+"conversation.edited" = "modifié";
 "conversation.deletedMessage" = "a supprimé le message";
 
 //Invitations
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Je n'arrive pas à me connecter à votre gestionnaire de compte. Vérifiez vos éléments d'authentification.";
 "alerts.recordVideoMessage" = "Envoyer un message vidéo";
 "alerts.recordAudioMessage" = "Envoyer un message vocal";
-"alerts.uploadFile" = "Téléverser un fichier";
-"alerts.uploadPhoto" = "Téléverser une photo ou une vidéo";
+"alerts.uploadFile" = "Envoyez un fichier";
+"alerts.uploadPhoto" = "Ouvrir la galerie";
 "alerts.locationServiceIsDisabled" = "Activez le service de géolocalisation pour permettre à Jami de déterminer votre localisation.";
 "alerts.locationSharing" = "Partager votre position";
 "alerts.alreadylocationSharing" = "Vous partagez déjà votre position avec cet utilisateur";
diff --git a/Ring/Ring/Resources/ga.lproj/Localizable.strings b/Ring/Ring/Resources/ga.lproj/Localizable.strings
index 0e8c36f..fbaa2c2 100644
--- a/Ring/Ring/Resources/ga.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ga.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Cód QR olc";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Ní féidir teagmháil a dhéanamh le bainisteoir cuntas a sholáthraíonn tú.";
 "alerts.recordVideoMessage" = "Teachtaireacht físeán a thaifeadadh";
 "alerts.recordAudioMessage" = "Teachtaireacht fuaime a thaifeadadh";
-"alerts.uploadFile" = "File Upload";
-"alerts.uploadPhoto" = "Fógra nó scannán a uaslódáil";
+"alerts.uploadFile" = "Comhad a sheoladh";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Cuir ar \"Shoirbheis Líne\" chun ligean do \"Jami\" a chinneadh do shuíomh.";
 "alerts.locationSharing" = "Comhroinn mo shuíomh";
 "alerts.alreadylocationSharing" = "Ag roinnt suíomh cheana féin leis an úsáideoir seo";
diff --git a/Ring/Ring/Resources/gl.lproj/Localizable.strings b/Ring/Ring/Resources/gl.lproj/Localizable.strings
index 37ddd06..f74a497 100644
--- a/Ring/Ring/Resources/gl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/gl.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Doar";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Mal código QR";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Non se pode conectar ao administrador da conta proporcionada.";
 "alerts.recordVideoMessage" = "Gravar videomensaxe";
 "alerts.recordAudioMessage" = "Gravar mensaxe de audio";
-"alerts.uploadFile" = "Cargar ficheiro";
-"alerts.uploadPhoto" = "Cargar foto ou película";
+"alerts.uploadFile" = "Enviar ficheiro";
+"alerts.uploadPhoto" = "Abrir galería";
 "alerts.locationServiceIsDisabled" = "Activa \"Servizos de localización\" para permitir que \"Jami\" determine a túa localización.";
 "alerts.locationSharing" = "Comparta a miña localización";
 "alerts.alreadylocationSharing" = "Xa comparte a localización con este usuario";
diff --git a/Ring/Ring/Resources/gu.lproj/Localizable.strings b/Ring/Ring/Resources/gu.lproj/Localizable.strings
index 7f11a61..2ddc8ef 100644
--- a/Ring/Ring/Resources/gu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/gu.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "ખરાબ QR કોડ";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "પ્રદાન કરેલ એકાઉન્ટ મેનેજર સાથે કનેક્ટ થઈ શકતો નથી. કૃપા કરીને તમારી ઓળખપત્રો તપાસો";
 "alerts.recordVideoMessage" = "વિડિઓ સંદેશ રેકોર્ડ કરો";
 "alerts.recordAudioMessage" = "ઑડિઓ સંદેશ રેકોર્ડ કરો";
-"alerts.uploadFile" = "ફાઇલ અપલોડ કરો";
-"alerts.uploadPhoto" = "ફોટો અથવા ફિલ્મ અપલોડ કરો";
+"alerts.uploadFile" = "ફાઇલ મોકલો";
+"alerts.uploadPhoto" = "ખુલ્લી ગેલેરી";
 "alerts.locationServiceIsDisabled" = "\"જમી\" ને તમારું સ્થાન નક્કી કરવા માટે \"સ્થાન સેવાઓ\" ને ચાલુ કરો.";
 "alerts.locationSharing" = "મારું સ્થાન શેર કરો";
 "alerts.alreadylocationSharing" = "પહેલેથી જ આ વપરાશકર્તા સાથે સ્થાન શેર";
diff --git a/Ring/Ring/Resources/hak.lproj/Localizable.strings b/Ring/Ring/Resources/hak.lproj/Localizable.strings
index d29e31a..f26fad4 100644
--- a/Ring/Ring/Resources/hak.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hak.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "无法连接到提供的账户管理器。请检查您的凭据。";
 "alerts.recordVideoMessage" = "录制视频信息";
 "alerts.recordAudioMessage" = "录制语音信息";
-"alerts.uploadFile" = "上传文件";
-"alerts.uploadPhoto" = "上传照片或视频";
+"alerts.uploadFile" = "傳送檔案";
+"alerts.uploadPhoto" = "打开相册";
 "alerts.locationServiceIsDisabled" = "打开”位置服务“以允许 Jami 确定您的位置。";
 "alerts.locationSharing" = "分享我的位置";
 "alerts.alreadylocationSharing" = "已与此用户分享位置";
diff --git a/Ring/Ring/Resources/he.lproj/Localizable.strings b/Ring/Ring/Resources/he.lproj/Localizable.strings
index 2729210..72afec2 100644
--- a/Ring/Ring/Resources/he.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/he.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "קוד QR גרוע";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "לא ניתן להתחבר למנהל החשבון הנגיש. אנא בדוק את תעודות האישור שלך";
 "alerts.recordVideoMessage" = "הקלטת הודעה וידאו";
 "alerts.recordAudioMessage" = "הקלטת הודעה אוודית";
-"alerts.uploadFile" = "תעלה קבוצה";
-"alerts.uploadPhoto" = "תעלה תמונה או סרט";
+"alerts.uploadFile" = "שלח קובץ";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "תפעיל את \"שירותי המיקום\" כדי לאפשר ל\"ג'מי\" לקבוע את המיקום שלך.";
 "alerts.locationSharing" = "שיתוף המיקום שלי";
 "alerts.alreadylocationSharing" = "כבר משתף את המיקום עם המשתמש הזה";
diff --git a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
index df85fba..fb12bc9 100644
--- a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "खराब क्यूआर कोड";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "प्रदान किए गए खाता प्रबंधक से कनेक्ट नहीं हो सकता है. कृपया अपनी क्रेडेंशियल जांचें";
 "alerts.recordVideoMessage" = "वीडियो संदेश रिकॉर्ड करें";
 "alerts.recordAudioMessage" = "एक ऑडियो संदेश रिकॉर्ड करें";
-"alerts.uploadFile" = "फ़ाइल अपलोड करें";
-"alerts.uploadPhoto" = "फोटो या फिल्म अपलोड करें";
+"alerts.uploadFile" = "फ़ाइल भेजें";
+"alerts.uploadPhoto" = "खुली गैलरी";
 "alerts.locationServiceIsDisabled" = "\"जामी\" को आपके स्थान का पता लगाने के लिए \"स्थान सेवा\" को चालू करें।";
 "alerts.locationSharing" = "मेरी स्थिति साझा करें";
 "alerts.alreadylocationSharing" = "पहले से ही इस उपयोगकर्ता के साथ स्थान साझा";
diff --git a/Ring/Ring/Resources/hi.lproj/Localizable.strings b/Ring/Ring/Resources/hi.lproj/Localizable.strings
index 973b472..c928160 100644
--- a/Ring/Ring/Resources/hi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "खराब क्यूआर कोड";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "प्रदान किए गए खाता प्रबंधक से कनेक्ट नहीं हो सकता है. कृपया अपनी क्रेडेंशियल जांचें";
 "alerts.recordVideoMessage" = "वीडियो संदेश रिकॉर्ड करें";
 "alerts.recordAudioMessage" = "एक ऑडियो संदेश रिकॉर्ड करें";
-"alerts.uploadFile" = "फ़ाइल अपलोड करें";
-"alerts.uploadPhoto" = "फोटो या फिल्म अपलोड करें";
+"alerts.uploadFile" = "फ़ाइल भेजें";
+"alerts.uploadPhoto" = "खुली गैलरी";
 "alerts.locationServiceIsDisabled" = "\"जामी\" को आपके स्थान का पता लगाने के लिए \"स्थान सेवा\" को चालू करें।";
 "alerts.locationSharing" = "मेरी स्थिति साझा करें";
 "alerts.alreadylocationSharing" = "पहले से ही इस उपयोगकर्ता के साथ स्थान साझा";
diff --git a/Ring/Ring/Resources/hr.lproj/Localizable.strings b/Ring/Ring/Resources/hr.lproj/Localizable.strings
index 2b18684..20abdfe 100644
--- a/Ring/Ring/Resources/hr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Loš QR kod";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Ne mogu se povezati s upraviteljem računa.";
 "alerts.recordVideoMessage" = "Zapisi video poruku";
 "alerts.recordAudioMessage" = "Zapisi audio poruku";
-"alerts.uploadFile" = "Upload datoteka";
-"alerts.uploadPhoto" = "Upload foto ili film";
+"alerts.uploadFile" = "Pošalji datoteku";
+"alerts.uploadPhoto" = "Otvorena galerija";
 "alerts.locationServiceIsDisabled" = "Uključite \"Službe lokacije\" kako bi \"Jami\" utvrdio vašu lokaciju.";
 "alerts.locationSharing" = "Podijelite moju lokaciju.";
 "alerts.alreadylocationSharing" = "Već dijelite lokaciju s ovim korisnikom";
diff --git a/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings b/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
index 2b18684..20abdfe 100644
--- a/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr_HR.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Loš QR kod";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Ne mogu se povezati s upraviteljem računa.";
 "alerts.recordVideoMessage" = "Zapisi video poruku";
 "alerts.recordAudioMessage" = "Zapisi audio poruku";
-"alerts.uploadFile" = "Upload datoteka";
-"alerts.uploadPhoto" = "Upload foto ili film";
+"alerts.uploadFile" = "Pošalji datoteku";
+"alerts.uploadPhoto" = "Otvorena galerija";
 "alerts.locationServiceIsDisabled" = "Uključite \"Službe lokacije\" kako bi \"Jami\" utvrdio vašu lokaciju.";
 "alerts.locationSharing" = "Podijelite moju lokaciju.";
 "alerts.alreadylocationSharing" = "Već dijelite lokaciju s ovim korisnikom";
diff --git a/Ring/Ring/Resources/hu.lproj/Localizable.strings b/Ring/Ring/Resources/hu.lproj/Localizable.strings
index 97f90ac..a6c26aa 100644
--- a/Ring/Ring/Resources/hu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hu.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Válasz";
 "global.search" = "Keresés…";
 "global.donate" = "Adományozás";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Üzenet törlése";
+"global.deleteFile" = "Fájl törlése az eszközről";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Rossz QR-kód";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Ha hisz a küldetésünkben, adományozna?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Írj a következő(k)nek: ";
 "conversation.explanationSendingLocationTo" = "Ön megosztja valós idejű helyét a következővel:";
 "conversation.explanationReceivingLocationFrom" = "Jelenleg valós idejű helyet kap a következőtől:";
 "conversation.errorSavingImage" = "Nem sikerült menteni a képet a kepgyűjteménybe";
@@ -115,8 +117,8 @@
 "conversation.synchronizationMessage" = "Várjuk, hogy a(z) %@ csatlakozzon a beszélgetés összehangolásához.";
 "conversation.inReplyTo" = "Válaszul erre:";
 "conversation.repliedTo" = "válaszolt neki:";
-"conversation.yourself" = "yourself";
-"conversation.edited" = "edited";
+"conversation.yourself" = "önmaga";
+"conversation.edited" = "szerkesztve";
 "conversation.deletedMessage" = "Törölt üzenet";
 
 //Invitations
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Nem lehet csatlakozni a megadott fiókkezelőhöz. Kérjük, ellenőrizze hitelesítő adatait.";
 "alerts.recordVideoMessage" = "Videoüzenet felvétele";
 "alerts.recordAudioMessage" = "Hangüzenet felvétele";
-"alerts.uploadFile" = "Fájl feltöltése";
-"alerts.uploadPhoto" = "Fénykép vagy mozgókép feltöltése";
+"alerts.uploadFile" = "Fájl küldése";
+"alerts.uploadPhoto" = "Gyűjtemény megnyitása";
 "alerts.locationServiceIsDisabled" = "Helymeghatározási szolgáltatások bekapcsolása, hogy a „Jami” meghatározhassa a tartózkodási helyét.";
 "alerts.locationSharing" = "Tartózkodási hely megosztása";
 "alerts.alreadylocationSharing" = "Tartózkodási hely már megosztva ezzel a felhasználóval.";
diff --git a/Ring/Ring/Resources/hy.lproj/Localizable.strings b/Ring/Ring/Resources/hy.lproj/Localizable.strings
index 61c1bb2..1cb3b03 100644
--- a/Ring/Ring/Resources/hy.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hy.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Չար QR կոդ";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Չի կարող կապվել տրամադրված հաշիվի կառավարիչի հետ: Խնդրում ենք ստուգել ձեր վավերականությունները";
 "alerts.recordVideoMessage" = "Տեսագրեք հաղորդագրություն";
 "alerts.recordAudioMessage" = "ձայնային հաղորդագրություն ձայնագրեք";
-"alerts.uploadFile" = "Բեռնել ֆայլը";
-"alerts.uploadPhoto" = "Լուսանկար կամ ֆիլմ բեռնել";
+"alerts.uploadFile" = "Փաստաթուղթ ուղարկել";
+"alerts.uploadPhoto" = "Բաց պատկերասրահ";
 "alerts.locationServiceIsDisabled" = "Փոխցրեք \"Տեղադրման ծառայությունները\", որպեսզի \"Ջամի\" կարողանա որոշել ձեր գտնվելու վայրը:";
 "alerts.locationSharing" = "Գտնվելու վայրը կիսեք";
 "alerts.alreadylocationSharing" = "Արդեն տեղամասը կիսել այս օգտագործողի հետ";
diff --git a/Ring/Ring/Resources/id.lproj/Localizable.strings b/Ring/Ring/Resources/id.lproj/Localizable.strings
index 7683ad2..252b60f 100644
--- a/Ring/Ring/Resources/id.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/id.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Kode QR yang buruk";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Tidak dapat terhubung ke manajer akun yang disediakan. Silakan periksa kredensial Anda";
 "alerts.recordVideoMessage" = "Rekam pesan video";
 "alerts.recordAudioMessage" = "Rekam pesan suara";
-"alerts.uploadFile" = "Unggah file";
-"alerts.uploadPhoto" = "Unggah foto atau film";
+"alerts.uploadFile" = "Kirim berkas";
+"alerts.uploadPhoto" = "Buka galeri";
 "alerts.locationServiceIsDisabled" = "Aktifkan \"Layanan Lokasi\" untuk mengizinkan \"Jami\" menentukan lokasi Anda.";
 "alerts.locationSharing" = "Bagikan lokasi saya";
 "alerts.alreadylocationSharing" = "Sudah berbagi lokasi dengan pengguna ini";
diff --git a/Ring/Ring/Resources/ig.lproj/Localizable.strings b/Ring/Ring/Resources/ig.lproj/Localizable.strings
index 0b88af0..c0a1ca2 100644
--- a/Ring/Ring/Resources/ig.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ig.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Usoro QR na-adịghị mma";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Enweghi ike ijikọ na njikwa akaụntụ enyere. Biko lelee nzere gị";
 "alerts.recordVideoMessage" = "Dee ozi vidio";
 "alerts.recordAudioMessage" = "Dee ozi ọdịyo";
-"alerts.uploadFile" = "Bulite faịlụ";
-"alerts.uploadPhoto" = "Bulite foto ma ọ bụ ihe nkiri";
+"alerts.uploadFile" = "Zipu faịlụ";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Gbanye \"Service Location\" ka \"Jami\" nwee ike ịchọpụta ebe ị nọ.";
 "alerts.locationSharing" = "Kọrọ m ebe m nọ";
 "alerts.alreadylocationSharing" = "Already ekekọrịta ọnọdụ na onye ọrụ a";
diff --git a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
index e78e5ca..474e08c 100644
--- a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Rispondi";
 "global.search" = "Ricerca in corso...";
 "global.donate" = "Donare";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Cancella messaggio";
+"global.deleteFile" = "Elimina il file dal dispositivo";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Codice QR errato";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Se ti piace usare Jami e pensi che la nostra missione sia importante, puoi fare una donazione?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Scrivi a ";
 "conversation.explanationSendingLocationTo" = "Stai condividendo la tua posizione con ";
 "conversation.explanationReceivingLocationFrom" = "Stai ricevendo una posizione in diretta da ";
 "conversation.errorSavingImage" = "Impossibile salvare l'immagine nella galleria";
@@ -115,8 +117,8 @@
 "conversation.synchronizationMessage" = "In attesa che %@ si connetta per sincronizzare la conversazione.";
 "conversation.inReplyTo" = "In risposta a";
 "conversation.repliedTo" = " ha risposto a";
-"conversation.yourself" = "yourself";
-"conversation.edited" = "edited";
+"conversation.yourself" = "tu";
+"conversation.edited" = "modificato";
 "conversation.deletedMessage" = "ha eliminato un messaggio";
 
 //Invitations
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Impossibile connettersi al gestore account fornito. Controlla le tue credenziali";
 "alerts.recordVideoMessage" = "Registra un videomessaggio";
 "alerts.recordAudioMessage" = "Registra un messaggio vocale";
-"alerts.uploadFile" = "Carica file";
-"alerts.uploadPhoto" = "Carica foto o video";
+"alerts.uploadFile" = "Invia file";
+"alerts.uploadPhoto" = "Apri Galleria";
 "alerts.locationServiceIsDisabled" = "Attiva \"Servizi di localizzazione\" per consentire a \"Jami\" di determinare la tua posizione.";
 "alerts.locationSharing" = "Condividi la mia posizione";
 "alerts.alreadylocationSharing" = "Condividi già la posizione con questo utente";
diff --git a/Ring/Ring/Resources/it.lproj/Localizable.strings b/Ring/Ring/Resources/it.lproj/Localizable.strings
index 55faecc..f9620b0 100644
--- a/Ring/Ring/Resources/it.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Rispondi";
 "global.search" = "Ricerca in corso...";
 "global.donate" = "Donare";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Cancella messaggio";
+"global.deleteFile" = "Elimina il file dal dispositivo";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Codice QR errato";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Se ti piace usare Jami e pensi che la nostra missione sia importante, puoi fare una donazione?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Scrivi a ";
 "conversation.explanationSendingLocationTo" = "Stai condividendo la tua posizione con ";
 "conversation.explanationReceivingLocationFrom" = "Stai ricevendo una posizione in diretta da ";
 "conversation.errorSavingImage" = "Impossibile salvare l'immagine nella galleria";
@@ -115,8 +117,8 @@
 "conversation.synchronizationMessage" = "In attesa che %@ si connetta per sincronizzare la conversazione.";
 "conversation.inReplyTo" = "In risposta a";
 "conversation.repliedTo" = " ha risposto a";
-"conversation.yourself" = "yourself";
-"conversation.edited" = "edited";
+"conversation.yourself" = "tu";
+"conversation.edited" = "modificato";
 "conversation.deletedMessage" = "ha eliminato un messaggio";
 
 //Invitations
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Impossibile connettersi al gestore account fornito. Controlla le tue credenziali";
 "alerts.recordVideoMessage" = "Registra un videomessaggio";
 "alerts.recordAudioMessage" = "Registra un messaggio vocale";
-"alerts.uploadFile" = "Carica file";
-"alerts.uploadPhoto" = "Carica foto o video";
+"alerts.uploadFile" = "Invia file";
+"alerts.uploadPhoto" = "Apri Galleria";
 "alerts.locationServiceIsDisabled" = "Attiva \"Servizi di localizzazione\" per consentire a \"Jami\" di determinare la tua posizione.";
 "alerts.locationSharing" = "Condividi la mia posizione";
 "alerts.alreadylocationSharing" = "Condividi già la posizione con questo utente";
diff --git a/Ring/Ring/Resources/ja.lproj/Localizable.strings b/Ring/Ring/Resources/ja.lproj/Localizable.strings
index 31c09fb..3b04844 100644
--- a/Ring/Ring/Resources/ja.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ja.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "誤ったQRコード";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "ご指定のアカウント管理機能に接続できません。資格情報をご確認ください。";
 "alerts.recordVideoMessage" = "ビデオメッセージを録画";
 "alerts.recordAudioMessage" = "音声メッセージを録音";
-"alerts.uploadFile" = "ファイルをアップロード";
-"alerts.uploadPhoto" = "写真をアップロードする";
+"alerts.uploadFile" = "ファイルの送信";
+"alerts.uploadPhoto" = "ギャラリーを開く";
 "alerts.locationServiceIsDisabled" = "\"Jami\"があなたの位置を決定できるように\"位置サービス\"をオンにします.";
 "alerts.locationSharing" = "私の位置をシェア";
 "alerts.alreadylocationSharing" = "このユーザーと既に位置情報を共有済みです";
diff --git a/Ring/Ring/Resources/kk.lproj/Localizable.strings b/Ring/Ring/Resources/kk.lproj/Localizable.strings
index e8370c3..5d70c16 100644
--- a/Ring/Ring/Resources/kk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/kk.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Жаман QR код";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Келтірілген шот менеджеріне қосыла алмаймын.";
 "alerts.recordVideoMessage" = "Видео хабарламаны жаз";
 "alerts.recordAudioMessage" = "Аудио хабарды жаздыру";
-"alerts.uploadFile" = "Файл жүктеу";
-"alerts.uploadPhoto" = "Фото немесе фильмді жүктеу";
+"alerts.uploadFile" = "Файл жіберу";
+"alerts.uploadPhoto" = "Ашық галерея";
 "alerts.locationServiceIsDisabled" = "\"Жамның\" сіздің орналасқан жеріңізді анықтауына мүмкіндік беру үшін \"Жамның орналасқан жері\" қызметіне қосыңыз.";
 "alerts.locationSharing" = "Менің орналасқан жерімді бөліңіз";
 "alerts.alreadylocationSharing" = "Бұл пайдаланушымен орналасқан жерді бөлісу";
diff --git a/Ring/Ring/Resources/kn.lproj/Localizable.strings b/Ring/Ring/Resources/kn.lproj/Localizable.strings
index e104a67..b2a9fa7 100644
--- a/Ring/Ring/Resources/kn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/kn.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "ಕೆಟ್ಟ QR ಕೋಡ್";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "ಒದಗಿಸಿದ ಖಾತೆ ವ್ಯವಸ್ಥಾಪಕ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ರುಜುವಾತುಗಳನ್ನು ಪರಿಶೀಲಿಸಿ";
 "alerts.recordVideoMessage" = "ವೀಡಿಯೊ ಸಂದೇಶವನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಿ";
 "alerts.recordAudioMessage" = "ಆಡಿಯೋ ಸಂದೇಶವನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಿ";
-"alerts.uploadFile" = "ಫೈಲ್ ಅಪ್ಲೋಡ್";
-"alerts.uploadPhoto" = "ಫೋಟೋ ಅಥವಾ ಚಲನಚಿತ್ರವನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಿ";
+"alerts.uploadFile" = "ಫೈಲ್ ಕಳುಹಿಸು";
+"alerts.uploadPhoto" = "ತೆರೆದ ಗ್ಯಾಲರಿ";
 "alerts.locationServiceIsDisabled" = "\"ಜಾಮಿ\" ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು \"ಸ್ಥಳ ಸೇವೆಗಳು\" ಅನ್ನು ಆನ್ ಮಾಡಿ.";
 "alerts.locationSharing" = "ನನ್ನ ಸ್ಥಳವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ";
 "alerts.alreadylocationSharing" = "ಈಗಾಗಲೇ ಈ ಬಳಕೆದಾರರೊಂದಿಗೆ ಸ್ಥಳ ಹಂಚಿಕೆ";
diff --git a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
index 43b185a..6e81c19 100644
--- a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "나쁜 QR 코드";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "제공된 계정 관리자와 연결할 수 없습니다. 귀하의 신분증을 확인하시기 바랍니다.";
 "alerts.recordVideoMessage" = "비디오 메시지를 녹음";
 "alerts.recordAudioMessage" = "오디오 메시지를 녹음";
-"alerts.uploadFile" = "파일 업로드";
-"alerts.uploadPhoto" = "사진이나 영화를 업로드";
+"alerts.uploadFile" = "파일 보내기";
+"alerts.uploadPhoto" = "개장 갤러리";
 "alerts.locationServiceIsDisabled" = "\"지거 서비스\"를 켜면 \"자미\"가 위치를 확인하도록 합니다.";
 "alerts.locationSharing" = "내 위치를 공유";
 "alerts.alreadylocationSharing" = "이미 이 사용자와 위치를 공유";
diff --git a/Ring/Ring/Resources/ko.lproj/Localizable.strings b/Ring/Ring/Resources/ko.lproj/Localizable.strings
index 43b185a..6e81c19 100644
--- a/Ring/Ring/Resources/ko.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "나쁜 QR 코드";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "제공된 계정 관리자와 연결할 수 없습니다. 귀하의 신분증을 확인하시기 바랍니다.";
 "alerts.recordVideoMessage" = "비디오 메시지를 녹음";
 "alerts.recordAudioMessage" = "오디오 메시지를 녹음";
-"alerts.uploadFile" = "파일 업로드";
-"alerts.uploadPhoto" = "사진이나 영화를 업로드";
+"alerts.uploadFile" = "파일 보내기";
+"alerts.uploadPhoto" = "개장 갤러리";
 "alerts.locationServiceIsDisabled" = "\"지거 서비스\"를 켜면 \"자미\"가 위치를 확인하도록 합니다.";
 "alerts.locationSharing" = "내 위치를 공유";
 "alerts.alreadylocationSharing" = "이미 이 사용자와 위치를 공유";
diff --git a/Ring/Ring/Resources/lt.lproj/Localizable.strings b/Ring/Ring/Resources/lt.lproj/Localizable.strings
index a051a59..ed443fe 100644
--- a/Ring/Ring/Resources/lt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/lt.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Blogas QR kodas";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Negalima prisijungti prie pateikto paskyros valdytojo.";
 "alerts.recordVideoMessage" = "Užregistruokite vaizdo pranešimą";
 "alerts.recordAudioMessage" = "Užregistruokite garso pranešimą";
-"alerts.uploadFile" = "Įkelkite failą";
-"alerts.uploadPhoto" = "Įkelkite nuotrauką ar filmą";
+"alerts.uploadFile" = "Siųsti failą";
+"alerts.uploadPhoto" = "Atverti galeriją";
 "alerts.locationServiceIsDisabled" = "Įjungkite \"Lokation Services\" ir leiskite \"Jami\" nustatyti jūsų vietą.";
 "alerts.locationSharing" = "Pasidalinkite mano vieta";
 "alerts.alreadylocationSharing" = "Jau dalintis vieta su šiuo vartotoju";
diff --git a/Ring/Ring/Resources/ml.lproj/Localizable.strings b/Ring/Ring/Resources/ml.lproj/Localizable.strings
index a64b014..ee6aa2e 100644
--- a/Ring/Ring/Resources/ml.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ml.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "മോശം ക്യുആർ കോഡ്";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "നൽകിയിരിക്കുന്ന അക്കൌണ്ട് മാനേജറുമായി ബന്ധപ്പെടാനായില്ല. ദയവായി നിങ്ങളുടെ ക്രെഡിറ്റീവുകൾ പരിശോധിക്കുക";
 "alerts.recordVideoMessage" = "ഒരു വീഡിയോ സന്ദേശം റെക്കോർഡ് ചെയ്യുക";
 "alerts.recordAudioMessage" = "ഒരു ഓഡിയോ സന്ദേശം റെക്കോർഡ് ചെയ്യുക";
-"alerts.uploadFile" = "ഫയൽ അപ്ലോഡ് ചെയ്യുക";
-"alerts.uploadPhoto" = "ഫോട്ടോയോ സിനിമയോ അപ്ലോഡ് ചെയ്യുക";
+"alerts.uploadFile" = "ഫയൽ അയയ്ക്കുക";
+"alerts.uploadPhoto" = "തുറന്ന ഗാലറി";
 "alerts.locationServiceIsDisabled" = "\"ജാമി\" നിങ്ങളുടെ സ്ഥാനം നിർണ്ണയിക്കാൻ \"ലൊക്കേഷൻ സർവീസസ്\" ഓണാക്കുക.";
 "alerts.locationSharing" = "എന്റെ സ്ഥാനം പങ്കുവെക്കുക";
 "alerts.alreadylocationSharing" = "ഈ ഉപയോക്താവിനൊപ്പം ഇതിനകം സ്ഥാനം പങ്കിടുന്നു";
diff --git a/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings b/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
index 187a511..7309fb9 100644
--- a/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/mn_MN.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Зур QR код";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Танай дансны захирлаар холбогдож чадахгүй байна.";
 "alerts.recordVideoMessage" = "Видео мэдээ бичнэ";
 "alerts.recordAudioMessage" = "Зөгнөлийн мэдээ бичнэ";
-"alerts.uploadFile" = "Татаж файл";
-"alerts.uploadPhoto" = "Сүрэл зураг эсвэл киног борлуула";
+"alerts.uploadFile" = "Файл илгээх";
+"alerts.uploadPhoto" = "Нээлттэй галерея";
 "alerts.locationServiceIsDisabled" = "\"Жами\" нь таны байр суурийг тодорхойлохын тулд \"Төвийн үйлчилгээ\" -ийг идэвхжүүлээрэй.";
 "alerts.locationSharing" = "Миний байр суурийг хуваалцаарай";
 "alerts.alreadylocationSharing" = "Энэ хэрэглэгчийн байр суурийг хэдийнээ хуваалцаж байна";
diff --git a/Ring/Ring/Resources/mr.lproj/Localizable.strings b/Ring/Ring/Resources/mr.lproj/Localizable.strings
index e16ceba..911c174 100644
--- a/Ring/Ring/Resources/mr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/mr.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "खराब क्यूआर कोड";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "प्रदान केलेल्या खाते व्यवस्थापकाशी संपर्क साधू शकत नाही. कृपया आपली ओळखपत्रे तपासा";
 "alerts.recordVideoMessage" = "व्हिडिओ संदेश रेकॉर्ड करा";
 "alerts.recordAudioMessage" = "ऑडिओ संदेश रेकॉर्ड करा";
-"alerts.uploadFile" = "फाईल अपलोड करा";
-"alerts.uploadPhoto" = "फोटो किंवा चित्रपट अपलोड करा";
+"alerts.uploadFile" = "फाइल पाठवा";
+"alerts.uploadPhoto" = "उघडलेली गॅलरी";
 "alerts.locationServiceIsDisabled" = "\"जामी\" ला तुमचे स्थान निश्चित करण्यासाठी \"स्थान सेवा\" चालू करा.";
 "alerts.locationSharing" = "माझे स्थान सामायिक करा";
 "alerts.alreadylocationSharing" = "या वापरकर्त्यासह आधीच स्थान सामायिक करा";
diff --git a/Ring/Ring/Resources/ms.lproj/Localizable.strings b/Ring/Ring/Resources/ms.lproj/Localizable.strings
index 52a5b5f..1f48c31 100644
--- a/Ring/Ring/Resources/ms.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ms.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "മോശം ക്യുആർ കോഡ്";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "നൽകിയിരിക്കുന്ന അക്കൌണ്ട് മാനേജറുമായി ബന്ധപ്പെടാനായില്ല. ദയവായി നിങ്ങളുടെ ക്രെഡിറ്റീവുകൾ പരിശോധിക്കുക";
 "alerts.recordVideoMessage" = "ഒരു വീഡിയോ സന്ദേശം റെക്കോർഡ് ചെയ്യുക";
 "alerts.recordAudioMessage" = "ഒരു ഓഡിയോ സന്ദേശം റെക്കോർഡ് ചെയ്യുക";
-"alerts.uploadFile" = "ഫയൽ അപ്ലോഡ് ചെയ്യുക";
-"alerts.uploadPhoto" = "ഫോട്ടോയോ സിനിമയോ അപ്ലോഡ് ചെയ്യുക";
+"alerts.uploadFile" = "Hantar fail";
+"alerts.uploadPhoto" = "തുറന്ന ഗാലറി";
 "alerts.locationServiceIsDisabled" = "\"ജാമി\" നിങ്ങളുടെ സ്ഥാനം നിർണ്ണയിക്കാൻ \"ലൊക്കേഷൻ സർവീസസ്\" ഓണാക്കുക.";
 "alerts.locationSharing" = "എന്റെ സ്ഥാനം പങ്കുവെക്കുക";
 "alerts.alreadylocationSharing" = "ഈ ഉപയോക്താവിനൊപ്പം ഇതിനകം സ്ഥാനം പങ്കിടുന്നു";
diff --git a/Ring/Ring/Resources/nb.lproj/Localizable.strings b/Ring/Ring/Resources/nb.lproj/Localizable.strings
index f692e9f..cb82a41 100644
--- a/Ring/Ring/Resources/nb.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nb.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Ugyldig QR kode";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Kan ikke koble til den angitte kontoadministratoren. Vennligst kontroller dine opplysninger";
 "alerts.recordVideoMessage" = "Ta opp en videomelding";
 "alerts.recordAudioMessage" = "Ta opp en lydmelding";
-"alerts.uploadFile" = "Last opp fil";
-"alerts.uploadPhoto" = "Last opp foto eller film";
+"alerts.uploadFile" = "Send fil";
+"alerts.uploadPhoto" = "Åpne galleriet";
 "alerts.locationServiceIsDisabled" = "Slå på \"Lokasjonstjenester\" for å la \"Jami\" bestemme posisjonen din.";
 "alerts.locationSharing" = "Del min lokasjon";
 "alerts.alreadylocationSharing" = "Deler allerede lokasjon med denne brukeren";
diff --git a/Ring/Ring/Resources/ne.lproj/Localizable.strings b/Ring/Ring/Resources/ne.lproj/Localizable.strings
index 12b2159..4950f7c 100644
--- a/Ring/Ring/Resources/ne.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ne.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "खराब QR कोड";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "खाता प्रबन्धकसँग सम्पर्क गर्न सकिएन। कृपया आफ्नो परिचयपत्र जाँच गर्नुहोस्";
 "alerts.recordVideoMessage" = "भिडियो सन्देश रेकर्ड गर्नुहोस्";
 "alerts.recordAudioMessage" = "एउटा अडियो सन्देश रेकर्ड गर्नुहोस्";
-"alerts.uploadFile" = "फाइल अपलोड गर्नुहोस्";
-"alerts.uploadPhoto" = "फोटो वा चलचित्र अपलोड गर्नुहोस्";
+"alerts.uploadFile" = "फाइलहरू पठाउनुहोस्";
+"alerts.uploadPhoto" = "खुला ग्यालरी";
 "alerts.locationServiceIsDisabled" = "\"जामी\" ले तपाईंको स्थान निर्धारण गर्न \"स्थान सेवाहरू\" खोल्नुहोस्।";
 "alerts.locationSharing" = "मेरो स्थान साझा गर्नुहोस्";
 "alerts.alreadylocationSharing" = "यो प्रयोगकर्तासँग स्थान साझा गर्नु";
diff --git a/Ring/Ring/Resources/nl.lproj/Localizable.strings b/Ring/Ring/Resources/nl.lproj/Localizable.strings
index 39f9ae0..c0e0254 100644
--- a/Ring/Ring/Resources/nl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Verkeerde QR-code";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Kan niet aansluiten op de rekeningmanager.";
 "alerts.recordVideoMessage" = "Een video bericht opnemen";
 "alerts.recordAudioMessage" = "Een audiobericht opnemen";
-"alerts.uploadFile" = "Upload bestand";
-"alerts.uploadPhoto" = "Foto of film uploaden";
+"alerts.uploadFile" = "Bestand verzenden";
+"alerts.uploadPhoto" = "Open galerij";
 "alerts.locationServiceIsDisabled" = "Sluit \"Location Services\" aan om \"Jami\" toe te staan om uw locatie te bepalen.";
 "alerts.locationSharing" = "Deel mijn locatie";
 "alerts.alreadylocationSharing" = "Al met deze gebruiker delen";
diff --git a/Ring/Ring/Resources/nn.lproj/Localizable.strings b/Ring/Ring/Resources/nn.lproj/Localizable.strings
index 448f2b2..417e1d2 100644
--- a/Ring/Ring/Resources/nn.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nn.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Dåleg QR-kod";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Kan ikkje samlast med kontoleiaren. Vennligst sjekk legitimasjonane dine";
 "alerts.recordVideoMessage" = "Ta opp ein video melding";
 "alerts.recordAudioMessage" = "Ta opp ein lydmelding";
-"alerts.uploadFile" = "Uploader file";
-"alerts.uploadPhoto" = "La opp foton eller film";
+"alerts.uploadFile" = "Sende fil";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Legg på \"Lokasjonstjenester\" for at \"Jami\" kan finne stad.";
 "alerts.locationSharing" = "De deler plasseringa mi";
 "alerts.alreadylocationSharing" = "Aller deling av plassering med denne brukaren";
diff --git a/Ring/Ring/Resources/oc.lproj/Localizable.strings b/Ring/Ring/Resources/oc.lproj/Localizable.strings
index 4d1ce9b..43fc37c 100644
--- a/Ring/Ring/Resources/oc.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/oc.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Marrit QR còdi";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Pas se pòt connectar al administrador de compte.";
 "alerts.recordVideoMessage" = "Enregistrar un messatge vidèo";
 "alerts.recordAudioMessage" = "Enregistrar un messatge àudio";
-"alerts.uploadFile" = "Enviar fichièr";
-"alerts.uploadPhoto" = "Enviar una fòto o un film";
+"alerts.uploadFile" = "Enviar un fichiè";
+"alerts.uploadPhoto" = "Galeria dobèrta";
 "alerts.locationServiceIsDisabled" = "Activar \"Servicis de localizacion\" per permetre a \"Jami\" de determinar sa localizacion.";
 "alerts.locationSharing" = "Comparta ma localizacion";
 "alerts.alreadylocationSharing" = "Ja partatge de l'emplec amb aqueste utilizaire";
diff --git a/Ring/Ring/Resources/pa.lproj/Localizable.strings b/Ring/Ring/Resources/pa.lproj/Localizable.strings
index 4ca703e..419a5b4 100644
--- a/Ring/Ring/Resources/pa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pa.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Cannot connect to provided account manager. Please check your credentials";
 "alerts.recordVideoMessage" = "Record a video message";
 "alerts.recordAudioMessage" = "Record an audio message";
-"alerts.uploadFile" = "Upload file";
-"alerts.uploadPhoto" = "Upload photo or movie";
+"alerts.uploadFile" = "ਫ਼ਾਈਲ ਭੇਜੋ";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Turn on \"Location Services\" to allow \"Jami\" to determine your location.";
 "alerts.locationSharing" = "Share my location";
 "alerts.alreadylocationSharing" = "Already sharing location with this user";
diff --git a/Ring/Ring/Resources/pl.lproj/Localizable.strings b/Ring/Ring/Resources/pl.lproj/Localizable.strings
index 4ac2099..d9a9512 100644
--- a/Ring/Ring/Resources/pl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl.lproj/Localizable.strings
@@ -45,9 +45,11 @@
 "global.copy" = "Skopiuj";
 "global.reply" = "Odpowiedz";
 "global.search" = "Szukanie...";
-"global.donate" = "Donate";
+"global.donate" = "Przekaż darowiznę";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Niepoprawny kod QR";
@@ -97,7 +99,7 @@
 "smartlist.aboutJami" = "O Jami";
 "smartlist.inviteFriends" = "Invite friends";
 "smartlist.accounts" = "Account list";
-"smartlist.disableDonation" = "Not now";
+"smartlist.disableDonation" = "Nie w tej chwili";
 "smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, would you make a donation?";
 
 //Conversation
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Nie można połączyć się z podanym menedżerem konta. Sprawdź swoje poświadczenia.";
 "alerts.recordVideoMessage" = "Nagraj wiadomość wideo";
 "alerts.recordAudioMessage" = "Nagraj wiadomość głosową";
-"alerts.uploadFile" = "Prześlij plik";
-"alerts.uploadPhoto" = "Prześlij zdjęcie lub film";
+"alerts.uploadFile" = "Wyślij plik";
+"alerts.uploadPhoto" = "Otwarta galeria";
 "alerts.locationServiceIsDisabled" = "Włącz \"Usługi lokalizacyjne\", aby pozwolić \"Jami\" na określenie Twojej lokalizacji.";
 "alerts.locationSharing" = "Udostępnij moją lokalizację";
 "alerts.alreadylocationSharing" = "Już udostępniasz lokalizację temu użytkownikowi";
diff --git a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
index 521ab66..356454e 100644
--- a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
@@ -45,9 +45,11 @@
 "global.copy" = "Kopiuj";
 "global.reply" = "Odpowiedz";
 "global.search" = "Szukanie";
-"global.donate" = "Donate";
+"global.donate" = "Przekaż darowiznę";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Niepoprawny kod QR";
@@ -97,7 +99,7 @@
 "smartlist.aboutJami" = "O Jami";
 "smartlist.inviteFriends" = "Invite friends";
 "smartlist.accounts" = "Account list";
-"smartlist.disableDonation" = "Not now";
+"smartlist.disableDonation" = "Nie w tej chwili";
 "smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, would you make a donation?";
 
 //Conversation
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Nie można połączyć się z podanym menedżerem konta. Sprawdź swoje poświadczenia.";
 "alerts.recordVideoMessage" = "Nagraj wiadomość wideo";
 "alerts.recordAudioMessage" = "Nagraj wiadomość głosową";
-"alerts.uploadFile" = "Prześlij plik";
-"alerts.uploadPhoto" = "Prześlij zdjęcie lub film";
+"alerts.uploadFile" = "Wyślij plik";
+"alerts.uploadPhoto" = "Otwarta galeria";
 "alerts.locationServiceIsDisabled" = "Włącz \"Usługi lokalizacyjne\", aby pozwolić \"Jami\" na określenie Twojej lokalizacji.";
 "alerts.locationSharing" = "Udostępnij moją lokalizację";
 "alerts.alreadylocationSharing" = "Już udostępniasz lokalizację temu użytkownikowi";
diff --git a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
index 969ad10..6b89dfd 100644
--- a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Código QR ilegível";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Não foi possível conectar-se ao gestor de conta fornecido. Por favor, verifique suas credenciais";
 "alerts.recordVideoMessage" = "Gravar uma mensagem de vídeo";
 "alerts.recordAudioMessage" = "Gravar uma mensagem de áudio";
-"alerts.uploadFile" = "Upload de arquivo";
-"alerts.uploadPhoto" = "Upload de foto ou vídeo";
+"alerts.uploadFile" = "Enviar arquivo";
+"alerts.uploadPhoto" = "Abrir galeria";
 "alerts.locationServiceIsDisabled" = "Ative os \"Serviços de Localização\" para permitir que \"Jami\" determine sua localização.";
 "alerts.locationSharing" = "Compartilhar minha localização";
 "alerts.alreadylocationSharing" = "Já compartilhando localização com este usuário";
diff --git a/Ring/Ring/Resources/pt.lproj/Localizable.strings b/Ring/Ring/Resources/pt.lproj/Localizable.strings
index 85c56e2..c9bbcf5 100644
--- a/Ring/Ring/Resources/pt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Código QR inválido";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Não foi possível conectar-se ao gestor de conta fornecido. Por favor, verifique suas credenciais";
 "alerts.recordVideoMessage" = "Gravar mensagem de vídeo";
 "alerts.recordAudioMessage" = "Gravar mensagem de áudio";
-"alerts.uploadFile" = "Upload de arquivo";
-"alerts.uploadPhoto" = "Upload de foto ou vídeo";
+"alerts.uploadFile" = "Enviar ficheiro";
+"alerts.uploadPhoto" = "Abrir galeria";
 "alerts.locationServiceIsDisabled" = "Ative os \"Serviços de Localização\" para permitir que \"Jami\" determine sua localização.";
 "alerts.locationSharing" = "Compartilhar minha localização";
 "alerts.alreadylocationSharing" = "Já compartilhando localização com este usuário";
diff --git a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
index 5a52f76..3964e79 100644
--- a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Código QR inválido";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Não foi possível ligar ao gestor de conta especificado.\nPor favor verifique as suas credenciais";
 "alerts.recordVideoMessage" = "Gravar mensagem de vídeo";
 "alerts.recordAudioMessage" = "Gravar mensagem de áudio";
-"alerts.uploadFile" = "Upload de arquivo";
-"alerts.uploadPhoto" = "Upload de foto ou vídeo";
+"alerts.uploadFile" = "Enviar ficheiro";
+"alerts.uploadPhoto" = "Abrir galeria";
 "alerts.locationServiceIsDisabled" = "Ative os \"Serviços de Localização\" para permitir que \"Jami\" determine sua localização.";
 "alerts.locationSharing" = "Compartilhar minha localização";
 "alerts.alreadylocationSharing" = "Já compartilhando localização com este usuário";
diff --git a/Ring/Ring/Resources/ro.lproj/Localizable.strings b/Ring/Ring/Resources/ro.lproj/Localizable.strings
index 5b9689f..f3ddd4a 100644
--- a/Ring/Ring/Resources/ro.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Răspunde";
 "global.search" = "Se caută...";
 "global.donate" = "Donează";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Șterge mesajul";
+"global.deleteFile" = "Șterge fișierul din aparat";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Codul QR e greșit";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Dacă îți place să folosești Jami și crezi că misiunea noastră este importantă, poți face o donație?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Scrie pentru ";
 "conversation.explanationSendingLocationTo" = "Acum, poziția ta este distribuită către ";
 "conversation.explanationReceivingLocationFrom" = "Acum, primești poziția în direct de la ";
 "conversation.errorSavingImage" = "Salvarea imaginii nu a reușit";
@@ -115,8 +117,8 @@
 "conversation.synchronizationMessage" = "Se așteaptă ca %@ să se conecteze pentru a sincroniza conversația.";
 "conversation.inReplyTo" = "Răspuns pentru";
 "conversation.repliedTo" = " a răspuns pentru";
-"conversation.yourself" = "yourself";
-"conversation.edited" = "edited";
+"conversation.yourself" = "tu";
+"conversation.edited" = "modificat";
 "conversation.deletedMessage" = "a șters un mesaj";
 
 //Invitations
@@ -203,7 +205,7 @@
 "alerts.recordVideoMessage" = "Înregistrează un mesaj video";
 "alerts.recordAudioMessage" = "Înregistrează un mesaj vocal";
 "alerts.uploadFile" = "Trimite un fișier";
-"alerts.uploadPhoto" = "Trimite o poză sau un video";
+"alerts.uploadPhoto" = "Deschide galeria";
 "alerts.locationServiceIsDisabled" = "Activează „Localizarea” pentru ca Jami să poată stabili poziția ta.";
 "alerts.locationSharing" = "Trimite poziția mea";
 "alerts.alreadylocationSharing" = "Se trimite deja poziția către acest utilizator";
diff --git a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
index c1b1dcc..acef43a 100644
--- a/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro_RO.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Răspunde";
 "global.search" = "Se caută...";
 "global.donate" = "Donează";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Șterge mesajul";
+"global.deleteFile" = "Șterge fișierul din aparat";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Codul QR e greșit";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Dacă îți place să folosești Jami și crezi că misiunea noastră este importantă, poți face o donație?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Scrie pentru ";
 "conversation.explanationSendingLocationTo" = "Acum, poziția ta este distribuită către ";
 "conversation.explanationReceivingLocationFrom" = "Acum, primești poziția în direct de la ";
 "conversation.errorSavingImage" = "Salvarea imaginii nu a reușit";
@@ -115,8 +117,8 @@
 "conversation.synchronizationMessage" = "Se așteaptă ca %@ să se conecteze pentru a sincroniza conversația.";
 "conversation.inReplyTo" = "Răspuns pentru";
 "conversation.repliedTo" = " a răspuns pentru";
-"conversation.yourself" = "yourself";
-"conversation.edited" = "edited";
+"conversation.yourself" = "tu";
+"conversation.edited" = "modificat";
 "conversation.deletedMessage" = "a șters un mesaj";
 
 //Invitations
@@ -203,7 +205,7 @@
 "alerts.recordVideoMessage" = "Înregistrează un mesaj video";
 "alerts.recordAudioMessage" = "Înregistrează un mesaj vocal";
 "alerts.uploadFile" = "Trimite un fișier";
-"alerts.uploadPhoto" = "Trimite o poză sau un video";
+"alerts.uploadPhoto" = "Deschide galeria";
 "alerts.locationServiceIsDisabled" = "Activează „Localizarea” pentru ca Jami să poată stabili poziția ta.";
 "alerts.locationSharing" = "Trimite poziția mea";
 "alerts.alreadylocationSharing" = "Se trimite deja poziția către acest utilizator";
diff --git a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
index 45dcc9b..7af2ea6 100644
--- a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Плохой QR-code";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Не удалось подключиться к предоставленному менеджеру учетных записей. Пожалуйста, проверьте Ваши учетные данные.";
 "alerts.recordVideoMessage" = "Записать видео-сообщение";
 "alerts.recordAudioMessage" = "Записать голосовое сообщение";
-"alerts.uploadFile" = "Загрузить файл";
-"alerts.uploadPhoto" = "Загрузить фото или видео";
+"alerts.uploadFile" = "Отправить файл";
+"alerts.uploadPhoto" = "Открыть галерею";
 "alerts.locationServiceIsDisabled" = "Включите «Службы определения местоположения», чтобы позволить \"Jami\" определять ваше местоположение.";
 "alerts.locationSharing" = "Транслировать мое местоположение";
 "alerts.alreadylocationSharing" = "Местоположением с этим пользователем уже поделился";
diff --git a/Ring/Ring/Resources/ru.lproj/Localizable.strings b/Ring/Ring/Resources/ru.lproj/Localizable.strings
index 94a8a49..f62ae2d 100644
--- a/Ring/Ring/Resources/ru.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Некорректный QR-код";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Не удалось подключиться к предоставленному менеджеру учетных записей. Пожалуйста, проверьте Ваши учетные данные.";
 "alerts.recordVideoMessage" = "Записать видео-сообщение";
 "alerts.recordAudioMessage" = "Записать голосовое сообщение";
-"alerts.uploadFile" = "Загрузить файл";
-"alerts.uploadPhoto" = "Загрузить фото или видео";
+"alerts.uploadFile" = "Отправить файл";
+"alerts.uploadPhoto" = "Открыть галерею";
 "alerts.locationServiceIsDisabled" = "Включите «Службы определения местоположения», чтобы позволить \"Jami\" определять ваше местоположение.";
 "alerts.locationSharing" = "Транслировать мое местоположение";
 "alerts.alreadylocationSharing" = "Местоположением с этим пользователем уже поделился";
diff --git a/Ring/Ring/Resources/si.lproj/Localizable.strings b/Ring/Ring/Resources/si.lproj/Localizable.strings
index 9dabb06..04830f6 100644
--- a/Ring/Ring/Resources/si.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/si.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Bad QR code";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Cannot connect to provided account manager. Please check your credentials";
 "alerts.recordVideoMessage" = "Record a video message";
 "alerts.recordAudioMessage" = "Record an audio message";
-"alerts.uploadFile" = "Upload file";
-"alerts.uploadPhoto" = "Upload photo or movie";
+"alerts.uploadFile" = "ගොනුව යවන්න";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Turn on \"Location Services\" to allow \"Jami\" to determine your location.";
 "alerts.locationSharing" = "Share my location";
 "alerts.alreadylocationSharing" = "Already sharing location with this user";
diff --git a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
index 247d2d8..37495ba 100644
--- a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Zlý QR kód";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Nedá sa pripojiť k danému správcovi účtov. Skontrolujte prosím vaše prístupové údaje.";
 "alerts.recordVideoMessage" = "Zaznamenať video správu";
 "alerts.recordAudioMessage" = "Zaznamenať audio správu";
-"alerts.uploadFile" = "Nahrať súbor";
-"alerts.uploadPhoto" = "Nahrať fotografiu alebo film";
+"alerts.uploadFile" = "Poslať súbor";
+"alerts.uploadPhoto" = "Otvorená galéria";
 "alerts.locationServiceIsDisabled" = "Vypnite \"Služby umiestnenia\", aby \"Jami\" určil vašu polohu.";
 "alerts.locationSharing" = "Zdieľajte moju polohu";
 "alerts.alreadylocationSharing" = "Už zdieľanie polohy s týmto používateľom";
diff --git a/Ring/Ring/Resources/sk.lproj/Localizable.strings b/Ring/Ring/Resources/sk.lproj/Localizable.strings
index 353c0f9..7d2ddfb 100644
--- a/Ring/Ring/Resources/sk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Zlý QR kód";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Nedá sa pripojiť k danému správcovi účtov. Skontrolujte prosím vaše prístupové údaje.";
 "alerts.recordVideoMessage" = "Zaznamenať video správu";
 "alerts.recordAudioMessage" = "Zaznamenať audio správu";
-"alerts.uploadFile" = "Nahrať súbor";
-"alerts.uploadPhoto" = "Nahrať fotografiu alebo film";
+"alerts.uploadFile" = "Odoslať súbor";
+"alerts.uploadPhoto" = "Otvorená galéria";
 "alerts.locationServiceIsDisabled" = "Vypnite \"Služby umiestnenia\", aby \"Jami\" určil vašu polohu.";
 "alerts.locationSharing" = "Zdieľajte moju polohu";
 "alerts.alreadylocationSharing" = "Už zdieľanie polohy s týmto používateľom";
diff --git a/Ring/Ring/Resources/sl.lproj/Localizable.strings b/Ring/Ring/Resources/sl.lproj/Localizable.strings
index 58e0171..f1eb4a1 100644
--- a/Ring/Ring/Resources/sl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sl.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Odgovori";
 "global.search" = "Iskanje ...";
 "global.donate" = "Donirajte";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Izbriši sporočilo";
+"global.deleteFile" = "Izbriši datoteko z naprave";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Napačna QR-koda";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "S podanim upravljalnikom računa se ni mogoče povezati. Preverite poverilnice";
 "alerts.recordVideoMessage" = "Posnemi video sporočilo";
 "alerts.recordAudioMessage" = "Posnemi zvočno sporočilo";
-"alerts.uploadFile" = "Naloži datoteko";
-"alerts.uploadPhoto" = "Naloži sliko ali film";
+"alerts.uploadFile" = "Pošlji datoteko";
+"alerts.uploadPhoto" = "Odpri galerijo";
 "alerts.locationServiceIsDisabled" = "Vklopite »Location services«, da omogočite Jami, da določi vašo lokacijo.";
 "alerts.locationSharing" = "Deli mojo lokacijo";
 "alerts.alreadylocationSharing" = "S tem uporabnikom že delim lokacijo";
diff --git a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
index 54870da..c9dfcb5 100644
--- a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
@@ -46,8 +46,10 @@
 "global.reply" = "Përgjigjuni";
 "global.search" = "Po kërkohet…";
 "global.donate" = "Dhuroni";
-"global.deleteMessage" = "Delete Message";
-"global.deleteFile" = "Delete File from device";
+"global.deleteMessage" = "Fshije Mesazhin";
+"global.deleteFile" = "Fshije Kartelën prej pajisjeje";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Kod QR i gabuar";
@@ -101,7 +103,7 @@
 "smartlist.donationExplanation" = "Nëse ju shijon të përdorni Jami-n dhe besoni në misionin tonë, a do të bënit një dhurim?";
 
 //Conversation
-"conversation.messagePlaceholder" = "Write to ";
+"conversation.messagePlaceholder" = "Shkruajini";
 "conversation.explanationSendingLocationTo" = "Aktualisht e ndani vendndodhjen tuaj me ";
 "conversation.explanationReceivingLocationFrom" = "Aktualisht merrni drejtpërdrejt vendndodhje nga";
 "conversation.errorSavingImage" = "S’u arrit të ruhej figurë te galeri";
@@ -114,8 +116,8 @@
 "conversation.synchronizationTitle" = "Keni pranuar kërkesën për bisedë.";
 "conversation.synchronizationMessage" = "Po presim që %@ të lidhet për të njëkohësuar bisedën.";
 "conversation.inReplyTo" = "Në përgjigje të";
-"conversation.repliedTo" = "replied to";
-"conversation.yourself" = "yourself";
+"conversation.repliedTo" = "iu përgjigj";
+"conversation.yourself" = "vetes";
 "conversation.edited" = "edited";
 "conversation.deletedMessage" = "fshiu një mesazh";
 
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "S’lidhet dot te përgjegjësi i dhënë i llogarive. Ju lutemi, kontrolloni kredencialet tuaja";
 "alerts.recordVideoMessage" = "Regjistroni një mesazh video";
 "alerts.recordAudioMessage" = "Incizoni një mesazh audio";
-"alerts.uploadFile" = "Ngarkoni kartelë";
-"alerts.uploadPhoto" = "Ngarkoni foto ose film";
+"alerts.uploadFile" = "Dërgo kartelë";
+"alerts.uploadPhoto" = "Hap galerinë";
 "alerts.locationServiceIsDisabled" = "Për ta lejuar Jami-in të përcaktojë vendndodhjen tuaj, aktivizoni “Shërbime Vendndodhjesh”.";
 "alerts.locationSharing" = "Jepua vendndodhjen time";
 "alerts.alreadylocationSharing" = "Ia keni dhënë tashmë vendndodhjen këtij përdoruesi";
diff --git a/Ring/Ring/Resources/sr.lproj/Localizable.strings b/Ring/Ring/Resources/sr.lproj/Localizable.strings
index dfa764a..e6c8699 100644
--- a/Ring/Ring/Resources/sr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr.lproj/Localizable.strings
@@ -45,9 +45,11 @@
 "global.copy" = "Kopiraj";
 "global.reply" = "Odgovori";
 "global.search" = "Трагајући...";
-"global.donate" = "Donate";
+"global.donate" = "Doniraj";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Лош QR код";
@@ -97,8 +99,8 @@
 "smartlist.aboutJami" = "O Jami";
 "smartlist.inviteFriends" = "Invite friends";
 "smartlist.accounts" = "Account list";
-"smartlist.disableDonation" = "Not now";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, would you make a donation?";
+"smartlist.disableDonation" = "Ne sada";
+"smartlist.donationExplanation" = "Ako uživate u korišćenju Jami-ja i verujete u našu misiju, da li biste dali donaciju?";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write to ";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Не могу се повезити са испорученим управљачем рачуна.";
 "alerts.recordVideoMessage" = "Запишите видео поруку";
 "alerts.recordAudioMessage" = "Запишите аудио поруку";
-"alerts.uploadFile" = "Унесите датотеку";
-"alerts.uploadPhoto" = "Уведите фотографију или филм";
+"alerts.uploadFile" = "Pošalji datoteku";
+"alerts.uploadPhoto" = "Otvori galeriju";
 "alerts.locationServiceIsDisabled" = "Пожелите \"Сlužбе за локацију\" да \"Джеми\" утврди вашу локацију.";
 "alerts.locationSharing" = "Поделити моје место.";
 "alerts.alreadylocationSharing" = "Већ деле локацију са овим корисником";
diff --git a/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings b/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
index cacb421..d7d9c93 100644
--- a/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sr@Cyrl.lproj/Localizable.strings
@@ -19,19 +19,19 @@
  */
 
 // Global
-"global.accountSettings" = "Постављања рачуна";
-"global.advancedSettings" = "Насочни настройки";
-"global.username" = "Korisničko ime";
-"global.recommended" = "Preporučeno";
-"global.password" = "Šifra";
+"global.accountSettings" = "Подешавања налога";
+"global.advancedSettings" = "Напредна подешавања";
+"global.username" = "Корисничко име";
+"global.recommended" = "Препоручено";
+"global.password" = "Лозинка";
 "global.registerAUsername" = "Регистрирајте корисничко име";
-"global.enterPassword" = "Уведите лозинку";
-"global.enterUsername" = "Унесите Име корисника";
-"global.cancel" = "Otkaži";
-"global.blockContact" = "Блоковање контакта";
-"global.removeAccount" = "Увајање рачуна";
-"global.incomingCall" = "Dolazeći poziv";
-"global.ok" = "U redu";
+"global.enterPassword" = "Унесите лозинку";
+"global.enterUsername" = "Унесите корисничко име";
+"global.cancel" = "Откажи";
+"global.blockContact" = "Блокирај контакт";
+"global.removeAccount" = "Уклони налог";
+"global.incomingCall" = "Долазни позив";
+"global.ok" = "Ок";
 "global.close" = "У близини";
 "global.share" = "Podeli";
 "global.forward" = "Назад";
@@ -45,9 +45,11 @@
 "global.copy" = "Kopiraj";
 "global.reply" = "Odgovori";
 "global.search" = "Трагајући...";
-"global.donate" = "Donate";
+"global.donate" = "Doniraj";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Лош QR код";
@@ -97,8 +99,8 @@
 "smartlist.aboutJami" = "O Jami";
 "smartlist.inviteFriends" = "Invite friends";
 "smartlist.accounts" = "Account list";
-"smartlist.disableDonation" = "Not now";
-"smartlist.donationExplanation" = "If you enjoy using Jami and believe in our mission, would you make a donation?";
+"smartlist.disableDonation" = "Ne sada";
+"smartlist.donationExplanation" = "Ako uživate u korišćenju Jami-ja i verujete u našu misiju, da li biste dali donaciju?";
 
 //Conversation
 "conversation.messagePlaceholder" = "Write to ";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Не могу се повезити са испорученим управљачем рачуна.";
 "alerts.recordVideoMessage" = "Запишите видео поруку";
 "alerts.recordAudioMessage" = "Запишите аудио поруку";
-"alerts.uploadFile" = "Унесите датотеку";
-"alerts.uploadPhoto" = "Уведите фотографију или филм";
+"alerts.uploadFile" = "Пошаљи датотеку";
+"alerts.uploadPhoto" = "Отвори галерију";
 "alerts.locationServiceIsDisabled" = "Пожелите \"Сlužбе за локацију\" да \"Джеми\" утврди вашу локацију.";
 "alerts.locationSharing" = "Поделити моје место.";
 "alerts.alreadylocationSharing" = "Већ деле локацију са овим корисником";
diff --git a/Ring/Ring/Resources/sv.lproj/Localizable.strings b/Ring/Ring/Resources/sv.lproj/Localizable.strings
index 6052999..46c0089 100644
--- a/Ring/Ring/Resources/sv.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sv.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Felaktig QR-kod";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Kan inte ansluta till kontoinställningar. Vänligen kontrollera dina uppgifter. ";
 "alerts.recordVideoMessage" = "Spela in ett videomeddelande";
 "alerts.recordAudioMessage" = "Spela in ett ljudmeddelande";
-"alerts.uploadFile" = "Ladda upp fil";
-"alerts.uploadPhoto" = "Ladda upp foto eller film";
+"alerts.uploadFile" = "Skicka fil";
+"alerts.uploadPhoto" = "Öppet galleri";
 "alerts.locationServiceIsDisabled" = "Slå på \"Lokala tjänster\" för att tillåta Jami hitta din plats. ";
 "alerts.locationSharing" = "Dela min plats";
 "alerts.alreadylocationSharing" = "Du delar redan platsinformation med denna användare";
diff --git a/Ring/Ring/Resources/sw.lproj/Localizable.strings b/Ring/Ring/Resources/sw.lproj/Localizable.strings
index cffa241..1cd0f6e 100644
--- a/Ring/Ring/Resources/sw.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sw.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Nambari mbaya ya QR";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Haiwezi kuungana na meneja wa akaunti iliyotolewa. Tafadhali angalia sifa zako";
 "alerts.recordVideoMessage" = "Rekodi ujumbe wa video";
 "alerts.recordAudioMessage" = "Rekodi ujumbe wa sauti";
-"alerts.uploadFile" = "Pakia faili";
-"alerts.uploadPhoto" = "Pakia picha au filamu";
+"alerts.uploadFile" = "Tuma faili";
+"alerts.uploadPhoto" = "Maonyesho ya wazi";
 "alerts.locationServiceIsDisabled" = "Weka \"Huduma za Mahali\" ili \"Jami\" aamue mahali pako.";
 "alerts.locationSharing" = "Shiriki eneo langu";
 "alerts.alreadylocationSharing" = "Tayari kushiriki eneo na mtumiaji huyu";
diff --git a/Ring/Ring/Resources/ta.lproj/Localizable.strings b/Ring/Ring/Resources/ta.lproj/Localizable.strings
index 1a428ee..c1db37b 100644
--- a/Ring/Ring/Resources/ta.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ta.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "கெட்ட QR குறியீடு";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "வழங்கப்பட்ட கணக்கு மேலாளருடன் இணைக்க முடியவில்லை. தயவுசெய்து உங்கள் சான்றிதழ்களை சரிபார்க்கவும்";
 "alerts.recordVideoMessage" = "வீடியோ செய்தியை பதிவு செய்யவும்";
 "alerts.recordAudioMessage" = "ஒரு ஆடியோ செய்தியை பதிவு செய்யவும்";
-"alerts.uploadFile" = "கோப்பு பதிவேற்ற";
-"alerts.uploadPhoto" = "புகைப்படம் அல்லது திரைப்படத்தை பதிவேற்றவும்";
+"alerts.uploadFile" = "கோப்பை அனுப்பு";
+"alerts.uploadPhoto" = "திறந்த கேலரி";
 "alerts.locationServiceIsDisabled" = "\"இங்கு இருப்பிட சேவைகள்\" என்பதை இயக்கவும், \"ஜாமி\" உங்கள் இருப்பிடத்தை தீர்மானிக்க அனுமதிக்கும்.";
 "alerts.locationSharing" = "என் இருப்பிடத்தை பகிர்ந்து";
 "alerts.alreadylocationSharing" = "ஏற்கனவே இந்த பயனருடன் இருப்பிட பகிர்வு";
diff --git a/Ring/Ring/Resources/te.lproj/Localizable.strings b/Ring/Ring/Resources/te.lproj/Localizable.strings
index e422a0a..b68f33b 100644
--- a/Ring/Ring/Resources/te.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/te.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "చెడ్డ QR కోడ్";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "అందించిన ఖాతా నిర్వాహకుడికి కనెక్ట్ కాలేదు. దయచేసి మీ ఆధారాలను తనిఖీ చేయండి";
 "alerts.recordVideoMessage" = "వీడియో సందేశాన్ని రికార్డ్ చేయండి";
 "alerts.recordAudioMessage" = "ఒక ఆడియో సందేశాన్ని రికార్డ్ చేయండి";
-"alerts.uploadFile" = "ఫైలు అప్లోడ్";
-"alerts.uploadPhoto" = "ఫోటో లేదా సినిమా అప్లోడ్";
+"alerts.uploadFile" = "ఫైల్‌ని పంపు";
+"alerts.uploadPhoto" = "బహిరంగ గ్యాలరీ";
 "alerts.locationServiceIsDisabled" = "\"జామి\" మీ స్థానాన్ని గుర్తించడానికి \"స్థానం సేవలు\" ను ప్రారంభించండి.";
 "alerts.locationSharing" = "నా స్థానాన్ని పంచుకోండి";
 "alerts.alreadylocationSharing" = "ఇప్పటికే ఈ వినియోగదారుతో స్థానం పంచుకోవడం";
diff --git a/Ring/Ring/Resources/th.lproj/Localizable.strings b/Ring/Ring/Resources/th.lproj/Localizable.strings
index 187964f..8684ebb 100644
--- a/Ring/Ring/Resources/th.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/th.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "รหัส QR ที่ไม่ดี";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "ไม่สามารถเชื่อมต่อกับผู้จัดการบัญชีที่ให้บริการ ได้โปรดตรวจสอบข้อมูลความเป็นเจ้าของของคุณ";
 "alerts.recordVideoMessage" = "ถ่ายวีดีโอข้อความ";
 "alerts.recordAudioMessage" = "ถ่ายข้อความเสียง";
-"alerts.uploadFile" = "โหลดไฟล์";
-"alerts.uploadPhoto" = "โหลดรูปภาพหรือหนัง";
+"alerts.uploadFile" = "ส่งไฟล์";
+"alerts.uploadPhoto" = "เปิดแกลเลอรี่";
 "alerts.locationServiceIsDisabled" = "เปิด \"บริการสถานที่\" ให้ \"Jami\" รู้ว่าสถานที่ของคุณ";
 "alerts.locationSharing" = "แบ่งตําแหน่งของฉัน";
 "alerts.alreadylocationSharing" = "แบ่งปันสถานที่กับผู้ใช้งานนี้";
diff --git a/Ring/Ring/Resources/tr.lproj/Localizable.strings b/Ring/Ring/Resources/tr.lproj/Localizable.strings
index 772f3d3..08ea59c 100644
--- a/Ring/Ring/Resources/tr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tr.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Bağış";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Bozuk QR kod";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Sağlanan hesap yöneticisine bağlanılamıyor. Lütfen kimlik bilgilerinizi denetleyin";
 "alerts.recordVideoMessage" = "Görüntülü ileti kaydet ";
 "alerts.recordAudioMessage" = "Sesli ileti kaydet ";
-"alerts.uploadFile" = "Dosya yükle";
-"alerts.uploadPhoto" = "Fotoğraf ya da film yükle";
+"alerts.uploadFile" = "Dosya gönder";
+"alerts.uploadPhoto" = "Galeriyi aç";
 "alerts.locationServiceIsDisabled" = "\"Jami\"nin konumunuzu saptaması için \"Konum Servisleri\"ni açın.";
 "alerts.locationSharing" = "Konumumu paylaş";
 "alerts.alreadylocationSharing" = "Bu kullanıcıyla hâlihazırda konum paylaşılıyor";
diff --git a/Ring/Ring/Resources/tt.lproj/Localizable.strings b/Ring/Ring/Resources/tt.lproj/Localizable.strings
index 5bff3bd..0533c7f 100644
--- a/Ring/Ring/Resources/tt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tt.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Яман QR-код";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Мәгълүматны кертү мөмкин түгел.";
 "alerts.recordVideoMessage" = "Видеоязманы яздырыгыз";
 "alerts.recordAudioMessage" = "Аудиоязма яздырыгыз";
-"alerts.uploadFile" = "Файлны йөкләү";
-"alerts.uploadPhoto" = "Фото яки фильмны йөклә";
+"alerts.uploadFile" = "Файлларны җибәрү";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "\"Җами\"нең сезнең урыны билгеләргә мөмкинлек бирер өчен \"Урынлы урын хезмәтләре\"н эшләтеп куй.";
 "alerts.locationSharing" = "Минем урынымны уртаклашыгыз.";
 "alerts.alreadylocationSharing" = "Әлеге кулланучы белән инде урынны уртаклашу";
diff --git a/Ring/Ring/Resources/uk.lproj/Localizable.strings b/Ring/Ring/Resources/uk.lproj/Localizable.strings
index 885cef0..ac1b1bb 100644
--- a/Ring/Ring/Resources/uk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/uk.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Донат";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Неприйнятний QR-код";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Не можу зв'язатися з наданим менеджером рахунку.";
 "alerts.recordVideoMessage" = "Запишіть відео повідомлення";
 "alerts.recordAudioMessage" = "Запишіть аудіоповість";
-"alerts.uploadFile" = "Завантаження файлу";
-"alerts.uploadPhoto" = "Завантажити фото або фільм";
+"alerts.uploadFile" = "Відправити файл";
+"alerts.uploadPhoto" = "Відкрити галерею";
 "alerts.locationServiceIsDisabled" = "Зверніть \"Сервіси місцезнаходження\", щоб \"Джамі\" визначив ваше місцезнаходження.";
 "alerts.locationSharing" = "Розділіть моє місцезнаходження";
 "alerts.alreadylocationSharing" = "Уже поділяється місцезнаходженням з цим користувачем";
diff --git a/Ring/Ring/Resources/vi.lproj/Localizable.strings b/Ring/Ring/Resources/vi.lproj/Localizable.strings
index 9eba3fb..be63f9a 100644
--- a/Ring/Ring/Resources/vi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/vi.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "Mã QR xấu";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "Không thể kết nối với quản lý tài khoản được cung cấp. Xin vui lòng kiểm tra thông tin tín dụng của bạn";
 "alerts.recordVideoMessage" = "Tải một tin nhắn video";
 "alerts.recordAudioMessage" = "Tải một tin nhắn âm thanh";
-"alerts.uploadFile" = "Tải lên tập tin";
-"alerts.uploadPhoto" = "Lên ảnh hoặc phim";
+"alerts.uploadFile" = "Gửi tập tin";
+"alerts.uploadPhoto" = "Open gallery";
 "alerts.locationServiceIsDisabled" = "Động hoạt \"Sức vụ vị trí\" để \"Jami\" xác định vị trí của bạn.";
 "alerts.locationSharing" = "Chia sẻ vị trí của tôi";
 "alerts.alreadylocationSharing" = "Đã chia sẻ vị trí với người dùng này";
diff --git a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
index c96961e..b8d3f16 100644
--- a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "无法连接到提供的账户管理器。请检查您的凭据。";
 "alerts.recordVideoMessage" = "录制视频信息";
 "alerts.recordAudioMessage" = "录制语音信息";
-"alerts.uploadFile" = "上传文件";
-"alerts.uploadPhoto" = "上传照片或视频";
+"alerts.uploadFile" = "发送文件";
+"alerts.uploadPhoto" = "打开相册";
 "alerts.locationServiceIsDisabled" = "打开”位置服务“以允许 Jami 确定您的位置。";
 "alerts.locationSharing" = "分享我的位置";
 "alerts.alreadylocationSharing" = "已与此用户分享位置";
diff --git a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
index c222fd5..89d161f 100644
--- a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "不正確的 QR code";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "無法連線至提供的帳號管理員。請檢查您的憑證";
 "alerts.recordVideoMessage" = "錄製影片訊息";
 "alerts.recordAudioMessage" = "錄製音訊訊息";
-"alerts.uploadFile" = "上傳檔案";
-"alerts.uploadPhoto" = "上傳照片或電影";
+"alerts.uploadFile" = "傳送檔案";
+"alerts.uploadPhoto" = "開啟相簿";
 "alerts.locationServiceIsDisabled" = "開啟「位置服務」以讓「Jami」確定您的位置。";
 "alerts.locationSharing" = "分享我的位置";
 "alerts.alreadylocationSharing" = "已與此使用者分享位置";
diff --git a/Ring/Ring/Resources/zh.lproj/Localizable.strings b/Ring/Ring/Resources/zh.lproj/Localizable.strings
index 0d31d11..99d9619 100644
--- a/Ring/Ring/Resources/zh.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "无法连接到提供的账户管理器。请检查您的凭据。";
 "alerts.recordVideoMessage" = "录制视频信息";
 "alerts.recordAudioMessage" = "录制语音信息";
-"alerts.uploadFile" = "上传文件";
-"alerts.uploadPhoto" = "上传照片或视频";
+"alerts.uploadFile" = "发送文件";
+"alerts.uploadPhoto" = "開啟相簿";
 "alerts.locationServiceIsDisabled" = "打开”位置服务“以允许 Jami 确定您的位置。";
 "alerts.locationSharing" = "分享我的位置";
 "alerts.alreadylocationSharing" = "已与此用户分享位置";
diff --git a/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings b/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
index 6245012..2fd1f56 100644
--- a/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh_HK.lproj/Localizable.strings
@@ -48,6 +48,8 @@
 "global.donate" = "Donate";
 "global.deleteMessage" = "Delete Message";
 "global.deleteFile" = "Delete File from device";
+"global.editMessage" = "Edit Message";
+"global.editing" = "Edititing";
 
 // Scan
 "scan.badQrCode" = "无效的二维码";
@@ -202,8 +204,8 @@
 "alerts.errorWrongCredentials" = "无法连接到提供的账户管理器。请检查您的凭据。";
 "alerts.recordVideoMessage" = "录制视频信息";
 "alerts.recordAudioMessage" = "录制语音信息";
-"alerts.uploadFile" = "上传文件";
-"alerts.uploadPhoto" = "上传照片或视频";
+"alerts.uploadFile" = "傳送檔案";
+"alerts.uploadPhoto" = "開啟相簿";
 "alerts.locationServiceIsDisabled" = "打开”位置服务“以允许 Jami 确定您的位置。";
 "alerts.locationSharing" = "分享我的位置";
 "alerts.alreadylocationSharing" = "已与此用户分享位置";