diff --git a/config/locales/en.yml b/config/locales/en.yml
index 953eece04..a492e53e7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -324,7 +324,7 @@ en:
   setting_default_language: Default language
   setting_login_required: Authentication required
   setting_self_registration: Self-registration
-  setting_attachment_max_size: Attachment max. size
+  setting_attachment_max_size: Maximum attachment size
   setting_issues_export_limit: Issues export limit
   setting_mail_from: Emission email address
   setting_bcc_recipients: Blind carbon copy recipients (bcc)
@@ -332,7 +332,7 @@ en:
   setting_host_name: Host name and path
   setting_text_formatting: Text formatting
   setting_wiki_compression: Wiki history compression
-  setting_feeds_limit: Feed content limit
+  setting_feeds_limit: Maximum number of items in Atom feeds
   setting_default_projects_public: New projects are public by default
   setting_autofetch_changesets: Autofetch commits
   setting_sys_api_enabled: Enable WS for repository management
@@ -358,8 +358,8 @@ en:
   setting_sequential_project_identifiers: Generate sequential project identifiers
   setting_gravatar_enabled: Use Gravatar user icons
   setting_gravatar_default: Default Gravatar image
-  setting_diff_max_lines_displayed: Max number of diff lines displayed
-  setting_file_max_size_displayed: Max size of text files displayed inline
+  setting_diff_max_lines_displayed: Maximum number of diff lines displayed
+  setting_file_max_size_displayed: Maximum size of text files displayed inline
   setting_repository_log_display_limit: Maximum number of revisions displayed on file log
   setting_openid: Allow OpenID login and registration
   setting_password_min_length: Minimum password length
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 579e666c9..12ec87e3a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -323,7 +323,7 @@ fr:
   setting_default_language: Langue par défaut
   setting_login_required: Authentification obligatoire
   setting_self_registration: Inscription des nouveaux utilisateurs
-  setting_attachment_max_size: Taille max des fichiers
+  setting_attachment_max_size: Taille maximale des fichiers
   setting_issues_export_limit: Limite export demandes
   setting_mail_from: Adresse d'émission
   setting_bcc_recipients: Destinataires en copie cachée (cci)
@@ -331,13 +331,13 @@ fr:
   setting_host_name: Nom d'hôte et chemin
   setting_text_formatting: Formatage du texte
   setting_wiki_compression: Compression historique wiki
-  setting_feeds_limit: Limite du contenu des flux RSS
+  setting_feeds_limit: Nombre maximal d'éléments dans les flux Atom
   setting_default_projects_public: Définir les nouveaux projets comme publics par défaut
-  setting_autofetch_changesets: Récupération auto. des commits
+  setting_autofetch_changesets: Récupération automatique des commits
   setting_sys_api_enabled: Activer les WS pour la gestion des dépôts
   setting_commit_ref_keywords: Mots-clés de référencement
   setting_commit_fix_keywords: Mots-clés de résolution
-  setting_autologin: Autologin
+  setting_autologin: Durée maximale de connexion automatique
   setting_date_format: Format de date
   setting_time_format: Format d'heure
   setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets