Code cleanup
This commit is contained in:
parent
d1c93db0d5
commit
98ef07d37a
144
po/fr.po
144
po/fr.po
@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Phone 0.0.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2011-08-28 19:22+0200\n"
|
||||
"POT-Creation-Date: 2011-10-01 01:04+0200\n"
|
||||
"PO-Revision-Date: 2010-04-24 02:07+0200\n"
|
||||
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
||||
"Language-Team: DeforaOS development (French) <devel-fr@lists.defora.org>\n"
|
||||
@ -47,289 +47,289 @@ msgstr "Brouillons"
|
||||
msgid "Trash"
|
||||
msgstr "Corbeille"
|
||||
|
||||
#: ../src/phone.c:529 ../src/phone.c:2573
|
||||
#: ../src/phone.c:508 ../src/phone.c:2555
|
||||
msgid "System preferences"
|
||||
msgstr "Préférences système"
|
||||
|
||||
#: ../src/phone.c:540 ../src/phone.c:2002
|
||||
#: ../src/phone.c:519 ../src/phone.c:1981
|
||||
msgid "Plug-ins"
|
||||
msgstr "Greffons"
|
||||
|
||||
#: ../src/phone.c:705
|
||||
#: ../src/phone.c:684
|
||||
#, c-format
|
||||
msgid "Checking %s..."
|
||||
msgstr "Vérification %s..."
|
||||
|
||||
#: ../src/phone.c:768
|
||||
#: ../src/phone.c:747
|
||||
msgid "Delete this contact?"
|
||||
msgstr "Supprimer ce contact?"
|
||||
|
||||
#: ../src/phone.c:1078 ../src/phone.c:1244
|
||||
#: ../src/phone.c:1057 ../src/phone.c:1223
|
||||
msgid "Delete this message?"
|
||||
msgstr "Supprimer ce message?"
|
||||
|
||||
#: ../src/phone.c:1084 ../src/phone.c:1249
|
||||
#: ../src/phone.c:1063 ../src/phone.c:1228
|
||||
msgid "Deleting message..."
|
||||
msgstr "Suppression du message..."
|
||||
|
||||
#: ../src/phone.c:1332
|
||||
#: ../src/phone.c:1311
|
||||
msgid "translator-credits"
|
||||
msgstr "Pierre Pronchery <khorben@defora.org>"
|
||||
|
||||
#: ../src/phone.c:1386
|
||||
#: ../src/phone.c:1365
|
||||
msgid "Unknown contact"
|
||||
msgstr "Contact inconnu"
|
||||
|
||||
#: ../src/phone.c:1393
|
||||
#: ../src/phone.c:1372
|
||||
msgid "Unknown number"
|
||||
msgstr "Numéro inconnu"
|
||||
|
||||
#: ../src/phone.c:1405
|
||||
#: ../src/phone.c:1384
|
||||
msgid "In conversation"
|
||||
msgstr "En conversation"
|
||||
|
||||
#: ../src/phone.c:1416
|
||||
#: ../src/phone.c:1395
|
||||
msgid "Incoming call"
|
||||
msgstr "Appel entrant"
|
||||
|
||||
#: ../src/phone.c:1426
|
||||
#: ../src/phone.c:1405
|
||||
msgid "Outgoing call"
|
||||
msgstr "Appel sortant"
|
||||
|
||||
#: ../src/phone.c:1437
|
||||
#: ../src/phone.c:1416
|
||||
msgid "Call finished"
|
||||
msgstr "Appel terminé"
|
||||
|
||||
#: ../src/phone.c:1469
|
||||
#: ../src/phone.c:1448
|
||||
msgid "_Answer"
|
||||
msgstr "_Répondre"
|
||||
|
||||
#: ../src/phone.c:1474
|
||||
#: ../src/phone.c:1453
|
||||
msgid "_Hangup"
|
||||
msgstr "Ra_ccrocher"
|
||||
|
||||
#: ../src/phone.c:1479
|
||||
#: ../src/phone.c:1458
|
||||
msgid "_Reject"
|
||||
msgstr "Re_jeter"
|
||||
|
||||
#: ../src/phone.c:1499
|
||||
#: ../src/phone.c:1478
|
||||
msgid "Loudspeaker"
|
||||
msgstr "Haut-parleur"
|
||||
|
||||
#: ../src/phone.c:1507
|
||||
#: ../src/phone.c:1486
|
||||
msgid "Mute microphone"
|
||||
msgstr "Couper le microphone"
|
||||
|
||||
#: ../src/phone.c:1549
|
||||
#: ../src/phone.c:1528
|
||||
#, c-format
|
||||
msgid "Enter %s"
|
||||
msgstr "Entrer %s"
|
||||
|
||||
#: ../src/phone.c:1592
|
||||
#: ../src/phone.c:1571
|
||||
msgid "Enter"
|
||||
msgstr "Entrer"
|
||||
|
||||
#: ../src/phone.c:1594
|
||||
#: ../src/phone.c:1573
|
||||
msgid "Skip"
|
||||
msgstr "Ignorer"
|
||||
|
||||
#: ../src/phone.c:1622
|
||||
#: ../src/phone.c:1601
|
||||
msgid "Contacts"
|
||||
msgstr "Contacts"
|
||||
|
||||
#: ../src/phone.c:1628 ../src/phone.c:1747 ../src/phone.c:1783
|
||||
#: ../src/phone.c:1898 ../src/phone.c:2254
|
||||
#: ../src/phone.c:1607 ../src/phone.c:1726 ../src/phone.c:1762
|
||||
#: ../src/phone.c:1877 ../src/phone.c:2233
|
||||
msgid "Call"
|
||||
msgstr "Appeler"
|
||||
|
||||
#: ../src/phone.c:1634
|
||||
#: ../src/phone.c:1613
|
||||
msgid "Write"
|
||||
msgstr "Écrire"
|
||||
|
||||
#: ../src/phone.c:1676 ../src/phone.c:2033 ../src/phone.c:2365
|
||||
#: ../src/phone.c:1655 ../src/phone.c:2012 ../src/phone.c:2344
|
||||
msgid "Name"
|
||||
msgstr "Nom"
|
||||
|
||||
#: ../src/phone.c:1722
|
||||
#: ../src/phone.c:1701
|
||||
msgid "Dialer"
|
||||
msgstr "Composer"
|
||||
|
||||
#: ../src/phone.c:1749
|
||||
#: ../src/phone.c:1728
|
||||
msgid "Hang up"
|
||||
msgstr "Raccrocher"
|
||||
|
||||
#: ../src/phone.c:1777
|
||||
#: ../src/phone.c:1756
|
||||
msgid "Phone logs"
|
||||
msgstr "Journal d'appels"
|
||||
|
||||
#: ../src/phone.c:1789
|
||||
#: ../src/phone.c:1768
|
||||
msgid "Message"
|
||||
msgstr "Message"
|
||||
|
||||
#: ../src/phone.c:1820
|
||||
#: ../src/phone.c:1799
|
||||
msgid "Direction"
|
||||
msgstr "Direction"
|
||||
|
||||
#: ../src/phone.c:1825 ../src/phone.c:1944
|
||||
#: ../src/phone.c:1804 ../src/phone.c:1923
|
||||
msgid "To/From"
|
||||
msgstr "Vers/De"
|
||||
|
||||
#: ../src/phone.c:1831 ../src/phone.c:1952
|
||||
#: ../src/phone.c:1810 ../src/phone.c:1931
|
||||
msgid "Date"
|
||||
msgstr "Date"
|
||||
|
||||
#: ../src/phone.c:1892
|
||||
#: ../src/phone.c:1871
|
||||
msgid "Messages"
|
||||
msgstr "Messages"
|
||||
|
||||
#: ../src/phone.c:1903
|
||||
#: ../src/phone.c:1882
|
||||
msgid "New message"
|
||||
msgstr "Nouveau message"
|
||||
|
||||
#: ../src/phone.c:1909 ../src/phone.c:2260
|
||||
#: ../src/phone.c:1888 ../src/phone.c:2239
|
||||
msgid "Reply"
|
||||
msgstr "Répondre"
|
||||
|
||||
#: ../src/phone.c:2021
|
||||
#: ../src/phone.c:2000
|
||||
msgid "Enabled"
|
||||
msgstr "Activé"
|
||||
|
||||
#: ../src/phone.c:2248
|
||||
#: ../src/phone.c:2227
|
||||
msgid "Read message"
|
||||
msgstr "Lire le message"
|
||||
|
||||
#: ../src/phone.c:2266
|
||||
#: ../src/phone.c:2245
|
||||
msgid "Forward"
|
||||
msgstr "Transmettre"
|
||||
|
||||
#: ../src/phone.c:2340
|
||||
#: ../src/phone.c:2319
|
||||
msgid "Phone settings"
|
||||
msgstr "Paramètres du téléphone"
|
||||
|
||||
#: ../src/phone.c:2417
|
||||
#: ../src/phone.c:2396
|
||||
msgid "missed calls"
|
||||
msgstr "appels manqués"
|
||||
|
||||
#: ../src/phone.c:2417
|
||||
#: ../src/phone.c:2396
|
||||
msgid "missed call"
|
||||
msgstr "appel manqué"
|
||||
|
||||
#: ../src/phone.c:2426
|
||||
#: ../src/phone.c:2405
|
||||
msgid "new messages"
|
||||
msgstr "nouveaux messages"
|
||||
|
||||
#: ../src/phone.c:2427
|
||||
#: ../src/phone.c:2406
|
||||
msgid "new message"
|
||||
msgstr "nouveau message"
|
||||
|
||||
#: ../src/phone.c:2445 ../src/phone.c:3358 ../src/phone.c:3362
|
||||
#: ../src/phone.c:2424 ../src/phone.c:3352 ../src/phone.c:3356
|
||||
msgid "Information"
|
||||
msgstr "Information"
|
||||
|
||||
#: ../src/phone.c:2455
|
||||
#: ../src/phone.c:2434
|
||||
msgid "Status"
|
||||
msgstr "État"
|
||||
|
||||
#: ../src/phone.c:2479
|
||||
#: ../src/phone.c:2458
|
||||
msgid "_View"
|
||||
msgstr "_Vue"
|
||||
|
||||
#: ../src/phone.c:2498
|
||||
#: ../src/phone.c:2477
|
||||
msgid "_Read"
|
||||
msgstr "_Lire"
|
||||
|
||||
#: ../src/phone.c:2599
|
||||
#: ../src/phone.c:2609
|
||||
msgid "Open file..."
|
||||
msgstr "Ouvrir fichier..."
|
||||
|
||||
#: ../src/phone.c:2786
|
||||
#: ../src/phone.c:2780
|
||||
msgid "Write message"
|
||||
msgstr "Écrire un message"
|
||||
|
||||
#: ../src/phone.c:2792
|
||||
#: ../src/phone.c:2786
|
||||
msgid "Send"
|
||||
msgstr "Envoyer"
|
||||
|
||||
#: ../src/phone.c:2798
|
||||
#: ../src/phone.c:2792
|
||||
msgid "Attach"
|
||||
msgstr "Joindre"
|
||||
|
||||
#: ../src/phone.c:2914
|
||||
#: ../src/phone.c:2908
|
||||
msgid "Attach file..."
|
||||
msgstr "Joindre un fichier..."
|
||||
|
||||
#: ../src/phone.c:2985
|
||||
#: ../src/phone.c:2979
|
||||
#, c-format
|
||||
msgid "%d message%s, %d/%d characters"
|
||||
msgstr "%d message%s, %d/%d caractères"
|
||||
|
||||
#: ../src/phone.c:2986
|
||||
#: ../src/phone.c:2980
|
||||
msgid "s"
|
||||
msgstr "s"
|
||||
|
||||
#: ../src/phone.c:3050
|
||||
#: ../src/phone.c:3044
|
||||
msgid "Sending message..."
|
||||
msgstr "Envoi du message..."
|
||||
|
||||
#: ../src/phone.c:3086
|
||||
#: ../src/phone.c:3080
|
||||
msgid "Outgoing"
|
||||
msgstr "Sortant"
|
||||
|
||||
#: ../src/phone.c:3272
|
||||
#: ../src/phone.c:3266
|
||||
msgid "Operation in progress..."
|
||||
msgstr "Opération en cours..."
|
||||
|
||||
#: ../src/phone.c:3310 ../src/phone.c:3314
|
||||
#: ../src/phone.c:3304 ../src/phone.c:3308
|
||||
msgid "Question"
|
||||
msgstr "Question"
|
||||
|
||||
#: ../src/phone.c:3334 ../src/phone.c:3338
|
||||
#: ../src/phone.c:3328 ../src/phone.c:3332
|
||||
msgid "Error"
|
||||
msgstr "Erreur"
|
||||
|
||||
#: ../src/phone.c:3564
|
||||
#: ../src/phone.c:3558
|
||||
msgid "Name: "
|
||||
msgstr "Nom: "
|
||||
|
||||
#: ../src/phone.c:3573
|
||||
#: ../src/phone.c:3567
|
||||
msgid "Number: "
|
||||
msgstr "Numéro: "
|
||||
|
||||
#: ../src/phone.c:3589
|
||||
#: ../src/phone.c:3583
|
||||
msgid "New contact"
|
||||
msgstr "Nouveau contact"
|
||||
|
||||
#: ../src/phone.c:3591
|
||||
#: ../src/phone.c:3585
|
||||
msgid "Edit contact: "
|
||||
msgstr "Modifier contact: "
|
||||
|
||||
#: ../src/phone.c:3618
|
||||
#: ../src/phone.c:3612
|
||||
msgid "The name cannot be empty"
|
||||
msgstr "Le nom ne peut être vide"
|
||||
|
||||
#: ../src/phone.c:3623
|
||||
#: ../src/phone.c:3617
|
||||
msgid "The number cannot be empty"
|
||||
msgstr "Le numéro ne peut être vide"
|
||||
|
||||
#: ../src/phone.c:3759
|
||||
#: ../src/phone.c:3753
|
||||
msgid "Message sent"
|
||||
msgstr "Message envoyé"
|
||||
|
||||
#: ../src/phone.c:3790
|
||||
#: ../src/phone.c:3784
|
||||
#, c-format
|
||||
msgid "Wrong %s"
|
||||
msgstr "Mauvais %s"
|
||||
|
||||
#: ../src/phone.c:3797
|
||||
#: ../src/phone.c:3791
|
||||
#, c-format
|
||||
msgid "%s is valid"
|
||||
msgstr "%s valide"
|
||||
|
||||
#: ../src/phone.c:3862
|
||||
#: ../src/phone.c:3856
|
||||
msgid "Raw data (not shown)"
|
||||
msgstr "Données brutes (non affichées)"
|
||||
|
||||
#: ../src/phone.c:3895
|
||||
#: ../src/phone.c:3889
|
||||
msgid "Message deleted"
|
||||
msgstr "Message effacé"
|
||||
|
||||
|
||||
29
src/phone.c
29
src/phone.c
@ -379,6 +379,7 @@ Phone * phone_new(char const * plugin, int retry)
|
||||
#endif
|
||||
if((phone = object_new(sizeof(*phone))) == NULL)
|
||||
return NULL;
|
||||
memset(phone, 0, sizeof(*phone));
|
||||
if(_new_config(phone) != 0)
|
||||
{
|
||||
object_delete(phone);
|
||||
@ -394,9 +395,6 @@ Phone * phone_new(char const * plugin, int retry)
|
||||
retry = strtoul(p, NULL, 10);
|
||||
}
|
||||
phone->modem = modem_new(phone->config, plugin, retry);
|
||||
phone->source = 0;
|
||||
phone->tr_source = 0;
|
||||
memset(&phone->tracks, 0, sizeof(phone->tracks));
|
||||
phone->helper.config_foreach = _phone_config_foreach;
|
||||
phone->helper.config_get = _phone_config_get;
|
||||
phone->helper.config_set = _phone_config_set;
|
||||
@ -407,18 +405,10 @@ Phone * phone_new(char const * plugin, int retry)
|
||||
phone->helper.request = _phone_request;
|
||||
phone->helper.trigger = _phone_trigger;
|
||||
phone->helper.phone = phone;
|
||||
phone->plugins = NULL;
|
||||
phone->plugins_cnt = 0;
|
||||
/* widgets */
|
||||
phone->bold = pango_font_description_new();
|
||||
pango_font_description_set_weight(phone->bold, PANGO_WEIGHT_BOLD);
|
||||
phone->ab_window = NULL;
|
||||
phone->ca_window = NULL;
|
||||
phone->en_window = NULL;
|
||||
phone->en_method = MODEM_AUTHENTICATION_METHOD_NONE;
|
||||
phone->en_name = NULL;
|
||||
phone->en_progress = NULL;
|
||||
phone->co_window = NULL;
|
||||
phone->co_store = gtk_list_store_new(PHONE_CONTACT_COLUMN_COUNT,
|
||||
G_TYPE_UINT, G_TYPE_UINT, GDK_TYPE_PIXBUF,
|
||||
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
|
||||
@ -435,35 +425,22 @@ Phone * phone_new(char const * plugin, int retry)
|
||||
phone->co_status[MODEM_CONTACT_STATUS_ONLINE]
|
||||
= gtk_icon_theme_load_icon(icontheme, "user-available", 24,
|
||||
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
|
||||
phone->co_dialog = NULL;
|
||||
phone->di_window = NULL;
|
||||
phone->lo_window = NULL;
|
||||
phone->lo_store = gtk_list_store_new(PHONE_LOGS_COLUMN_COUNT,
|
||||
G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT,
|
||||
G_TYPE_STRING);
|
||||
phone->me_window = NULL;
|
||||
phone->me_store = gtk_list_store_new(PHONE_MESSAGE_COLUMN_COUNT,
|
||||
G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT,
|
||||
G_TYPE_STRING, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_UINT,
|
||||
G_TYPE_STRING);
|
||||
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(phone->me_store),
|
||||
PHONE_MESSAGE_COLUMN_DATE, GTK_SORT_DESCENDING);
|
||||
phone->pl_window = NULL;
|
||||
phone->pl_store = gtk_list_store_new(PHONE_PLUGINS_COLUMN_COUNT,
|
||||
G_TYPE_POINTER, G_TYPE_BOOLEAN, G_TYPE_STRING,
|
||||
GDK_TYPE_PIXBUF, G_TYPE_STRING);
|
||||
phone->re_index = -1;
|
||||
phone->re_window = NULL;
|
||||
phone->se_window = NULL;
|
||||
phone->st_window = NULL;
|
||||
phone->st_missed = 0;
|
||||
phone->st_messages = 0;
|
||||
phone->sy_window = NULL;
|
||||
phone->se_store = gtk_list_store_new(PHONE_SETTINGS_COLUMN_COUNT,
|
||||
G_TYPE_POINTER, G_TYPE_POINTER, GDK_TYPE_PIXBUF,
|
||||
G_TYPE_STRING);
|
||||
phone->wr_window = NULL;
|
||||
phone->wr_progress = NULL;
|
||||
/* check errors */
|
||||
if(phone->modem == NULL)
|
||||
{
|
||||
@ -707,6 +684,8 @@ void phone_code_enter(Phone * phone)
|
||||
snprintf(buf, sizeof(buf), _("Checking %s..."), phone->en_name);
|
||||
switch(phone->en_method)
|
||||
{
|
||||
case MODEM_AUTHENTICATION_METHOD_NONE:
|
||||
break;
|
||||
case MODEM_AUTHENTICATION_METHOD_PIN:
|
||||
code = gtk_entry_get_text(GTK_ENTRY(phone->en_entry));
|
||||
phone->en_progress = _phone_create_progress(
|
||||
@ -716,8 +695,6 @@ void phone_code_enter(Phone * phone)
|
||||
MODEM_REQUEST_AUTHENTICATE, "SIM PIN",
|
||||
NULL, code);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user