diff --git a/AnkiDroid/src/main/res/values-fa/01-core.xml b/AnkiDroid/src/main/res/values-fa/01-core.xml
index e626016b7449..44a7b9277bd1 100644
--- a/AnkiDroid/src/main/res/values-fa/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fa/01-core.xml
@@ -60,7 +60,7 @@
     <string name="expand">گسترش</string>
     <string name="collapse">بستن</string>
     <plurals name="reviewer_window_title">
-        <item quantity="one">%d minute left</item>
+        <item quantity="one">%d دقیقه باقی‌مانده است.</item>
         <item quantity="other">%d minutes left</item>
     </plurals>
     <plurals name="reviewer_window_title_hours_new">
diff --git a/AnkiDroid/src/main/res/values-fa/10-preferences.xml b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
index a91d85cbe966..590bc4185a87 100644
--- a/AnkiDroid/src/main/res/values-fa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
@@ -50,7 +50,7 @@
         <item quantity="one">%d دقیقه</item>
         <item quantity="other">%d دقیقه</item>
     </plurals>
-    <string name="pref_milliseconds">%s ms</string>
+    <string name="pref_milliseconds">%s هزارم‌ثانیه</string>
     <!-- TODO: move to 20-search-preference so we can contribute upstream (searchpreference_no_results)-->
     <string name="pref_search_no_results">بدون نتیجه</string>
     <!-- preferences.xml categories-->
@@ -151,7 +151,8 @@
     <string name="notification_minimum_cards_due_vibrate" maxLength="41">لرزش</string>
     <string name="notification_minimum_cards_due_blink" maxLength="41">چشمک زدن نور</string>
     <string name="timeout_answer_text" maxLength="41">نمایش پاسخ بصورت خودکار</string>
-    <string name="timeout_answer_summ2">Show answer automatically without user input. Configure from deck options.</string>
+    <string name="timeout_answer_summ2">جواب را به صورت خودکار بدون دریافت ورودی از کاربر نشان بده.
+از بخش تنظیمات دسته‌کارت‌ تغییر دهید.</string>
     <string name="select_locale_title">زبان را انتخاب کنید</string>
     <string name="software_render" maxLength="41">غیر فعال کردن رندر سخت‌افزار کارت</string>
     <string name="software_render_summ">رندر سخت افزاری سریع تر است ولی ممکن است مشکل داشته باشد، مخصوصا روی اندروید 8 یا 8.1. اگر بعضی از دکمه های مرور کارت ها را نمیبینید، این تنظیمات را امتحان کنید.</string>
diff --git a/AnkiDroid/src/main/res/values-fa/20-search-preference.xml b/AnkiDroid/src/main/res/values-fa/20-search-preference.xml
index 209a8cfe4f8a..bbec6750c0db 100644
--- a/AnkiDroid/src/main/res/values-fa/20-search-preference.xml
+++ b/AnkiDroid/src/main/res/values-fa/20-search-preference.xml
@@ -60,6 +60,6 @@
     the key names MUST NOT be changed due to this
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string tools:ignore="UnusedResources" name="searchpreference_search" comment="By submitting this string, you license it under the MIT License">Search&#8230;</string>
-    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">Clear history</string>
+    <string tools:ignore="UnusedResources" name="searchpreference_search" comment="By submitting this string, you license it under the MIT License">جستجو &#8230;</string>
+    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">پاک‌کردن تاریخچه</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/01-core.xml b/AnkiDroid/src/main/res/values-pt-rPT/01-core.xml
index 6fda2242cd08..7dc55a15bd25 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/01-core.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/01-core.xml
@@ -103,8 +103,8 @@
     <string name="menu_bury">Enterrar</string>
     <string name="menu_suspend">Suspender</string>
     <string name="menu_delete_note">Eliminar nota</string>
-    <string name="menu_flag">Sinalização</string>
-    <string name="rename_flag">Renomear sinalização</string>
+    <string name="menu_flag">Bandeira</string>
+    <string name="rename_flag">Renomear bandeiras</string>
     <string name="menu_flag_card">Sinalizar ficha</string>
     <string name="menu_edit_tags">Editar etiquetas</string>
     <string name="delete_note_message">Deseja realmente eliminar esta nota e todas as suas fichas?\n%s</string>
@@ -144,7 +144,7 @@
     <string name="sync_cancel_message" tools:ignore="UnusedResources">A cancelar&#8230;\nPode demorar algum tempo.</string>
     <string name="syncing_media">A sincronizar ficheiros de multimédia</string>
     <string name="export_deck">Exportar baralho</string>
-    <string name="export_collection">Export collection</string>
+    <string name="export_collection">Exportar Colecção</string>
     <string name="nothing">Nada</string>
     <!-- Card template editor -->
     <string name="title_activity_template_editor">Tipos de ficha</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 6938503105e1..2d8c7295e82a 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -80,7 +80,7 @@
     <string name="webview_crash_fatal">Erro fatal: o processador do \"WebView\" falhou. Causa: %s</string>
     <string name="webview_crash_loop_dialog_title">Falha no processamento do \"WebView\"</string>
     <string name="webview_crash_loop_dialog_content">O \"WebView\" de sistema falhou no processamento da ficha \'%1$s\'.\n %2$s</string>
-    <string name="filter_by_flags">Sinalização</string>
+    <string name="filter_by_flags">Bandeiras</string>
     <!-- Custom study options -->
     <string name="custom_study_increase_new_limit">Modificar o limite de novas fichas para hoje</string>
     <string name="custom_study_increase_review_limit">Modificar o limite de revisões para hoje</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml
index 509e018092cc..b9d4a7968b0f 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml
@@ -67,7 +67,7 @@
     <string name="card_browser_show_marked">Filtro marcado</string>
     <string name="card_browser_show_suspended">Filtro suspenso</string>
     <string name="card_browser_search_by_tag">Filtrar por etiqueta</string>
-    <string name="card_browser_search_by_flag">Filtrar por sinalização</string>
+    <string name="card_browser_search_by_flag">Filtrar por bandeira</string>
     <string name="card_browser_list_my_searches">Minhas procuras</string>
     <string name="card_browser_list_my_searches_save">Guardar procura</string>
     <string name="card_browser_list_my_searches_title">Escolher uma procura guardada</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
index f4750fdb49c4..31b4745b8a1f 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
@@ -172,7 +172,7 @@
     <string name="show_large_answer_buttons" maxLength="41">Mostrar botões de resposta grandes</string>
     <string name="show_large_answer_buttons_summ">Mostrar o botão de resposta em duas linhas</string>
     <string name="show_top_bar" maxLength="41">Mostrar barra superior</string>
-    <string name="show_top_bar_summ">Mostrar contagem de fichas, sinalizações e marcas na barra superior</string>
+    <string name="show_top_bar_summ">Mostrar contagem de fichas, bandeiras e marcas na barra superior</string>
     <string name="show_progress" maxLength="41">Mostrar restantes</string>
     <string name="show_progress_summ">Mostrar o contador de fichas restantes</string>
     <string name="show_eta" maxLength="41">Mostrar estimativa de tempo restante</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/11-arrays.xml b/AnkiDroid/src/main/res/values-pt-rPT/11-arrays.xml
index 8745862d6fe4..89db0c85e942 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/11-arrays.xml
@@ -85,14 +85,14 @@
     <string name="answer_easy">Responder \"Fácil\"</string>
     <string name="gesture_play">Reproduzir multimédia</string>
     <string name="gesture_abort_learning">Acabar sessão de estudo</string>
-    <string name="gesture_flag_red">Activar/desactivar sinalização vermelha</string>
-    <string name="gesture_flag_orange">Activar/desactivar sinalização laranja</string>
-    <string name="gesture_flag_green">Activar/desactivar sinalização verde</string>
-    <string name="gesture_flag_blue">Activar/desactivar sinalização azul</string>
-    <string name="gesture_flag_pink">Activar/desactivar sinalização rosa</string>
-    <string name="gesture_flag_turquoise">Activar/desactivar sinalização turquesa</string>
-    <string name="gesture_flag_purple">Activar/desactivar sinalização roxa</string>
-    <string name="gesture_flag_remove">Remover sinalização</string>
+    <string name="gesture_flag_red">Activar/Desactivar Bandeira Vermelha</string>
+    <string name="gesture_flag_orange">Activar/Desactivar Bandeira Laranja</string>
+    <string name="gesture_flag_green">Activar/Desactivar Bandeira Verde</string>
+    <string name="gesture_flag_blue">Activar/Desactivar Bandeira Azul</string>
+    <string name="gesture_flag_pink">Activar/Desactivar Bandeira Rosa</string>
+    <string name="gesture_flag_turquoise">Activar/Desactivar Bandeira Turquesa</string>
+    <string name="gesture_flag_purple">Activar/Desactivar Bandeira Roxa</string>
+    <string name="gesture_flag_remove">Remover Bandeira</string>
     <string name="gesture_page_up">Página Acima</string>
     <string name="gesture_page_down">Página Abaixo</string>
     <string name="gesture_abort_sync">Acabar sessão de estudo e Sincronizar</string>