diff --git a/app/src/main/play/listings/hi-IN/title.txt b/app/src/main/play/listings/hi-IN/title.txt
index b9a21b0f..cd61bea1 100644
--- a/app/src/main/play/listings/hi-IN/title.txt
+++ b/app/src/main/play/listings/hi-IN/title.txt
@@ -1 +1 @@
-Syncthing
\ No newline at end of file
+सिंकथिंग
\ No newline at end of file
diff --git a/app/src/main/play/listings/si-LK/full-description.txt b/app/src/main/play/listings/si-LK/full-description.txt
index db983a98..bb8fd0c4 100644
--- a/app/src/main/play/listings/si-LK/full-description.txt
+++ b/app/src/main/play/listings/si-LK/full-description.txt
@@ -6,6 +6,6 @@ Syncthing replaces proprietary sync and cloud services with something open, trus
 
 සංසදය: https://forum.syncthing.net/
 
-Issues: https://github.com/syncthing/syncthing-android/issues
+ගැටළු: https://github.com/syncthing/syncthing-android/issues
 
 රහස්‍යතා ප්‍රතිපත්තිය: https://syncthing.net/android-privacy-policy
\ No newline at end of file
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 48c97e6d..076abfc5 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -1,12 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="app_name">सिंकथिंग</string>
   <!--FirstStartActivity-->
   <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">एंड्रॉयड के लिए सिंकथिंग में आपका स्वागत है</string>
   <!--Welcome wizard-->
   <!--Slide 1-->
+  <string name="introduction">परिचय</string>
+  <string name="welcome_text">सिंकथिंग एक ओपन-सोर्स फ़ाइल सिंक्रोनाइज़ेशन एप्लिकेशन है।\n\
+अन्य उपकरणों के साथ डेटा साझा करने के लिए, आपको डिवाइस सूची में उनकी अद्वितीय डिवाइस आईडी जोड़ने की आवश्यकता है। बाद में आप चुन सकते हैं कि कौन से फोल्डर को किन उपकरणों के साथ साझा करना है।\n\
+कृपया गिटहब के माध्यम से आपके सामने आने वाली किसी भी समस्या की रिपोर्ट करें।</string>
   <!--Slide 2-->
+  <string name="storage_permission_title">भंडारण की अनुमति</string>
+  <string name="storage_permission_desc">फ़ाइल सिंक्रनाइज़ेशन करने के लिए सिंकथिंग को आपके संग्रहण तक पहुंचने की आवश्यकता है।</string>
   <!--Slide 3-->
   <!--Generic texts used everywhere-->
+  <string name="back">वापस</string>
+  <string name="cont">जारी</string>
+  <string name="finish">अन्त</string>
+  <string name="generic_example">उदाहरण</string>
   <!--MainActivity-->
   <!--Title of the exit app when running as a service confirmation dialog-->
   <!--Title of the "add folder" menu action-->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 91738a29..5dbb7bfd 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -52,8 +52,9 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <plurals name="files">
     <item quantity="one">%1$d/%2$dArquivo</item>
     <item quantity="many">%1$d/%2$dArquivos</item>
-    <item quantity="other">%1$d/%2$dArquivos</item>
+    <item quantity="other">%1$d/%2$d Arquivos</item>
   </plurals>
+  <string name="override_changes">Sobrepor alterações</string>
   <string name="open_file_manager">Abrir gerenciador de arquivos</string>
   <string name="toast_no_file_manager">Nenhum gerenciador de arquivos compatível foi encontrado</string>
   <!--DevicesFragment-->
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index f6467cd6..fff86f4a 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -3,18 +3,18 @@
   <string name="app_name">සයින්තින්</string>
   <!--FirstStartActivity-->
   <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">ඇන්ඩ්‍රොයිඩ් සඳහා සයින්තින් වෙත සාදරයෙන් පිළිගනිමු</string>
+  <string name="welcome_title">ඇන්ඩ්‍රොයිඩ් සඳහා සයිටින් වෙත සාදරයෙන් පිළිගනිමු</string>
   <!--Welcome wizard-->
   <!--Slide 1-->
   <!--Slide 2-->
   <string name="storage_permission_title">ආචයන අවසරය</string>
   <!--Slide 3-->
-  <string name="location_permission_title">ස්ථානය අවසරය (පසුබිම)</string>
+  <string name="location_permission_title">අවසරය (පසුබිම ස්ථානය)</string>
   <!--Generic texts used everywhere-->
   <string name="back">ආපසු</string>
   <string name="cont">ඉදිරියට</string>
   <string name="finish">නිමයි</string>
-  <string name="generic_example">උදාහරණය</string>
+  <string name="generic_example">ආරම්භය</string>
   <string name="generic_error">දෝෂය</string>
   <string name="accept">පිළිගන්න</string>
   <string name="ignore">නොසලකන්න</string>
@@ -23,37 +23,37 @@
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">බහාලුමක් එකතු කරන්න</string>
   <!--Title of the "share device id" menu action-->
-  <string name="share_device_id">උපාංගයේ හැඳු. බෙදාගන්න</string>
+  <string name="share_device_id">ඇතුළත්ේ හැඳු. බෙදාගන්න</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
-  <string name="send_device_id_to">වෙත උපාංගයේ හැඳු. යවන්න</string>
+  <string name="send_device_id_to">වෙතටේ හැඳු. යවන්න</string>
   <string name="usage_reporting_dialog_title">භාවිතය නිර්නාමික වාර්තා කිරීමට ඉඩ දෙනවාද?</string>
   <string name="yes">ඔව්</string>
   <string name="no">නැහැ</string>
   <string name="open_website">වියමන අඩවිය විවෘත කරන්න</string>
-  <string name="toast_write_storage_permission_required">මෙම යෙදුමට ආචයනයට ලිවීමේ අවසරය ඇවැසිය</string>
+  <string name="toast_write_storage_permission_required">මෙම යෙදුමට ආචයනයට ලිවීමේ අවසරය ඇවැසිය</string>
   <string name="dialog_disable_battery_optimization_later">පසුව</string>
   <string name="dialog_disable_battery_optimization_dont_show_again">නැවත පෙන්වන්න එපා</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
-  <string name="api_loading">පූරණය වෙමින්…</string>
+  <string name="api_loading">පූරණයෙන්…</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--FoldersFragment-->
   <string name="folders_fragment_title">බහාලුම්</string>
   <!--Shown if no folders exist-->
-  <string name="folder_list_empty">බහාලුම් හමු නොවිණි</string>
+  <string name="folder_list_empty">බහාලුම් හමු නොවිණි</string>
   <!--Format string for folder file count-->
   <plurals name="files">
-    <item quantity="one">ගොනු %1$d / %2$d</item>
-    <item quantity="other">ගොනු %1$d / %2$d</item>
+    <item quantity="one">%2$d%1$d</item>
+    <item quantity="other">%2$d%1$d</item>
   </plurals>
   <!--DevicesFragment-->
   <string name="devices_fragment_title">උපාංග</string>
   <!--Shown if no devices exist-->
-  <string name="devices_list_empty">උපාංග හමු නොවිණි</string>
+  <string name="devices_list_empty">උපාංග හමු නොවිණි</string>
   <!--Indicates that a folder is fully synced to the local device-->
   <string name="device_up_to_date">යාවත්කාලීනයි</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
-  <string name="device_syncing">සමමුහූර්ත වෙමින් (%1$d%%)</string>
+  <string name="device_syncing">සමමුහූර්ත ස්ථානයේ (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
   <string name="device_disconnected">විසන්ධියි</string>
   <!--Indicates that the device is paused and does not sync-->
@@ -62,20 +62,20 @@
   <!--Title for current download rate-->
   <!--Title for current upload rate-->
   <!--StatusFragment-->
-  <string name="status_fragment_title">තත්‍වය</string>
-  <string name="syncthing_starting">සයින්තින් ඇරඹෙමින්.</string>
-  <string name="syncthing_running">සයින්තින් ධාවනය වෙමින්.</string>
-  <string name="syncthing_not_running">සයින්තින් ධාවනය නොවේ.</string>
+  <string name="status_fragment_title">තත්ත්වය</string>
+  <string name="syncthing_starting">සෙයින් ලබා ගනී.</string>
+  <string name="syncthing_running">සයින්තින් ධාවනය.</string>
+  <string name="syncthing_not_running">සයින්ටින් ධාවනය නොවේ.</string>
   <!--DrawerFragment-->
   <!--Same as download_title with a colon and space appended-->
   <!--Same as upload_title with a colon and space appended-->
   <!--Title for current CPU usage-->
   <!--Title for current RAM usage-->
   <!--Title for announce server status-->
-  <string name="restart">යළි අරඹන්න</string>
+  <string name="restart">නැවත ආරම්භ කරන්න</string>
   <!--FolderActivity-->
   <!--Setting title-->
-  <string name="folder_id">බහාලුමේ හැඳු.</string>
+  <string name="folder_id">බහලුමේ හැඳු.</string>
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title and description-->
@@ -109,15 +109,15 @@
   <string-array name="compress_entries">
     <item>කවදාවත්</item>
     <item>පාරදත්ත</item>
-    <item>සැමවිටම</item>
+    <item>සාමාන්යයෙන්</item>
   </string-array>
   <!--Setting title-->
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Menu item to confirm adding a device-->
-  <string name="add">එකතු</string>
+  <string name="add">එකතු කරන්න</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
-  <string name="edit_device">උපාංගය සංස්කරණය</string>
+  <string name="edit_device">දක්වා සංස්කරණය</string>
   <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <!--Content description for device ID qr code icon-->
@@ -131,7 +131,9 @@
   <!--Titles for the preference to undo ignored devices and folders-->
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
+  <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
   <!--Toast after entering invalid socks proxy address-->
+  <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
   <!--Toast after entering invalid http proxy address-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -173,9 +175,21 @@
   <!--New file name template-->
   <!--Nothing to share toast-->
   <!--Copy success toast partially-->
+  <plurals name="copy_success_partially">
+    <item quantity="one">ගොනු %1$d ක් \"%2$s\" බහාලුමට පිටපත් විය, %3$d ක් පවතී</item>
+    <item quantity="other">ගොනු %1$d ක් \"%2$s\" බහාලුමට පිටපත් විය, %3$d ක් පවතී</item>
+  </plurals>
   <!--Copy success toast-->
+  <plurals name="copy_success">
+    <item quantity="one">ගොනු %1$d ක් \"%2$s\" බහාලුමට පිටපත් විය</item>
+    <item quantity="other">ගොනු %1$d ක් \"%2$s\" බහාලුමට පිටපත් විය</item>
+  </plurals>
   <!--Copy exception toast-->
   <!--Copy progress dialog text-->
+  <plurals name="file_name_title">
+    <item quantity="one">ගොනුවේ නම</item>
+    <item quantity="other">ගොනු ලේඛනය</item>
+  </plurals>
   <!--Sub Folder title-->
   <!--SyncthingService-->
   <!--Title of the "syncthing disabled" dialog-->
@@ -197,10 +211,11 @@
   <!--Strings representing units for file sizes, from smallest to largest-->
   <!--Strings representing units for transfer rates, from smallest to largest-->
   <!--Possible folder states-->
-  <string name="state_syncing">සමමුහූර්ත වෙමින් (%1$d%%)</string>
+  <string name="state_syncing">සමමුහූර්ත ස්ථානයේ (%1$d%%)</string>
   <string name="state_error">දෝෂය</string>
   <string name="state_unknown">නොදනී</string>
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
+  <string name="folder_size_format">%1$s %2$s</string>
   <!--Titles used in the folder type dialog and folder type button in the folder activity-->
   <!--Displays the current folder type in the folder activity-->
   <!--Folder type dialog descriptions for folder types-->