diff --git a/src/i18n/i18n_module_fr.properties b/src/i18n/i18n_module_fr.properties
index 56795a40e..eaf06a73b 100644
--- a/src/i18n/i18n_module_fr.properties
+++ b/src/i18n/i18n_module_fr.properties
@@ -1316,8 +1316,8 @@ must_select_one_dataelement=Veuillez s\u00e9lectionner un \u00e9l\u00e9ment de d
 single_event=Ev\u00e8nement unique
 tracked_entity_instances=Instances d'entit\u00e9s suivies
 dob_type=Type DDN (Date De Naissance)
-date_of_enrollment_description=Custom label for enrollment date
-date_of_incident_description=Custom label for incident date
+date_of_enrollment_description=\u00c9tiquette personnalis\u00e9e pour la date de l'inscription
+date_of_incident_description=\u00c9tiquette personnalis\u00e9e pour la date de l'incident
 date_of_enrollment=Date d'inscription
 date_of_incident=Date de l'incident
 male=Masculin
@@ -1975,8 +1975,8 @@ zero_pos_value_count=Compte valeur z\u00e9ro ou positif
 event_count=Nombre d'\u00e9v\u00e8nements
 org_unit_count=Compte d'unit\u00e9s d'organisation
 analytics_type=Type d'analyse
-analytics_period_start=Analytics period start
-analytics_period_end=Analytics period end
+analytics_period_start=D\u00e9but de la p\u00e9riode d'analytique
+analytics_period_end=Fin de la p\u00e9riode d'analytique
 
 programIndicator__expression__help_text=L'expression d\u00e9finit le mode de calcul de l'indicateur. Astuce: utilisez d2: condition ('bool-expr',true-val,false-val) d2: daysBetween (date, date) d2: zing (x) d2: oizp (x)
 programIndicator__filter__help_text=Le filtre est appliqu\u00e9 aux \u00e9v\u00e9nements et filtre la source de donn\u00e9es utilis\u00e9e pour le calcul de l'indicateur. Le filtre doit \u00eatre \u00e9valu\u00e9 \u00e0 vrai ou faux. Utilisez des guillemets simples pour les valeurs de texte. Utilisez les codes d'option pour les r\u00e9f\u00e9rences de jeu d'options. Astuce: utilisez d2: condition ('bool-expr', true-val, false-val) d2: daysBetween (date, date) d2: zing (x) d2: oizp (x)
@@ -2090,8 +2090,8 @@ select_incident_dates_in_future=Permettre dates d'\u00e9v\u00e8nement futures
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=Montrer date d'incident
-incident_date_label=Custom label for incident date
-enrollment_date_label=Custom label for enrollment date
+incident_date_label=\u00c9tiquette personnalis\u00e9e pour la date de l'incident
+enrollment_date_label=\u00c9tiquette personnalis\u00e9e pour la date de l'inscription
 ignore_overdue_events=Ignorer les \u00e9v\u00e8nements en retard
 related_program=Programme connexe
 assign_attributes=Assigner les attributs
@@ -2184,7 +2184,7 @@ icons_negative=N\u00e9gatif
 icons_outline=Contour
 icon_search=Rechercher des icones
 upload_icon=Upload icon
-choose_file_to_upload=Choose file to upload
+choose_file_to_upload=Choisir le fichier \u00e0 t\u00e9l\u00e9charger
 icons_custom=Personnalis\u00e9
 key=Cl\u00e9
 keywords=Keywords
@@ -2240,7 +2240,7 @@ confirm_delete_option_group=Voulez-vous supprimer ce groupe d'options?
 field_mask=Masque de champ
 download=T\u00e9l\u00e9charger
 download_metadata=T\u00e9l\u00e9charger les m\u00e9tadonn\u00e9es
-download_format_json=Download format: JSON
+download_format_json=Format de t\u00e9l\u00e9chargement : JSON
 compression=Compression
 locales=Langues
 the_download_contains_$$total$$_$$modelType$$=Le t\u00e9l\u00e9chargement contient $$total$$ $$modelType$$
@@ -2312,10 +2312,10 @@ web_hook_url=URL du Web Hook
 reference=Ref\u00e9rence
 geojson=GeoJSON
 tracked_entity_attributes_to_display_in_list=Tracked entity attributes to display in list
-data_elements_to_display_in_list=Data elements to display in list
-search_available_data_elements=Search available data elements
+data_elements_to_display_in_list=\u00c9l\u00e9ments de donn\u00e9es \u00e0 afficher dans la liste
+search_available_data_elements=Rechercher les \u00e9l\u00e9ments de donn\u00e9es disponibles
 search_available_tracked_entity_attributes=Search available tracked entity attributes
-multi_text=Text with multiple values
+multi_text=Texte avec valeurs multiples
 event_chart=Tableau des \u00e9v\u00e9nements
 event_report=Rapport d'\u00e9v\u00e9nement
 map=Carte
@@ -2352,12 +2352,16 @@ registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Prevent adding new events to stage
 predict_according_to_input_category_option_combo=Predict according to input category option combo
-program_stage_label=Custom label for program stage
-event_label=Custom label for event
-enrollment_label=Custom label for enrollment
+program_stage_label=\u00c9tiquette personnalis\u00e9e pour l'\u00e9tape du programme
+event_label=\u00c9tiquette personnalis\u00e9e pour l'\u00e9v\u00e9nement
+enrollment_label=\u00c9tiquette personnalis\u00e9e pour l'inscription
 follow_up_label=Custom label for follow-up
 org_unit_label=Custom label for registering unit
 relationship_label=Custom label for relationship
 note_label=Custom label for note
 tracked_entity_attribute_label=Custom label for tracked entity attribute
 sorting_is_disabled_when_filter_is_applied=Sorting is diabled when a filter is applied
+save_the_program_in_order_to_access_sharing_settings=Sauvegarder le programme pour acc\u00e9der aux param\u00e8tres de partage
+confirm_delete_icon=Are you sure you want to delete this icon?
+intro_icon=Upload, modify and view icons which can be used assigned to other metadata.
+skip_in_analytics=Skip in analytics
diff --git a/src/i18n/i18n_module_zh.properties b/src/i18n/i18n_module_zh.properties
index e8d12b8d9..2ec494ea9 100644
--- a/src/i18n/i18n_module_zh.properties
+++ b/src/i18n/i18n_module_zh.properties
@@ -2361,3 +2361,7 @@ relationship_label=\u5173\u7cfb\u7684\u81ea\u5b9a\u4e49\u6807\u7b7e
 note_label=\u6ce8\u91ca\u7684\u81ea\u5b9a\u4e49\u6807\u7b7e
 tracked_entity_attribute_label=\u8ddf\u8e2a\u5b9e\u4f53\u5c5e\u6027\u7684\u81ea\u5b9a\u4e49\u6807\u7b7e
 sorting_is_disabled_when_filter_is_applied=\u5e94\u7528\u8fc7\u6ee4\u5668\u65f6\u5c06\u7981\u7528\u6392\u5e8f
+save_the_program_in_order_to_access_sharing_settings=\u4fdd\u5b58\u9879\u76ee\u4ee5\u8bbf\u95ee\u5171\u4eab\u8bbe\u7f6e
+confirm_delete_icon=\u60a8\u786e\u5b9a\u8981\u5220\u9664\u8fd9\u4e2a\u56fe\u6807\u5417\uff1f
+intro_icon=\u4e0a\u4f20\u3001\u4fee\u6539\u548c\u67e5\u770b\u53ef\u5206\u914d\u7ed9\u5176\u4ed6\u5143\u6570\u636e\u7684\u56fe\u6807\u3002
+skip_in_analytics=\u8df3\u8fc7\u5206\u6790