Really allow setting the GPRS username and password

This commit is contained in:
Pierre Pronchery 2011-02-02 04:55:36 +00:00
parent dfb7edfbd1
commit f7eb24409c
4 changed files with 175 additions and 126 deletions

242
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Phone 0.0.0\n" "Project-Id-Version: Phone 0.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-02 05:19+0100\n" "POT-Creation-Date: 2011-02-02 05:55+0100\n"
"PO-Revision-Date: 2010-04-24 02:07+0200\n" "PO-Revision-Date: 2010-04-24 02:07+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -16,184 +16,184 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: ../src/gsm.c:152 #: ../src/gsm.c:154
msgid "Phone failure" msgid "Phone failure"
msgstr "Défaillance du téléphone" msgstr "Défaillance du téléphone"
#: ../src/gsm.c:153 #: ../src/gsm.c:155
msgid "No connection to phone" msgid "No connection to phone"
msgstr "Pas de connexion au téléphone" msgstr "Pas de connexion au téléphone"
#: ../src/gsm.c:154 ../src/gsm.c:189 #: ../src/gsm.c:156 ../src/gsm.c:191
msgid "Operation not allowed" msgid "Operation not allowed"
msgstr "Opération non autorisée" msgstr "Opération non autorisée"
#: ../src/gsm.c:155 ../src/gsm.c:190 #: ../src/gsm.c:157 ../src/gsm.c:192
msgid "Operation not supported" msgid "Operation not supported"
msgstr "Opération non supportée" msgstr "Opération non supportée"
#: ../src/gsm.c:156 ../src/gsm.c:192 #: ../src/gsm.c:158 ../src/gsm.c:194
msgid "SIM not inserted" msgid "SIM not inserted"
msgstr "SIM non insérée" msgstr "SIM non insérée"
#: ../src/gsm.c:157 ../src/gsm.c:193 #: ../src/gsm.c:159 ../src/gsm.c:195
msgid "SIM PIN required" msgid "SIM PIN required"
msgstr "Code SIM PIN requis" msgstr "Code SIM PIN requis"
#: ../src/gsm.c:158 #: ../src/gsm.c:160
msgid "SIM PUK required" msgid "SIM PUK required"
msgstr "Code PUK requis" msgstr "Code PUK requis"
#: ../src/gsm.c:159 #: ../src/gsm.c:161
msgid "SIM failure" msgid "SIM failure"
msgstr "Défaillance SIM" msgstr "Défaillance SIM"
#: ../src/gsm.c:160 #: ../src/gsm.c:162
msgid "SIM busy" msgid "SIM busy"
msgstr "SIM occupée" msgstr "SIM occupée"
#: ../src/gsm.c:161 #: ../src/gsm.c:163
msgid "SIM wrong" msgid "SIM wrong"
msgstr "SIM erronée" msgstr "SIM erronée"
#: ../src/gsm.c:162 #: ../src/gsm.c:164
msgid "Incorrect password" msgid "Incorrect password"
msgstr "Mot de passe incorrect" msgstr "Mot de passe incorrect"
#: ../src/gsm.c:163 #: ../src/gsm.c:165
msgid "SIM PIN2 required" msgid "SIM PIN2 required"
msgstr "Code SIM PIN2 requis" msgstr "Code SIM PIN2 requis"
#: ../src/gsm.c:164 #: ../src/gsm.c:166
msgid "SIM PUK2 required" msgid "SIM PUK2 required"
msgstr "Code SIM PUK2 requis" msgstr "Code SIM PUK2 requis"
#: ../src/gsm.c:165 ../src/gsm.c:196 #: ../src/gsm.c:167 ../src/gsm.c:198
msgid "Memory full" msgid "Memory full"
msgstr "Mémoire pleine" msgstr "Mémoire pleine"
#: ../src/gsm.c:166 ../src/gsm.c:207 #: ../src/gsm.c:168 ../src/gsm.c:209
msgid "Invalid index" msgid "Invalid index"
msgstr "Index invalide" msgstr "Index invalide"
#: ../src/gsm.c:167 #: ../src/gsm.c:169
msgid "Not found" msgid "Not found"
msgstr "Non trouvé" msgstr "Non trouvé"
#: ../src/gsm.c:168 ../src/gsm.c:194 #: ../src/gsm.c:170 ../src/gsm.c:196
msgid "Memory failure" msgid "Memory failure"
msgstr "Défaillance mémoire" msgstr "Défaillance mémoire"
#: ../src/gsm.c:169 #: ../src/gsm.c:171
msgid "Text string too long" msgid "Text string too long"
msgstr "Texte trop long" msgstr "Texte trop long"
#: ../src/gsm.c:170 #: ../src/gsm.c:172
msgid "Invalid characters in text string" msgid "Invalid characters in text string"
msgstr "Caractère invalide dans le texte" msgstr "Caractère invalide dans le texte"
#: ../src/gsm.c:171 #: ../src/gsm.c:173
msgid "Dial string too long" msgid "Dial string too long"
msgstr "Le numéro composé est trop long" msgstr "Le numéro composé est trop long"
#: ../src/gsm.c:172 #: ../src/gsm.c:174
msgid "Invalid characters in dial string" msgid "Invalid characters in dial string"
msgstr "Caractères invalides dans le numéro" msgstr "Caractères invalides dans le numéro"
#: ../src/gsm.c:173 #: ../src/gsm.c:175
msgid "No network service" msgid "No network service"
msgstr "Pas de couverture réseau" msgstr "Pas de couverture réseau"
#: ../src/gsm.c:174 #: ../src/gsm.c:176
msgid "Network timeout" msgid "Network timeout"
msgstr "Délai d'attente du réseau dépassé" msgstr "Délai d'attente du réseau dépassé"
#: ../src/gsm.c:175 #: ../src/gsm.c:177
msgid "Network not allowed - emergency calls only" msgid "Network not allowed - emergency calls only"
msgstr "Réseau non autorisé - appels d'urgence uniquement" msgstr "Réseau non autorisé - appels d'urgence uniquement"
#: ../src/gsm.c:176 ../src/gsm.c:1339 ../src/gsm.c:1590 ../src/gsm.c:1650 #: ../src/gsm.c:178 ../src/gsm.c:1369 ../src/gsm.c:1620 ../src/gsm.c:1680
#: ../src/gsm.c:2213 #: ../src/gsm.c:2248
msgid "Unknown error" msgid "Unknown error"
msgstr "Erreur inconnue" msgstr "Erreur inconnue"
#: ../src/gsm.c:187 #: ../src/gsm.c:189
msgid "ME failure" msgid "ME failure"
msgstr "Défaillance ME" msgstr "Défaillance ME"
#: ../src/gsm.c:188 #: ../src/gsm.c:190
msgid "SMS service of ME reserved" msgid "SMS service of ME reserved"
msgstr "Service SMS du ME réservé" msgstr "Service SMS du ME réservé"
#: ../src/gsm.c:191 #: ../src/gsm.c:193
msgid "Invalid PDU mode parameter" msgid "Invalid PDU mode parameter"
msgstr "Paramètre de mode PDU invalide" msgstr "Paramètre de mode PDU invalide"
#: ../src/gsm.c:195 #: ../src/gsm.c:197
msgid "Invalid memory index" msgid "Invalid memory index"
msgstr "Index mémoire invalide" msgstr "Index mémoire invalide"
#: ../src/gsm.c:208 #: ../src/gsm.c:210
msgid "Parameter not allowed" msgid "Parameter not allowed"
msgstr "Paramètre non autorisé" msgstr "Paramètre non autorisé"
#: ../src/gsm.c:209 #: ../src/gsm.c:211
msgid "Data corrupted" msgid "Data corrupted"
msgstr "Données corrompues" msgstr "Données corrompues"
#: ../src/gsm.c:210 #: ../src/gsm.c:212
msgid "Internal error" msgid "Internal error"
msgstr "Erreur interne" msgstr "Erreur interne"
#: ../src/gsm.c:211 #: ../src/gsm.c:213
msgid "Call table full" msgid "Call table full"
msgstr "Table d'appel pleine" msgstr "Table d'appel pleine"
#: ../src/gsm.c:212 #: ../src/gsm.c:214
msgid "Service table full" msgid "Service table full"
msgstr "Table de service pleine" msgstr "Table de service pleine"
#: ../src/gsm.c:213 #: ../src/gsm.c:215
msgid "Call not found" msgid "Call not found"
msgstr "Appel non trouvé" msgstr "Appel non trouvé"
#: ../src/gsm.c:214 #: ../src/gsm.c:216
msgid "No data-call supported" msgid "No data-call supported"
msgstr "Les appels data ne sont pas gérés" msgstr "Les appels data ne sont pas gérés"
#: ../src/gsm.c:215 #: ../src/gsm.c:217
msgid "One call on hold" msgid "One call on hold"
msgstr "Un appel en attente" msgstr "Un appel en attente"
#: ../src/gsm.c:216 #: ../src/gsm.c:218
msgid "Hold call not supported for this type" msgid "Hold call not supported for this type"
msgstr "La mise en attente n'est pas gérée dans ce cas" msgstr "La mise en attente n'est pas gérée dans ce cas"
#: ../src/gsm.c:217 #: ../src/gsm.c:219
msgid "Number not allowed by FDN" msgid "Number not allowed by FDN"
msgstr "Numéro non autorisé par FDN" msgstr "Numéro non autorisé par FDN"
#: ../src/gsm.c:218 #: ../src/gsm.c:220
msgid "Number not allowed by BDN" msgid "Number not allowed by BDN"
msgstr "Numéro non autorisé par BDN" msgstr "Numéro non autorisé par BDN"
#: ../src/gsm.c:219 #: ../src/gsm.c:221
msgid "Parallel USSD not supported" msgid "Parallel USSD not supported"
msgstr "USSD parallèle non supporté" msgstr "USSD parallèle non supporté"
#: ../src/gsm.c:220 #: ../src/gsm.c:222
msgid "Fax minimum speed condition" msgid "Fax minimum speed condition"
msgstr "Vitesse minimum pour les fax" msgstr "Vitesse minimum pour les fax"
#: ../src/gsm.c:221 #: ../src/gsm.c:223
msgid "Conflict with command details" msgid "Conflict with command details"
msgstr "Conflit dans la syntaxe de commande" msgstr "Conflit dans la syntaxe de commande"
#: ../src/gsm.c:406 #: ../src/gsm.c:410
msgid ": Unknown baudrate, assuming 115200" msgid ": Unknown baudrate, assuming 115200"
msgstr ": Débit inconnu, tente 115200" msgstr ": Débit inconnu, tente 115200"
#: ../src/gsm.c:1175 #: ../src/gsm.c:1205
msgid "Event not handled" msgid "Event not handled"
msgstr "Événement non géré" msgstr "Événement non géré"
@ -215,297 +215,297 @@ msgstr ""
msgid "Initializing..." msgid "Initializing..."
msgstr "Initialisation..." msgstr "Initialisation..."
#: ../src/phone.c:435 ../src/phone.c:2224 #: ../src/phone.c:439 ../src/phone.c:2228
msgid "System preferences" msgid "System preferences"
msgstr "Préférences système" msgstr "Préférences système"
#: ../src/phone.c:446 ../src/phone.c:1807 #: ../src/phone.c:450 ../src/phone.c:1811
msgid "Plug-ins" msgid "Plug-ins"
msgstr "Greffons" msgstr "Greffons"
#: ../src/phone.c:597 #: ../src/phone.c:601
msgid "Checking SIM PIN code..." msgid "Checking SIM PIN code..."
msgstr "Vérification du code SIM PIN..." msgstr "Vérification du code SIM PIN..."
#: ../src/phone.c:649 #: ../src/phone.c:653
msgid "Delete this contact?" msgid "Delete this contact?"
msgstr "Supprimer ce contact?" msgstr "Supprimer ce contact?"
#: ../src/phone.c:1016 ../src/phone.c:1132 #: ../src/phone.c:1020 ../src/phone.c:1136
msgid "Delete this message?" msgid "Delete this message?"
msgstr "Supprimer ce message?" msgstr "Supprimer ce message?"
#: ../src/phone.c:1022 ../src/phone.c:1137 #: ../src/phone.c:1026 ../src/phone.c:1141
msgid "Deleting message..." msgid "Deleting message..."
msgstr "Suppression du message..." msgstr "Suppression du message..."
#: ../src/phone.c:1233 #: ../src/phone.c:1237
msgid "Unknown contact" msgid "Unknown contact"
msgstr "Contact inconnu" msgstr "Contact inconnu"
#: ../src/phone.c:1240 #: ../src/phone.c:1244
msgid "Unknown number" msgid "Unknown number"
msgstr "Numéro inconnu" msgstr "Numéro inconnu"
#: ../src/phone.c:1252 #: ../src/phone.c:1256
msgid "In conversation" msgid "In conversation"
msgstr "En conversation" msgstr "En conversation"
#: ../src/phone.c:1264 #: ../src/phone.c:1268
msgid "Incoming call" msgid "Incoming call"
msgstr "Appel entrant" msgstr "Appel entrant"
#: ../src/phone.c:1275 #: ../src/phone.c:1279
msgid "Outgoing call" msgid "Outgoing call"
msgstr "Appel sortant" msgstr "Appel sortant"
#: ../src/phone.c:1287 #: ../src/phone.c:1291
msgid "Call finished" msgid "Call finished"
msgstr "Appel terminé" msgstr "Appel terminé"
#: ../src/phone.c:1317 #: ../src/phone.c:1321
msgid "Answer" msgid "Answer"
msgstr "Répondre" msgstr "Répondre"
#: ../src/phone.c:1322 #: ../src/phone.c:1326
msgid "Hangup" msgid "Hangup"
msgstr "Raccrocher" msgstr "Raccrocher"
#: ../src/phone.c:1327 #: ../src/phone.c:1331
msgid "Reject" msgid "Reject"
msgstr "Rejeter" msgstr "Rejeter"
#: ../src/phone.c:1347 #: ../src/phone.c:1351
msgid "Loudspeaker" msgid "Loudspeaker"
msgstr "Haut-parleur" msgstr "Haut-parleur"
#: ../src/phone.c:1355 #: ../src/phone.c:1359
msgid "Mute microphone" msgid "Mute microphone"
msgstr "Couper le microphone" msgstr "Couper le microphone"
#: ../src/phone.c:1389 ../src/phone.c:1391 #: ../src/phone.c:1393 ../src/phone.c:1395
msgid "Enter SIM PIN code" msgid "Enter SIM PIN code"
msgstr "Entrer le code SIM PIN" msgstr "Entrer le code SIM PIN"
#: ../src/phone.c:1433 #: ../src/phone.c:1437
msgid "Enter" msgid "Enter"
msgstr "Entrer" msgstr "Entrer"
#: ../src/phone.c:1435 #: ../src/phone.c:1439
msgid "Skip" msgid "Skip"
msgstr "Ignorer" msgstr "Ignorer"
#: ../src/phone.c:1463 #: ../src/phone.c:1467
msgid "Contacts" msgid "Contacts"
msgstr "Contacts" msgstr "Contacts"
#: ../src/phone.c:1469 ../src/phone.c:1577 ../src/phone.c:1613 #: ../src/phone.c:1473 ../src/phone.c:1581 ../src/phone.c:1617
#: ../src/phone.c:1703 ../src/phone.c:2061 #: ../src/phone.c:1707 ../src/phone.c:2065
msgid "Call" msgid "Call"
msgstr "Appeler" msgstr "Appeler"
#: ../src/phone.c:1475 #: ../src/phone.c:1479
msgid "Write" msgid "Write"
msgstr "Écrire" msgstr "Écrire"
#: ../src/phone.c:1509 ../src/phone.c:1838 ../src/phone.c:2172 #: ../src/phone.c:1513 ../src/phone.c:1842 ../src/phone.c:2176
msgid "Name" msgid "Name"
msgstr "Nom" msgstr "Nom"
#: ../src/phone.c:1555 #: ../src/phone.c:1559
msgid "Dialer" msgid "Dialer"
msgstr "Composer" msgstr "Composer"
#: ../src/phone.c:1579 #: ../src/phone.c:1583
msgid "Hang up" msgid "Hang up"
msgstr "Raccrocher" msgstr "Raccrocher"
#: ../src/phone.c:1607 #: ../src/phone.c:1611
msgid "Phone logs" msgid "Phone logs"
msgstr "Journal d'appels" msgstr "Journal d'appels"
#: ../src/phone.c:1619 #: ../src/phone.c:1623
msgid "Message" msgid "Message"
msgstr "Message" msgstr "Message"
#: ../src/phone.c:1649 #: ../src/phone.c:1653
msgid "Direction" msgid "Direction"
msgstr "Direction" msgstr "Direction"
#: ../src/phone.c:1654 ../src/phone.c:1758 #: ../src/phone.c:1658 ../src/phone.c:1762
msgid "To/From" msgid "To/From"
msgstr "Vers/De" msgstr "Vers/De"
#: ../src/phone.c:1660 ../src/phone.c:1764 #: ../src/phone.c:1664 ../src/phone.c:1768
msgid "Date" msgid "Date"
msgstr "Date" msgstr "Date"
#: ../src/phone.c:1697 #: ../src/phone.c:1701
msgid "Messages" msgid "Messages"
msgstr "Messages" msgstr "Messages"
#: ../src/phone.c:1709 #: ../src/phone.c:1713
msgid "New message" msgid "New message"
msgstr "Nouveau message" msgstr "Nouveau message"
#: ../src/phone.c:1715 ../src/phone.c:2067 #: ../src/phone.c:1719 ../src/phone.c:2071
msgid "Reply" msgid "Reply"
msgstr "Répondre" msgstr "Répondre"
#: ../src/phone.c:1733 #: ../src/phone.c:1737
msgid "Inbox" msgid "Inbox"
msgstr "Reçus" msgstr "Reçus"
#: ../src/phone.c:1737 #: ../src/phone.c:1741
msgid "Sent" msgid "Sent"
msgstr "Envoyés" msgstr "Envoyés"
#: ../src/phone.c:1826 #: ../src/phone.c:1830
msgid "Enabled" msgid "Enabled"
msgstr "Activé" msgstr "Activé"
#: ../src/phone.c:2055 #: ../src/phone.c:2059
msgid "Read message" msgid "Read message"
msgstr "Lire le message" msgstr "Lire le message"
#: ../src/phone.c:2073 #: ../src/phone.c:2077
msgid "Forward" msgid "Forward"
msgstr "Transmettre" msgstr "Transmettre"
#: ../src/phone.c:2147 #: ../src/phone.c:2151
msgid "Phone settings" msgid "Phone settings"
msgstr "Paramètres du téléphone" msgstr "Paramètres du téléphone"
#: ../src/phone.c:2228 #: ../src/phone.c:2232
msgid "Phone device:" msgid "Phone device:"
msgstr "Noeud d'accès:" msgstr "Noeud d'accès:"
#: ../src/phone.c:2230 #: ../src/phone.c:2235
msgid "Set the phone device" msgid "Set the phone device"
msgstr "Définir le noeud d'accès" msgstr "Définir le noeud d'accès"
#: ../src/phone.c:2235 #: ../src/phone.c:2240
msgid "Enable flow control" msgid "Enable flow control"
msgstr "Active le controle de flux" msgstr "Active le controle de flux"
#: ../src/phone.c:2333 #: ../src/phone.c:2338
msgid "Write message" msgid "Write message"
msgstr "Écrire un message" msgstr "Écrire un message"
#: ../src/phone.c:2339 #: ../src/phone.c:2344
msgid "Send" msgid "Send"
msgstr "Envoyer" msgstr "Envoyer"
#: ../src/phone.c:2345 #: ../src/phone.c:2350
msgid "Attach" msgid "Attach"
msgstr "Attacher" msgstr "Attacher"
#: ../src/phone.c:2540 #: ../src/phone.c:2545
#, c-format #, c-format
msgid "%d message%s, %d/%d characters" msgid "%d message%s, %d/%d characters"
msgstr "%d message%s, %d/%d caractères" msgstr "%d message%s, %d/%d caractères"
#: ../src/phone.c:2541 #: ../src/phone.c:2546
msgid "s" msgid "s"
msgstr "s" msgstr "s"
#: ../src/phone.c:2608 #: ../src/phone.c:2613
msgid "Sending message..." msgid "Sending message..."
msgstr "Envoi du message..." msgstr "Envoi du message..."
#: ../src/phone.c:2635 #: ../src/phone.c:2640
msgid "Outgoing" msgid "Outgoing"
msgstr "Sortant" msgstr "Sortant"
#: ../src/phone.c:2798 #: ../src/phone.c:2810
msgid "Operation in progress..." msgid "Operation in progress..."
msgstr "Opération en cours..." msgstr "Opération en cours..."
#: ../src/phone.c:2826 ../src/phone.c:2831 #: ../src/phone.c:2838 ../src/phone.c:2843
msgid "Question" msgid "Question"
msgstr "Question" msgstr "Question"
#: ../src/phone.c:2851 ../src/phone.c:2856 #: ../src/phone.c:2863 ../src/phone.c:2868
msgid "Error" msgid "Error"
msgstr "Erreur" msgstr "Erreur"
#: ../src/phone.c:2904 ../src/phone.c:2909 #: ../src/phone.c:2916 ../src/phone.c:2921
msgid "Information" msgid "Information"
msgstr "Information" msgstr "Information"
#: ../src/phone.c:2988 #: ../src/phone.c:3000
msgid "Unknown" msgid "Unknown"
msgstr "Inconnu" msgstr "Inconnu"
#: ../src/phone.c:2991 #: ../src/phone.c:3003
msgid "Registering..." msgid "Registering..."
msgstr "Enregistrement..." msgstr "Enregistrement..."
#: ../src/phone.c:2994 #: ../src/phone.c:3006
msgid "Denied" msgid "Denied"
msgstr "Refusé" msgstr "Refusé"
#: ../src/phone.c:2999 #: ../src/phone.c:3011
msgid "SIM check..." msgid "SIM check..."
msgstr "Vérification SIM..." msgstr "Vérification SIM..."
#: ../src/phone.c:3005 #: ../src/phone.c:3017
msgid "SIM ready..." msgid "SIM ready..."
msgstr "SIM prête..." msgstr "SIM prête..."
#: ../src/phone.c:3062 #: ../src/phone.c:3074
msgid "Name: " msgid "Name: "
msgstr "Nom: " msgstr "Nom: "
#: ../src/phone.c:3070 #: ../src/phone.c:3082
msgid "Number: " msgid "Number: "
msgstr "Numéro: " msgstr "Numéro: "
#: ../src/phone.c:3085 #: ../src/phone.c:3097
msgid "New contact" msgid "New contact"
msgstr "Nouveau contact" msgstr "Nouveau contact"
#: ../src/phone.c:3087 #: ../src/phone.c:3099
msgid "Edit contact: " msgid "Edit contact: "
msgstr "Modifier contact: " msgstr "Modifier contact: "
#: ../src/phone.c:3114 #: ../src/phone.c:3126
msgid "The name cannot be empty" msgid "The name cannot be empty"
msgstr "Le nom ne peut être vide" msgstr "Le nom ne peut être vide"
#: ../src/phone.c:3119 #: ../src/phone.c:3131
msgid "The number cannot be empty" msgid "The number cannot be empty"
msgstr "Le numéro ne peut être vide" msgstr "Le numéro ne peut être vide"
#: ../src/phone.c:3222 #: ../src/phone.c:3234
msgid "New message received" msgid "New message received"
msgstr "Nouveau message reçu" msgstr "Nouveau message reçu"
#: ../src/phone.c:3238 #: ../src/phone.c:3250
msgid "Message sent" msgid "Message sent"
msgstr "Message envoyé" msgstr "Message envoyé"
#: ../src/phone.c:3271 #: ../src/phone.c:3283
msgid "SIM PIN is valid" msgid "SIM PIN is valid"
msgstr "Code SIM PIN valide" msgstr "Code SIM PIN valide"
#: ../src/phone.c:3323 #: ../src/phone.c:3335
msgid "Could not request new message indications" msgid "Could not request new message indications"
msgstr "Impossible d'obtenir des notifications de nouveaux messages" msgstr "Impossible d'obtenir des notifications de nouveaux messages"
#: ../src/phone.c:3334 #: ../src/phone.c:3346
msgid "Could not send message" msgid "Could not send message"
msgstr "Le message n'a pas pu être envoyé" msgstr "Le message n'a pas pu être envoyé"
#: ../src/phone.c:3342 #: ../src/phone.c:3354
msgid "Wrong SIM PIN code" msgid "Wrong SIM PIN code"
msgstr "Code SIM PIN erroné" msgstr "Code SIM PIN erroné"
#: ../src/phone.c:3378 #: ../src/phone.c:3390
msgid "Raw data (not shown)" msgid "Raw data (not shown)"
msgstr "Données brutes (non affichées)" msgstr "Données brutes (non affichées)"
#: ../src/phone.c:3393 #: ../src/phone.c:3405
msgid "Message deleted" msgid "Message deleted"
msgstr "Message supprimé" msgstr "Message supprimé"

View File

@ -57,6 +57,8 @@ struct _GSM
unsigned int baudrate; unsigned int baudrate;
unsigned int retry; unsigned int retry;
unsigned int hwflow; unsigned int hwflow;
char * username;
char * password;
/* callback */ /* callback */
GSMCallback callback; GSMCallback callback;
@ -368,6 +370,8 @@ GSM * gsm_new(char const * device, unsigned int baudrate, unsigned int hwflow)
gsm->baudrate = _new_baudrate(baudrate); gsm->baudrate = _new_baudrate(baudrate);
gsm->retry = 1000; gsm->retry = 1000;
gsm->hwflow = hwflow; gsm->hwflow = hwflow;
gsm->username = NULL;
gsm->password = NULL;
/* callback */ /* callback */
gsm->callback = NULL; gsm->callback = NULL;
gsm->callback_data = NULL; gsm->callback_data = NULL;
@ -453,6 +457,8 @@ void gsm_delete(GSM * gsm)
g_source_remove(gsm->rd_source); g_source_remove(gsm->rd_source);
gsm->rd_source = 0; gsm->rd_source = 0;
_gsm_queue_flush(gsm); _gsm_queue_flush(gsm);
free(gsm->password);
free(gsm->username);
free(gsm->device); free(gsm->device);
free(gsm); free(gsm);
} }
@ -516,6 +522,30 @@ int gsm_set_functional(GSM * gsm, int functional)
} }
/* gsm_set_gprs_password */
int gsm_set_gprs_password(GSM * gsm, char const * password)
{
free(gsm->password);
if(password == NULL)
gsm->password = NULL;
else if((gsm->password = strdup(password)) == NULL)
return -1;
return 0;
}
/* gsm_set_gprs_username */
int gsm_set_gprs_username(GSM * gsm, char const * username)
{
free(gsm->username);
if(username == NULL)
gsm->username = NULL;
else if((gsm->username = strdup(username)) == NULL)
return -1;
return 0;
}
/* gsm_set_line_presentation */ /* gsm_set_line_presentation */
int gsm_set_line_presentation(GSM * gsm, int set) int gsm_set_line_presentation(GSM * gsm, int set)
{ {
@ -1984,7 +2014,8 @@ static int _gsm_trigger_cmut(GSM * gsm, char const * result)
static int _gsm_trigger_connect(GSM * gsm, char const * result, static int _gsm_trigger_connect(GSM * gsm, char const * result,
gboolean * answered) gboolean * answered)
{ {
char * argv[] = { "/usr/sbin/pppd", "pppd", "call", "phone", NULL }; char * argv[] = { "/usr/sbin/pppd", "pppd", "call", "phone",
"user", "", "password", "", NULL };
GSpawnFlags flags = G_SPAWN_FILE_AND_ARGV_ZERO; GSpawnFlags flags = G_SPAWN_FILE_AND_ARGV_ZERO;
int wfd; int wfd;
int rfd; int rfd;
@ -1996,6 +2027,10 @@ static int _gsm_trigger_connect(GSM * gsm, char const * result,
if(answered != NULL) if(answered != NULL)
*answered = TRUE; *answered = TRUE;
gsm->mode = GSM_MODE_DATA; gsm->mode = GSM_MODE_DATA;
if(gsm->username != NULL)
argv[5] = gsm->username;
if(gsm->password != NULL)
argv[7] = gsm->password;
if(g_spawn_async_with_pipes(NULL, argv, NULL, flags, NULL, NULL, NULL, if(g_spawn_async_with_pipes(NULL, argv, NULL, flags, NULL, NULL, NULL,
&wfd, &rfd, NULL, &error) &wfd, &rfd, NULL, &error)
== FALSE) == FALSE)

View File

@ -378,6 +378,8 @@ int gsm_set_call_presentation(GSM * gsm, int set);
int gsm_set_call_waiting_control(GSM * gsm, int unsollicited); int gsm_set_call_waiting_control(GSM * gsm, int unsollicited);
int gsm_set_extended_ring_reports(GSM * gsm, int extended); int gsm_set_extended_ring_reports(GSM * gsm, int extended);
int gsm_set_functional(GSM * gsm, int functional); int gsm_set_functional(GSM * gsm, int functional);
int gsm_set_gprs_password(GSM * gsm, char const * password);
int gsm_set_gprs_username(GSM * gsm, char const * username);
int gsm_set_line_presentation(GSM * gsm, int set); int gsm_set_line_presentation(GSM * gsm, int set);
int gsm_set_message_indications(GSM * gsm, GSMMessageMode mode, int gsm_set_message_indications(GSM * gsm, GSMMessageMode mode,
int unsollicited); int unsollicited);

View File

@ -404,7 +404,7 @@ static void _new_config(Phone * phone)
static gboolean _new_idle(gpointer data) static gboolean _new_idle(gpointer data)
{ {
Phone * phone = data; Phone * phone = data;
char const * plugins; char const * p;
phone_show_call(phone, FALSE); phone_show_call(phone, FALSE);
phone_show_contacts(phone, FALSE); phone_show_contacts(phone, FALSE);
@ -415,10 +415,14 @@ static gboolean _new_idle(gpointer data)
phone_show_system(phone, FALSE); phone_show_system(phone, FALSE);
phone_show_write(phone, FALSE); phone_show_write(phone, FALSE);
_idle_settings(phone); _idle_settings(phone);
if((plugins = config_get(phone->config, NULL, "plugins")) != NULL) if((p = config_get(phone->config, NULL, "plugins")) != NULL)
_idle_load_plugins(phone, plugins); _idle_load_plugins(phone, p);
phone->source = 0; if((p = config_get(phone->config, "gprs", "username")) != NULL)
gsm_set_gprs_username(phone->gsm, p); /* XXX move elsewhere */
if((p = config_get(phone->config, "gprs", "password")) != NULL)
gsm_set_gprs_password(phone->gsm, p); /* XXX move elsewhere */
gsm_start(phone->gsm, 0); gsm_start(phone->gsm, 0);
phone->source = 0;
return FALSE; return FALSE;
} }
@ -2226,6 +2230,7 @@ void phone_show_system(Phone * phone, gboolean show)
G_CALLBACK(_on_system_closex), phone); G_CALLBACK(_on_system_closex), phone);
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
widget = gtk_label_new(_("Phone device:")); widget = gtk_label_new(_("Phone device:"));
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
widget = gtk_file_chooser_button_new(_("Set the phone device"), widget = gtk_file_chooser_button_new(_("Set the phone device"),
GTK_FILE_CHOOSER_ACTION_OPEN); GTK_FILE_CHOOSER_ACTION_OPEN);
@ -2693,6 +2698,13 @@ static int _phone_config_set(Phone * phone, char const * section,
{ {
if(config_set(phone->config, section, variable, value) != 0) if(config_set(phone->config, section, variable, value) != 0)
return -1; return -1;
if(section != NULL && strcmp(section, "gprs") == 0) /* XXX move */
{
if(variable != NULL && strcmp(variable, "username") == 0)
gsm_set_gprs_username(phone->gsm, variable);
if(variable != NULL && strcmp(variable, "password") == 0)
gsm_set_gprs_password(phone->gsm, variable);
}
return _phone_config_save(phone); return _phone_config_save(phone);
} }