diff --git a/res/values/strings.xml b/res/values/strings.xml
index f2ac62a..fe54531 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -62,7 +62,7 @@
     <!--Title -->
     <string name="incoming_file_confirm_title">File transfer</string>
     <!--content -->
-    <string name="incoming_file_confirm_content">\u0022%1$s\u0022 wants to send you %2$s (%3$s). \n\n Accept the file? </string>
+    <string name="incoming_file_confirm_content">\u0022<xliff:g id="sender">%1$s</xliff:g>\u0022 wants to send you <xliff:g id="file">%2$s</xliff:g> (<xliff:g id="size">%3$s</xliff:g>). \n\n Accept the file? </string>
     <!-- Label for a cancel button. -->
     <string name="incoming_file_confirm_cancel">Decline</string>
     <!-- Label for a confirm button.-->
@@ -70,7 +70,7 @@
     <!-- Label for timeout OK button.-->
     <string name="incoming_file_confirm_timeout_ok">Ok</string>
     <!-- content for timeout-->
-    <string name="incoming_file_confirm_timeout_content">There was time out to accept incoming file from \u0022%1$s\u0022</string>
+    <string name="incoming_file_confirm_timeout_content">There was a timeout while accepting an incoming file from \u0022<xliff:g id="sender">%1$s</xliff:g>\u0022</string>
 
     <!-- Bluetooth File Transfer Acceptance Notification item -->
     <string name="incoming_file_confirm_Notification_title">Bluetooth share: Incoming file</string>
@@ -80,31 +80,31 @@
 
     <!-- Inbound File Transfer Progress Notification item -->
     <!-- label for the notification item of receiving file -->
-    <string name="notification_receiving">Bluetooth share: Receiving %1$s</string>
+    <string name="notification_receiving">Bluetooth share: Receiving <xliff:g id="file">%1$s</xliff:g></string>
     <!-- label for the notification item of received file -->
-    <string name="notification_received">Bluetooth share: Received %1$s</string>
+    <string name="notification_received">Bluetooth share: Received <xliff:g id="file">%1$s</xliff:g></string>
     <!-- label for the notification item of failed receiving file -->
-    <string name="notification_received_fail">Bluetooth share: File %1$s not received</string>
+    <string name="notification_received_fail">Bluetooth share: File <xliff:g id="file">%1$s</xliff:g> not received</string>
 
     <!-- Outbound File Transfer Progress Notification item -->
     <!-- label for the notification item of sending file -->
-    <string name="notification_sending">Bluetooth share: Sending %1$s</string>
+    <string name="notification_sending">Bluetooth share: Sending <xliff:g id="file">%1$s</xliff:g></string>
     <!-- label for the notification item of sent file -->
-    <string name="notification_sent">Bluetooth share: Sent %1$s</string>
+    <string name="notification_sent">Bluetooth share: Sent <xliff:g id="file">%1$s</xliff:g></string>
     <!-- label for the notification item of sent file -status -->
     <string name="notification_sent_complete">100% complete</string>
     <!-- label for the notification item of failed sending file -->
-    <string name="notification_sent_fail">Bluetooth share: File %1$s not sent</string>
+    <string name="notification_sent_fail">Bluetooth share: File <xliff:g id="file">%1$s</xliff:g> not sent</string>
 
     <!-- Bluetooth Download Progress Dialog -->
     <!--Title -->
     <string name="download_title">File transfer</string>
     <!--Line 1 -->
-    <string name="download_line1">From: \u0022%1$s\u0022</string>
+    <string name="download_line1">From: \u0022<xliff:g id="sender">%1$s</xliff:g>\u0022</string>
     <!--Line 2 -->
-    <string name="download_line2">File: %1$s</string>
+    <string name="download_line2">File: <xliff:g id="file">%1$s</xliff:g></string>
     <!--Line 3 -->
-    <string name="download_line3">File size: %1$s</string>
+    <string name="download_line3">File size: <xliff:g id="size">%1$s</xliff:g></string>
     <!--Line 4 -->
     <string name="download_line4"></string>
     <string name="download_line5">Receiving file\u2026</string>
@@ -117,9 +117,9 @@
     <!--Line 1  -->
     <string name="download_fail_line1">File not received</string>
     <!--Line 2  -->
-    <string name="download_fail_line2">File: %1$s</string>
+    <string name="download_fail_line2">File: <xliff:g id="file">%1$s</xliff:g></string>
     <!--Line 3  -->
-    <string name="download_fail_line3">Failure reason: %1$s</string>
+    <string name="download_fail_line3">Failure reason: <xliff:g id="reason">%1$s</xliff:g></string>
     <!-- Label for ok button.-->
     <string name="download_fail_ok">OK</string>
 
@@ -130,8 +130,8 @@
     <string name="download_succ_ok">Open</string>
 
     <!-- Bluetooth Upload Progress Dialog -->
-    <string name="upload_line1">To: \u0022%1$s\u0022</string>
-    <string name="upload_line3">File Type: %1$s (%2$s)</string>
+    <string name="upload_line1">To: \u0022<xliff:g id="recipient">%1$s</xliff:g>\u0022</string>
+    <string name="upload_line3">File Type: <xliff:g id="type">%1$s</xliff:g> (<xliff:g id="size">%2$s</xliff:g>)</string>
     <string name="upload_line5">Sending file\u2026</string>
 
     <!-- Bluetooth Successful Upload Progress Dialog -->
@@ -141,8 +141,8 @@
     <string name="upload_succ_ok">OK</string>
 
     <!-- Bluetooth Failed Upload File Transfer Dialog -->
-    <string name="upload_fail_line1">The file was not sent to \u0022%1$s\u0022.</string>
-    <string name="upload_fail_line1_2">File: %1$s</string>
+    <string name="upload_fail_line1">The file was not sent to \u0022<xliff:g id="recipient">%1$s</xliff:g>\u0022.</string>
+    <string name="upload_fail_line1_2">File: <xliff:g id="file">%1$s</xliff:g></string>
     <!-- Label for a try again button.-->
     <string name="upload_fail_ok">Try again</string>
     <!-- Label for a cancel button.-->
@@ -162,14 +162,14 @@
     <!-- Bluetooth Toast Message -->
     <string name="bt_toast_1">The file will be received. Check progress in the Notifications panel.</string>
     <string name="bt_toast_2">The file will not be received.</string>
-    <string name="bt_toast_3">Stopped receiving file from \u0022%1$s\u0022</string>
-    <string name="bt_toast_4">Sending file to \u0022%1$s\u0022</string>
-    <string name="bt_toast_5">Sending %1$s files to \u0022%2$s\u0022</string>
-    <string name="bt_toast_6">Stopped sending file to \u0022%1$s\u0022</string>
+    <string name="bt_toast_3">Stopped receiving file from \u0022<xliff:g id="sender">%1$s</xliff:g>\u0022</string>
+    <string name="bt_toast_4">Sending file to \u0022<xliff:g id="recipient">%1$s</xliff:g>\u0022</string>
+    <string name="bt_toast_5">Sending <xliff:g id="number">%1$s</xliff:g> files to \u0022<xliff:g id="recipient">%2$s</xliff:g>\u0022</string>
+    <string name="bt_toast_6">Stopped sending file to \u0022<xliff:g id="recipient">%1$s</xliff:g>\u0022</string>
 
     <!-- Bluetooth System Messages -->
-    <string name="bt_sm_2_1">There is not enough space on the SD card to save the file from \u0022%1$s\u0022</string>
-    <string name="bt_sm_2_2">Space needed: %1$s</string>
+    <string name="bt_sm_2_1">There is not enough space on the SD card to save the file from \u0022<xliff:g id="sender">%1$s</xliff:g>\u0022</string>
+    <string name="bt_sm_2_2">Space needed: <xliff:g id="size">%1$s</xliff:g></string>
 
     <string name="ErrorTooManyRequests">Too many requests are being processed. Try again later.</string>
 
@@ -190,15 +190,15 @@
     <string name="btopp_live_folder">Bluetooth received</string>
 
     <!-- Bluetooth OPP Transfer History -->
-    <string name="download_success"> %1$s Received complete.</string>
-    <string name="upload_success"> %1$s Sent complete.</string>
+    <string name="download_success"> <xliff:g id="file_size">%1$s</xliff:g> Received complete.</string>
+    <string name="upload_success"> <xliff:g id="file_size">%1$s</xliff:g> Sent complete.</string>
     <string name="inbound_history_title">Inbound transfers</string>
     <string name="outbound_history_title">Outbound transfers</string>
     <string name="no_transfers">Transfer history is empty.</string>
     <string name="transfer_clear_dlg_msg">All items will be cleared from the list.</string>
     <string name="outbound_noti_title">Bluetooth share: Sent files</string>
     <string name="inbound_noti_title">Bluetooth share: Received files</string>
-    <string name="noti_caption"> %1$s successful, %2$s failed.</string>
+    <string name="noti_caption"> <xliff:g id="successful_number">%1$s</xliff:g> successful, <xliff:g id="unsuccessful_number">%2$s</xliff:g> failed.</string>
 
     <string name="transfer_menu_clear_all">Clear list</string>
     <string name="transfer_menu_open">Open</string>