Merge pull request #117 from BenoitBouvarel/development
French translation + hard-coded string > @string
This commit is contained in:
Daniel Gultsch
commit
afd1ba657a
|
|
@ -34,7 +34,7 @@
|
|||
android:id="@+id/textView2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Status: "
|
||||
android:text="@string/account_status"
|
||||
android:textStyle="bold"
|
||||
android:textSize="16sp" />
|
||||
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="#669900"
|
||||
android:text="unknown"
|
||||
android:text="@string/account_status_unknown"
|
||||
android:textStyle="bold"
|
||||
android:textSize="16sp"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
android:orderInCategory="10"
|
||||
android:showAsAction="always"
|
||||
android:icon="@drawable/ic_action_edit"
|
||||
android:title="Edit name" />
|
||||
android:title="@string/action_edit_contact" />
|
||||
<item
|
||||
android:id="@+id/action_delete_contact"
|
||||
android:orderInCategory="10"
|
||||
android:showAsAction="always"
|
||||
android:icon="@drawable/ic_action_discard"
|
||||
android:title="Delete from roster" />
|
||||
android:title="@string/action_delete_contact" />
|
||||
<item
|
||||
android:id="@+id/action_accounts"
|
||||
android:orderInCategory="90"
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
<item
|
||||
android:id="@+id/encryption_choice_none"
|
||||
android:title="Plain text"
|
||||
android:title="@string/encryption_choice_none"
|
||||
/>
|
||||
<item
|
||||
android:id="@+id/encryption_choice_otr"
|
||||
android:title="OTR"
|
||||
android:title="@string/encryption_choice_otr"
|
||||
/>
|
||||
<item
|
||||
android:id="@+id/encryption_choice_pgp"
|
||||
android:title="OpenPGP"/>
|
||||
android:title="@string/encryption_choice_pgp"/>
|
||||
</group>
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -5,20 +5,20 @@
|
|||
android:id="@+id/mgmt_account_edit"
|
||||
android:icon="@drawable/ic_action_edit"
|
||||
android:showAsAction="always"
|
||||
android:title="Edit Account"/>
|
||||
android:title="@string/mgmt_account_edit"/>
|
||||
<item
|
||||
android:id="@+id/mgmt_account_delete"
|
||||
android:icon="@drawable/ic_action_delete"
|
||||
android:showAsAction="always"
|
||||
android:title="Delete"/>
|
||||
android:title="@string/mgmt_account_delete"/>
|
||||
<item
|
||||
android:id="@+id/mgmt_account_disable"
|
||||
android:showAsAction="never"
|
||||
android:title="Temporarily disable"/>
|
||||
android:title="@string/mgmt_account_disable"/>
|
||||
<item
|
||||
android:id="@+id/mgmt_account_enable"
|
||||
android:showAsAction="never"
|
||||
android:title="Enable"
|
||||
android:title="@string/mgmt_account_enable"
|
||||
android:visible="false"/>
|
||||
<item
|
||||
android:id="@+id/mgmt_account_announce_pgp"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
android:orderInCategory="10"
|
||||
android:showAsAction="always"
|
||||
android:icon="@drawable/ic_action_refresh"
|
||||
android:title="Refresh contact list" />
|
||||
android:title="@string/action_refresh" />
|
||||
<item
|
||||
android:id="@+id/action_accounts"
|
||||
android:orderInCategory="90"
|
||||
|
|
|
|||
|
|
@ -5,15 +5,18 @@
|
|||
<string name="action_settings">Paramètres</string>
|
||||
<string name="action_add">Nouvelle conversation</string>
|
||||
<string name="action_accounts">Gérer les comptes</string>
|
||||
<string name="action_refresh">Rafraichir la liste de contacts</string>
|
||||
<string name="action_end_conversation">Terminer cette conversation</string>
|
||||
<string name="action_contact_details">Détails du contact</string>
|
||||
<string name="action_muc_details">Détails de la conférence</string>
|
||||
<string name="action_secure">Conversation sécurisée</string>
|
||||
<string name="action_edit_contact">Edit name</string>
|
||||
<string name="action_delete_contact">Delete from roster</string>
|
||||
<string name="action_add_account">Ajouter un compte</string>
|
||||
<string name="title_activity_contacts">Contacts</string>
|
||||
<string name="just_now">À l\'instant</string>
|
||||
<string name="sending">envoi…</string>
|
||||
<string name="announce_pgp">Renouveller les annonces PGP</string>
|
||||
<string name="announce_pgp">Renouveler les annonces PGP</string>
|
||||
<string name="encrypted_message">Déchiffrement du message. Patientez…</string>
|
||||
<string name="conference_details">Détails de la conférence</string>
|
||||
<string name="nick_in_use">Cet identifiant est déjà utilisé.</string>
|
||||
|
|
@ -26,7 +29,7 @@
|
|||
<string name="account_info">Informations du serveur</string>
|
||||
<string name="register_account">Créer un nouveau compte sur le serveur</string>
|
||||
<string name="share_with">Partager avec</string>
|
||||
<string name="ask_again"><u>Appuyez pour demander à nouveau</u></string>
|
||||
<string name="ask_again"><u>Appuyez pour demander à nouveau.</u></string>
|
||||
<string name="show_otr_key">Empreinte OTR</string>
|
||||
<string name="no_otr_fingerprint">Empreinte OTR non générée. Essayez de démarrer une conversation sécurisée.</string>
|
||||
<string name="start_conversation">Démarrer une conversation</string>
|
||||
|
|
@ -41,16 +44,16 @@
|
|||
<string name="account_offline">Compte hors-ligne</string>
|
||||
<string name="cant_invite_while_offline">Vous devez être en ligne pour inviter des participants à une conférence.</string>
|
||||
<string name="crash_report_title">Conversations s\'est arreté</string>
|
||||
<string name="crash_report_message">En envoyant des logs vous aidez au développement de Conversations\n\n<b>Attention:</b> Votre compte XMPP sera utilisé pour envoyer les logs aux développeurs.</string>
|
||||
<string name="crash_report_message">En envoyant des logs vous aidez au développement de Conversations.\n\n<b>Attention:</b> Votre compte XMPP sera utilisé pour envoyer les logs aux développeurs.</string>
|
||||
<string name="send_now">Envoyer</string>
|
||||
<string name="send_never">Ne plus me demander</string>
|
||||
<string name="problem_connecting_to_account">Impossible de se connecter au compte</string>
|
||||
<string name="problem_connecting_to_accounts">Impossible de se connecter aux comptes</string>
|
||||
<string name="touch_to_fix">Appuyez pour gérer vos comptes</string>
|
||||
<string name="problem_connecting_to_account">Impossible de se connecter au compte.</string>
|
||||
<string name="problem_connecting_to_accounts">Impossible de se connecter aux comptes.</string>
|
||||
<string name="touch_to_fix">Appuyez pour gérer vos comptes.</string>
|
||||
<string name="attach_file">Lier un fichier</string>
|
||||
<string name="not_in_roster">Le contact n\'est pas dans votre carnet d\'adresses. Voulez-vous l\'y ajouter?</string>
|
||||
<string name="add_contact">Ajouter un contact</string>
|
||||
<string name="send_failed">Echec de l\'envoi</string>
|
||||
<string name="send_failed">Echec de l\'envoi.</string>
|
||||
<string name="send_rejected">Rejeté</string>
|
||||
<string name="receiving_image">Réception d\'une image. Patientez…</string>
|
||||
<string name="preparing_image">Préparation de la transmission de l\'image. Patientez…</string>
|
||||
|
|
@ -65,14 +68,14 @@
|
|||
<string name="send_otr_message">Envoyer un message sécurisé par OTR</string>
|
||||
<string name="send_pgp_message">Envoyer un message sécurisé par openPGP</string>
|
||||
<string name="your_nick_has_been_changed">Votre identifiant a été changé</string>
|
||||
<string name="download_image">Télecharger l\'image</string>
|
||||
<string name="download_image">Télécharger l\'image</string>
|
||||
<string name="error_loading_image">Impossible de télécharger l\'image (Fichier non trouvé)</string>
|
||||
<string name="image_offered_for_download"><i>Image proposée au téléchargement.</i></string>
|
||||
<string name="not_connected">Non connecté</string>
|
||||
<string name="you_are_offline">Vous devez être en ligne pour envoyer %s mais votre compte utilisé dans cette conversation est hors-ligne.</string>
|
||||
<string name="you_are_offline_blank">Vous devez être en ligne pour réaliser cette action.</string>
|
||||
<string name="files">Fichiers</string>
|
||||
<string name="otr_messages">Message chiffrés par OTR</string>
|
||||
<string name="otr_messages">Messages chiffrés par OTR</string>
|
||||
<string name="manage_account">Gérer les comptes</string>
|
||||
<string name="contact_offline">Votre correspondant est hors-ligne.</string>
|
||||
<string name="contact_offline_otr">Envoyer un message chiffré via OTR à un correspondant hors-ligne n\'est malheureusement pas possible.\nVoulez-vous envoyer ce message sans chiffrement?</string>
|
||||
|
|
@ -83,4 +86,81 @@
|
|||
<string name="openkeychain_required_long">Conversations requiert une application tierce nommée <b>OpenKeychain</b> pour chiffrer et déchiffrer les messages.\n\nOpenKeychain est sous licence GPLv3 et est disponible sur F-Droid et Google Play.\n\n<small>(Merci de redémarrer Conversations apres l\'installation du logiciel)</small></string>
|
||||
<string name="restart">Redémarrer</string>
|
||||
<string name="install">Installer</string>
|
||||
<string name="offering">Proposition…</string>
|
||||
<string name="no_pgp_key">Aucune clef openPGP trouvée.</string>
|
||||
<string name="contact_has_no_pgp_key">Conversations ne peut chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\n<small>Merci de demander à votre correspondant de configurer openPGP.</small></string>
|
||||
<string name="encrypted_message_received"><i>Message chiffré reçu. Appuyez pour le déchiffrer.</i></string>
|
||||
<string name="encrypted_image_received"><i>Image chiffrée reçue. Appuyez pour la déchiffrer.</i></string>
|
||||
<string name="image_file"><i>Image reçue. Appuyez pour visualiser.</i></string>
|
||||
<string name="otr_file_transfer">Chiffrement OTR non disponible</string>
|
||||
<string name="otr_file_transfer_msg">Malheureusement le chiffrement OTR n\'est pas disponible pour le transfert de fichiers. Vous pouvez utiliser openPGP ou envoyer vos fichiers non chiffrés.</string>
|
||||
<string name="use_pgp_encryption">Utiliser le chiffrement openPGP</string>
|
||||
<string name="pref_xmpp_resource">Ressource XMPP</string>
|
||||
<string name="pref_xmpp_resource_summary">Nom permettant d\'identifier ce client XMPP</string>
|
||||
<string name="pref_accept_files">Accepter les fichiers</string>
|
||||
<string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que…</string>
|
||||
<string name="pref_notification_settings">Paramètres de notification</string>
|
||||
<string name="pref_notifications">Notifications</string>
|
||||
<string name="pref_notifications_summary">Notifier l\'arrivée d\'un message</string>
|
||||
<string name="pref_vibrate">Vibration</string>
|
||||
<string name="pref_vibrate_summary">Vibrer lors de l\'arrivée d\'un message</string>
|
||||
<string name="pref_sound">Sonore</string>
|
||||
<string name="pref_sound_summary">Jouer une sonnerie lors de l\'arrivée d\'un message</string>
|
||||
<string name="pref_conference_notifications">Notifications lors des conférences</string>
|
||||
<string name="pref_conference_notifications_summary">Toujours notifier l\'arrivée d\'un message provenant d\'une conférence.</string>
|
||||
<string name="pref_notification_grace_period">Période sans notification</string>
|
||||
<string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string>
|
||||
<string name="pref_ui_options">Options d\'affichage</string>
|
||||
<string name="pref_use_phone_self_picture">Utiliser les images des contacts</string>
|
||||
<string name="pref_use_phone_sefl_picture_summary">Vous pourriez ne plus être capable de distinguer quel compte vous utilisez dans une conversation.</string>
|
||||
<string name="pref_conference_name">Nom de la conférence</string>
|
||||
<string name="pref_conference_name_summary">Identifier la conférence par son sujet</string>
|
||||
<string name="pref_advanced_options">Options avancées</string>
|
||||
<string name="pref_never_send_crash">Ne jamais envoyer de rapports d\'erreurs</string>
|
||||
<string name="pref_never_send_crash_summary">En envoyant des logs vous aidez au développement de Conversations.</string>
|
||||
<string name="openpgp_error">Une erreur s\'est produite via OpenKeychain</string>
|
||||
<string name="error_decrypting_file">Erreur d\'E/S lors du déchiffrement du fichier</string>
|
||||
<string name="error_copying_image_file">Erreur lors de la copie du fichier</string>
|
||||
<string name="accept">Accepter</string>
|
||||
<string name="error">Une erreur s\'est produite</string>
|
||||
<string name="pref_grant_presence_updates">Accepter les mises à jour de présence</string>
|
||||
<string name="pref_grant_presence_updates_summary">Demander et accepter par avance les mises à jour de présence des contacts créés.</string>
|
||||
<string name="subscriptions">Publications</string>
|
||||
<string name="your_account">Votre compte</string>
|
||||
<string name="keys">Clefs</string>
|
||||
<string name="send_presence_updates">Envoyer les mises à jour de présence</string>
|
||||
<string name="receive_presence_updates">Recevoir les mises à jour de présence</string>
|
||||
<string name="ask_for_presence_updates">Demander les mises à jour de présence</string>
|
||||
<string name="attach_choose_picture">Choisir une image</string>
|
||||
<string name="attach_take_picture">Prendre une photo</string>
|
||||
<string name="preemptively_grant">Accepter par avance les demandes de publication.</string>
|
||||
<string name="error_not_an_image_file">Le fichier choisi n\'est pas une image</string>
|
||||
<string name="error_compressing_image">Une erreur s\'est produite en convertissant l\'image</string>
|
||||
<string name="error_file_not_found">Fichier non trouvé</string>
|
||||
<string name="error_io_exception">Erreur générale d\'E/S. Avez-vous encore de l\'espace libre?</string>
|
||||
<string name="error_security_exception_during_image_copy">L\'application utilisée empêche la lecture de l\'image.\n\n<small>Choisissez l\'image depuis une autre application.</small></string>
|
||||
<string name="account_status">Statut :</string>
|
||||
<string name="account_status_unknown">Inconnu</string>
|
||||
<string name="account_status_disabled">Temporarily disabled</string>
|
||||
<string name="account_status_online">En ligne</string>
|
||||
<string name="account_status_connecting">Connexion\u2026</string>
|
||||
<string name="account_status_offline">Hors-ligne</string>
|
||||
<string name="account_status_unauthorized">Non autorisé</string>
|
||||
<string name="account_status_not_found">Serveur non trouvé</string>
|
||||
<string name="account_status_no_internet">Aucune connectivité</string>
|
||||
<string name="account_status_requires_tls">Le serveur requiert TLS</string>
|
||||
<string name="account_status_error">Certificat non certifié</string>
|
||||
<string name="account_status_regis_fail">Enregistrement échoué</string>
|
||||
<string name="account_status_regis_conflict">Identifiant déjà utilisé</string>
|
||||
<string name="account_status_regis_success">Enregistrement réussi</string>
|
||||
<string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string>
|
||||
<string name="certif_no_trust">Annuler</string>
|
||||
<string name="certif_trust">Croire ce certificat</string>
|
||||
<string name="encryption_choice_none">Texte clair</string>
|
||||
<string name="encryption_choice_otr">OTR</string>
|
||||
<string name="encryption_choice_pgp">openPGP</string>
|
||||
<string name="mgmt_account_edit">Modifier le compte</string>
|
||||
<string name="mgmt_account_delete">Supprimer</string>
|
||||
<string name="mgmt_account_disable">Désactiver temporairement</string>
|
||||
<string name="mgmt_account_enable">Activer</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -5,11 +5,14 @@
|
|||
<string name="action_settings">Settings</string>
|
||||
<string name="action_add">New conversation</string>
|
||||
<string name="action_accounts">Manage accounts</string>
|
||||
<string name="action_refresh">Refresh contact list</string>
|
||||
<string name="action_end_conversation">End this conversation</string>
|
||||
<string name="action_contact_details">Contact details</string>
|
||||
<string name="action_muc_details">Conferenece details</string>
|
||||
<string name="action_secure">Secure conversation</string>
|
||||
<string name="action_add_account">Add account</string>
|
||||
<string name="action_edit_contact">Edit name</string>
|
||||
<string name="action_delete_contact">Delete from roster</string>
|
||||
<string name="title_activity_contacts">Contacts</string>
|
||||
<string name="just_now">just now</string>
|
||||
<string name="sending">sending…</string>
|
||||
|
|
@ -136,4 +139,28 @@
|
|||
<string name="error_file_not_found">File not found</string>
|
||||
<string name="error_io_exception">General I/O error. Maybe you ran out of storage space?</string>
|
||||
<string name="error_security_exception_during_image_copy">The app you used to select this image did not provide us with enough permissions to read the file.\n\n<small>Use a different file manager to choose an image</small></string>
|
||||
<string name="account_status">Status :</string>
|
||||
<string name="account_status_unknown">Unknown</string>
|
||||
<string name="account_status_disabled">Temporarily disabled</string>
|
||||
<string name="account_status_online">Online</string>
|
||||
<string name="account_status_connecting">Connecting\u2026</string>
|
||||
<string name="account_status_offline">Offline</string>
|
||||
<string name="account_status_unauthorized">Unauthorized</string>
|
||||
<string name="account_status_not_found">Server not found</string>
|
||||
<string name="account_status_no_internet">No connectivity</string>
|
||||
<string name="account_status_requires_tls">Server requires TLS</string>
|
||||
<string name="account_status_error">Untrusted cerficate</string>
|
||||
<string name="account_status_regis_fail">Registration failed</string>
|
||||
<string name="account_status_regis_conflict">Username already in use</string>
|
||||
<string name="account_status_regis_success">Registration completed</string>
|
||||
<string name="account_status_regis_not_sup">Server does not support registration</string>
|
||||
<string name="certif_no_trust">Don\'t connect</string>
|
||||
<string name="certif_trust">Trust certificate</string>
|
||||
<string name="encryption_choice_none">Plain text</string>
|
||||
<string name="encryption_choice_otr">OTR</string>
|
||||
<string name="encryption_choice_pgp">openPGP</string>
|
||||
<string name="mgmt_account_edit">Edit account</string>
|
||||
<string name="mgmt_account_delete">Delete</string>
|
||||
<string name="mgmt_account_disable">Temporarily disable</string>
|
||||
<string name="mgmt_account_enable">Enable</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ public class ManageAccountActivity extends XmppActivity {
|
|||
@Override
|
||||
public void run() {
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
|
||||
builder.setTitle("Untrusted Certificate");
|
||||
builder.setTitle(getString(R.string.account_status_error));
|
||||
builder.setIconAttribute(android.R.attr.alertDialogIcon);
|
||||
View view = (View) getLayoutInflater().inflate(R.layout.cert_warning, null);
|
||||
TextView sha = (TextView) view.findViewById(R.id.sha);
|
||||
|
|
@ -91,8 +91,8 @@ public class ManageAccountActivity extends XmppActivity {
|
|||
hint.setText(getString(R.string.untrusted_cert_hint,account.getServer()));
|
||||
sha.setText(humanReadableSha.toString());
|
||||
builder.setView(view);
|
||||
builder.setNegativeButton("Don't connect", null);
|
||||
builder.setPositiveButton("Trust certificate", new OnClickListener() {
|
||||
builder.setNegativeButton(getString(R.string.certif_no_trust), null);
|
||||
builder.setPositiveButton(getString(R.string.certif_trust), new OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
|
|
@ -130,55 +130,55 @@ public class ManageAccountActivity extends XmppActivity {
|
|||
.findViewById(R.id.account_status);
|
||||
switch (account.getStatus()) {
|
||||
case Account.STATUS_DISABLED:
|
||||
statusView.setText("temporarily disabled");
|
||||
statusView.setText(getString(R.string.account_status_disabled));
|
||||
statusView.setTextColor(0xFF1da9da);
|
||||
break;
|
||||
case Account.STATUS_ONLINE:
|
||||
statusView.setText("online");
|
||||
statusView.setText(getString(R.string.account_status_online));
|
||||
statusView.setTextColor(0xFF83b600);
|
||||
break;
|
||||
case Account.STATUS_CONNECTING:
|
||||
statusView.setText("connecting\u2026");
|
||||
statusView.setText(getString(R.string.account_status_connecting));
|
||||
statusView.setTextColor(0xFF1da9da);
|
||||
break;
|
||||
case Account.STATUS_OFFLINE:
|
||||
statusView.setText("offline");
|
||||
statusView.setText(getString(R.string.account_status_offline));
|
||||
statusView.setTextColor(0xFFe92727);
|
||||
break;
|
||||
case Account.STATUS_UNAUTHORIZED:
|
||||
statusView.setText("unauthorized");
|
||||
statusView.setText(getString(R.string.account_status_unauthorized));
|
||||
statusView.setTextColor(0xFFe92727);
|
||||
break;
|
||||
case Account.STATUS_SERVER_NOT_FOUND:
|
||||
statusView.setText("server not found");
|
||||
statusView.setText(getString(R.string.account_status_not_found));
|
||||
statusView.setTextColor(0xFFe92727);
|
||||
break;
|
||||
case Account.STATUS_NO_INTERNET:
|
||||
statusView.setText("no internet");
|
||||
statusView.setText(getString(R.string.account_status_no_internet));
|
||||
statusView.setTextColor(0xFFe92727);
|
||||
break;
|
||||
case Account.STATUS_SERVER_REQUIRES_TLS:
|
||||
statusView.setText("server requires TLS");
|
||||
statusView.setText(getString(R.string.account_status_requires_tls));
|
||||
statusView.setTextColor(0xFFe92727);
|
||||
break;
|
||||
case Account.STATUS_TLS_ERROR:
|
||||
statusView.setText("untrusted cerficate");
|
||||
statusView.setText(getString(R.string.account_status_error));
|
||||
statusView.setTextColor(0xFFe92727);
|
||||
break;
|
||||
case Account.STATUS_REGISTRATION_FAILED:
|
||||
statusView.setText("registration failed");
|
||||
statusView.setText(getString(R.string.account_status_regis_fail));
|
||||
statusView.setTextColor(0xFFe92727);
|
||||
break;
|
||||
case Account.STATUS_REGISTRATION_CONFLICT:
|
||||
statusView.setText("username already in use");
|
||||
statusView.setText(getString(R.string.account_status_regis_conflict));
|
||||
statusView.setTextColor(0xFFe92727);
|
||||
break;
|
||||
case Account.STATUS_REGISTRATION_SUCCESSFULL:
|
||||
statusView.setText("registration completed");
|
||||
statusView.setText(getString(R.string.account_status_regis_success));
|
||||
statusView.setTextColor(0xFF83b600);
|
||||
break;
|
||||
case Account.STATUS_REGISTRATION_NOT_SUPPORTED:
|
||||
statusView.setText("server does not support registration");
|
||||
statusView.setText(getString(R.string.account_status_regis_not_sup));
|
||||
statusView.setTextColor(0xFFe92727);
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
Loading…
Reference in New Issue