diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-03-30 22:12:49 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-03-30 22:12:49 +0200 |
| commit | 75c5275f7e9a27019b9517770603ca4c77f1fbd9 (patch) | |
| tree | 567d10bd9e559089487f5627c436000e2a1a8fc8 /src/main/res/values-fr | |
| parent | c8fe93cf0a99481bfe7a30bbc1cd98383205bcaa (diff) | |
| parent | 7eabdfd80f50634282307f45c5f99ab46181805d (diff) | |
Merge tag '1.2.0' into trz/master
Conflicts:
src/main/java/eu/siacs/conversations/parser/AbstractParser.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/res/values-de/strings.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'src/main/res/values-fr')
| -rw-r--r-- | src/main/res/values-fr/strings.xml | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index ba2fbcf7..69440362 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -325,7 +325,7 @@ <string name="no_otr_session_found">Aucune session valide d\'OTR n\'a été trouvée!</string> <string name="conversations_foreground_service">Conversations</string> <string name="pref_keep_foreground_service">Garder le service au premier-plan</string> - <string name="pref_keep_foreground_service_summary">Evite que le système ferme votre connexion</string> + <string name="pref_keep_foreground_service_summary">Évite que le système ferme votre connexion</string> <string name="choose_file">Choix d\'un fichier</string> <string name="receiving_x_file">Réception %1$s (%2$d%% complété)</string> <string name="download_x_file">Télecharger %s</string> @@ -400,10 +400,31 @@ <string name="eight_hours">8 heures</string> <string name="until_further_notice">Jusqu\'à nouvel ordre</string> <string name="pref_input_options">Options de saisie</string> + <string name="pref_enter_is_send">Entrée permet d\'envoyer</string> + <string name="pref_enter_is_send_summary">Utiliser la touche Entrée pour envoyer un message</string> + <string name="pref_display_enter_key">Afficher la touche Entrée</string> + <string name="pref_display_enter_key_summary">Remplacer le bouton Émoticônes par un bouton Entrée</string> <string name="audio">audio</string> <string name="video">video</string> <string name="image">image</string> <string name="pdf_document">document PDF</string> + <string name="apk">Application Android</string> <string name="vcard">Contact</string> <string name="received_x_file">%s reçu</string> + <string name="disable_foreground_service">Cesser de garder le service au premier plan</string> + <string name="touch_to_open_conversations">Cliquez pour ouvrir Conversations</string> + <string name="avatar_has_been_published">L\'avatar a été envoyé !</string> + <string name="sending_x_file">Envoi de %s</string> + <string name="offering_x_file">Proposition pour %s</string> + <string name="hide_offline">Cacher hors-ligne</string> + <string name="disable_account">Désactiver le compte</string> + <string name="contact_is_typing">%s écrit un message...</string> + <string name="contact_has_stopped_typing">%s a arrêté d\'écrire</string> + <string name="pref_chat_states">Notifications d\'écriture</string> + <string name="pref_chat_states_summary">Permettre à votre contact de savoir que vous écrivez un message</string> + <string name="send_location">Envoyer la position</string> + <string name="show_location">Afficher la position</string> + <string name="no_application_found_to_display_location">Aucune application trouvée pour afficher la position</string> + <string name="location">Position</string> + <string name="received_location">Position reçue</string> </resources> |