diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4451fce10ef..4c2ea06d4fe 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -478,7 +478,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opsies…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Gevorderd"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Gevorderde Bluetooth"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Wanneer Bluetooth aangeskakel is, kan jou toestel met ander Bluetooth-toestelle wat naby is, kommunikeer."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Wanneer Bluetooth aangeskakel is, kan jou toestel met ander nabygeleë Bluetooth-toestelle kommunikeer."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koppel aan…"</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media-oudio"</string>
     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Foonoudio"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b1ebdb84775..7ac98c8b4f8 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -270,7 +270,7 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"የUSB  ማከማቻ"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ካርድ"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"የእጅ አዙር ቅንብሮች"</string>
-    <string name="cancel" msgid="6859253417269739139">"ሰርዝ"</string>
+    <string name="cancel" msgid="6859253417269739139">"ይቅር"</string>
     <string name="settings_label" msgid="1626402585530130914">"ቅንብሮች"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"ቅንብሮች"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"የቅንብሮች አቋራጭ"</string>
@@ -425,8 +425,8 @@
   </plurals>
     <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"የቅርብ ጊዜ የይለፍ ቃል መጠቀም የመሳሪያ አስተዳዳሪ አይፈቅድም።"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"እሺ"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ሰርዝ"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"ሰርዝ"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ይቅር"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"ይቅር"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"ቀጥሎ"</string>
     <string name="lock_setup" msgid="3355847066343753943">"ማዋቀር ተጠናቋል።"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"መሣሪያ አስተዳደር"</string>
@@ -457,7 +457,7 @@
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ከዚህ መሣሪያ ጋር ይጣመር?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"ከ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ጋር ለማጣመር ላዩ ላይ ተይብበት:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ከዚያም ተመለስ ወይም አስገባ ተጫን::"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"አጣምር"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ሰርዝ"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ይቅር"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"ከ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ማጣመር አልተቻለም::"</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ከ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ትክክለኛ ባልሆነ ፒን ወይም የይለፍቁልፍ ምክንያት ማጣመር አልተቻለም::"</string>
@@ -635,7 +635,7 @@
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"አውታረ መረብ መርሳት አልተሳካም"</string>
     <string name="wifi_save" msgid="3331121567988522826">"አስቀምጥ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"አውታረ መረብ ማስቀመጥ አልተሳካም"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"ሰርዝ"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"ይቅር"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"ለማንኛውም ዝለለ"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"አትዝለል"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ማስጠንቀቂያ፦ ተጨማሪ የድምጸ ሞደም ተያያዥ ውሂብ ክፍያዎች ሊከሰትብዎ ይችላል።\n\nጡባዊን ማዋቀር ጉልህ የሆነ የአውታረ መረብ እንቅስቃሴ ሊያስፈልገው ይችላል።"</string>
@@ -652,7 +652,7 @@
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP አድራሻ"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ቅንብሮች"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"አስቀምጥ"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"ሰርዝ"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"ይቅር"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"እባክህ ትክክለኛ IP አድራሻ ተይብ።"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"እባክህ ትክክለኛ ኣግባቢ ፍኖት አድራሻ ተይብ።"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"እባክህ ትክክለኛ dns አድራሻ ተይብ።"</string>
@@ -674,8 +674,8 @@
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"ይላቀቅ?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"ግንኙነቱን ካቋረጥክ፣ ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር ያለህ ግንኙነት ይቋረጣል።"</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"ግንኙነቱን ካቋረጥክ፣ ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> እና <xliff:g id="PEER_COUNT">%2$s</xliff:g> ሌላ መሳሪያዎች ጋር ያለህ ግንኙነት ይቋረጣል።"</string>
-    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ግብዣ ይሰረዝ?"</string>
-    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር የመገናኘት ግብዣውን መሰረዝ ይፈልጋሉ?"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ግብዣ ይቅር?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር የመገናኘት ግብዣውን ይቅር ማለት ይፈልጋሉ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ይህ ቡድን ይረሳ?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ተንቀሳቃሽ የWi-Fi መገናኛ ነጥብ"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"የመገናኛ ነጥብን በማብራት ላይ…"</string>
@@ -786,7 +786,7 @@
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM ፒን  በተሳካ ተለውጧል"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"የሲም ካርድን ቆልፍ ሁኔታ ለመለወጥ አይቻልም። \n የተሳሳተ ፒን ሊሆን ይችላል።"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"እሺ"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"ሰርዝ"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"ይቅር"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ልክ ያልሆነ የሲም ኮድ። አሁን መሳሪያዎን ለማስከፈት ድምጸ ተያያዥ ሞደምዎን ማግኘት አለብዎ።"</string>
   <plurals name="wrong_pin_code">
     <item quantity="one" msgid="4840607930166101114">"ልክ ያልሆነ የሲም ፒን ኮድ፣ መሳሪያዎን ለማስከፈት ድምጸ ተያያዥ ሞደምዎን ማግኘት ግዴታዎ ሊሆን <xliff:g id="NUMBER">%d</xliff:g> ሙከራ ይቀርዎታል።"</item>
@@ -1159,7 +1159,7 @@
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"መተግበሪያ ውሂብ ሰርዝ?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"የዚህ መተግበሪያ ውሂቦች ሁሉ በቋሚነት ይሰረዛሉ።እነዚህም ፋይሎችን፣ ቅንብሮችን፣ መለያዎችን፣ የውሂብ ጎታዎች እና የመሳሰሉትን ያካትታሉ።"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"እሺ"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"ሰርዝ"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"ይቅር"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"መተግበሪያው በተጫኑ ትግበራዎች ዝርዝር ውስጥ አልተገኘም።"</string>
     <string name="clear_data_failed" msgid="1907582169616856698">"የመተግበሪያ ውሂብ ማጽዳት አልተቻለም::"</string>
@@ -1304,7 +1304,7 @@
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"አጥራ"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"የ<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) አቋራጭዎ ይጠራል።"</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"እሺ"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ሰርዝ"</string>
+    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ይቅር"</string>
     <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"መተግበሪያዎች"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"አቋራጮች"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"ፅሁፍ ግቤት"</string>
@@ -1472,7 +1472,7 @@
     <string name="print_print_jobs" msgid="3582094777756968793">"የህትመት ስራዎች"</string>
     <string name="print_print_job" msgid="7563741676053287211">"የህትመት ስራ"</string>
     <string name="print_restart" msgid="8373999687329384202">"እንደገና ጀምር"</string>
-    <string name="print_cancel" msgid="3621199386568672235">"ሰርዝ"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"ይቅር"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ን በማተም ላይ"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ን በመተው ላይ"</string>
@@ -1738,7 +1738,7 @@
     <string name="wifi_setup_connect" msgid="7954456989590237049">"አያይዝ"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"እርሳ"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"አስቀምጥ"</string>
-    <string name="wifi_setup_cancel" msgid="3185216020264410239">"ሰርዝ"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"ይቅር"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"አውታረ መረቦች በመቃኘት ላይ....."</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"አውታረ መረብ ለመያያዝ ንካ"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"ካለው አውታረ መረብ ጋር አያይዝ"</string>
@@ -1772,7 +1772,7 @@
     <string name="settings_backup" msgid="2274732978260797031">"ቅንብሮች  ተተኪ አኑር"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"ቅንብሮቼን ተተኪ አኑር"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"አሁን አስምር"</string>
-    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"ሥምሪያ ሰርዝ"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"ሥምሪያ ይቅር"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g> አሁን ለማስመር ንካ"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
@@ -1947,7 +1947,7 @@
     <string name="vpn_not_used" msgid="9094191054524660891">"(አላገለገለም)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(አገልጋይ አታረጋግጥ)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(ከአገልጋይ የደረሰ)"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"ሰርዝ"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"ይቅር"</string>
     <string name="vpn_save" msgid="4233484051644764510">"አስቀምጥ"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"አያይዝ"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"የVPN መገለጫ አርትዑ"</string>
@@ -1975,7 +1975,7 @@
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"ለሙሉ መጠባበቂያ አዲስ የይለፍ ቃል እዚህ አስገባ"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ሙሉ የይለፍቃል ምትኬህን እዚህ ዳግም ተይብ።"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"የመጠባበቂያ ይለፍቃል አዘጋጅ"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ሰርዝ"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ይቅር"</string>
     <string name="percentage" msgid="5866131581207788624">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ተጨማሪ የስርዓት አዘምኖች"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"ተሰናክሏል"</string>