diff --git a/po/fr.po b/po/fr.po index fce482a..4188af4 100644 --- a/po/fr.po +++ b/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-21 02:42+0200\n" +"POT-Creation-Date: 2011-08-21 03:06+0200\n" "PO-Revision-Date: 2010-04-24 02:07+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: DeforaOS development (French) \n" @@ -27,305 +27,305 @@ msgstr "" " -m\tNom du greffon modem à charger\n" " -r\tDélai entre deux tentatives d'accès au modem (ms)\n" -#: ../src/phone.c:336 +#: ../src/phone.c:337 msgid "All" msgstr "Tous" -#: ../src/phone.c:337 +#: ../src/phone.c:338 msgid "Inbox" msgstr "Reçus" -#: ../src/phone.c:338 +#: ../src/phone.c:339 msgid "Sent" msgstr "Envoyés" -#: ../src/phone.c:339 +#: ../src/phone.c:340 msgid "Drafts" msgstr "Brouillons" -#: ../src/phone.c:340 +#: ../src/phone.c:341 msgid "Trash" msgstr "Corbeille" -#: ../src/phone.c:508 ../src/phone.c:2506 +#: ../src/phone.c:509 ../src/phone.c:2511 msgid "System preferences" msgstr "Préférences système" -#: ../src/phone.c:519 ../src/phone.c:1935 +#: ../src/phone.c:520 ../src/phone.c:1940 msgid "Plug-ins" msgstr "Greffons" -#: ../src/phone.c:684 +#: ../src/phone.c:685 #, c-format msgid "Checking %s..." msgstr "Vérification %s..." -#: ../src/phone.c:747 +#: ../src/phone.c:748 msgid "Delete this contact?" msgstr "Supprimer ce contact?" -#: ../src/phone.c:1053 ../src/phone.c:1219 +#: ../src/phone.c:1058 ../src/phone.c:1224 msgid "Delete this message?" msgstr "Supprimer ce message?" -#: ../src/phone.c:1059 ../src/phone.c:1224 +#: ../src/phone.c:1064 ../src/phone.c:1229 msgid "Deleting message..." msgstr "Suppression du message..." -#: ../src/phone.c:1321 +#: ../src/phone.c:1326 msgid "Unknown contact" msgstr "Contact inconnu" -#: ../src/phone.c:1328 +#: ../src/phone.c:1333 msgid "Unknown number" msgstr "Numéro inconnu" -#: ../src/phone.c:1340 +#: ../src/phone.c:1345 msgid "In conversation" msgstr "En conversation" -#: ../src/phone.c:1351 +#: ../src/phone.c:1356 msgid "Incoming call" msgstr "Appel entrant" -#: ../src/phone.c:1361 +#: ../src/phone.c:1366 msgid "Outgoing call" msgstr "Appel sortant" -#: ../src/phone.c:1372 +#: ../src/phone.c:1377 msgid "Call finished" msgstr "Appel terminé" -#: ../src/phone.c:1402 +#: ../src/phone.c:1407 msgid "_Answer" msgstr "_Répondre" -#: ../src/phone.c:1407 +#: ../src/phone.c:1412 msgid "_Hangup" msgstr "Ra_ccrocher" -#: ../src/phone.c:1412 +#: ../src/phone.c:1417 msgid "_Reject" msgstr "Re_jeter" -#: ../src/phone.c:1432 +#: ../src/phone.c:1437 msgid "Loudspeaker" msgstr "Haut-parleur" -#: ../src/phone.c:1440 +#: ../src/phone.c:1445 msgid "Mute microphone" msgstr "Couper le microphone" -#: ../src/phone.c:1482 +#: ../src/phone.c:1487 #, c-format msgid "Enter %s" msgstr "Entrer %s" -#: ../src/phone.c:1525 +#: ../src/phone.c:1530 msgid "Enter" msgstr "Entrer" -#: ../src/phone.c:1527 +#: ../src/phone.c:1532 msgid "Skip" msgstr "Ignorer" -#: ../src/phone.c:1555 +#: ../src/phone.c:1560 msgid "Contacts" msgstr "Contacts" -#: ../src/phone.c:1561 ../src/phone.c:1680 ../src/phone.c:1716 -#: ../src/phone.c:1831 ../src/phone.c:2187 +#: ../src/phone.c:1566 ../src/phone.c:1685 ../src/phone.c:1721 +#: ../src/phone.c:1836 ../src/phone.c:2192 msgid "Call" msgstr "Appeler" -#: ../src/phone.c:1567 +#: ../src/phone.c:1572 msgid "Write" msgstr "Écrire" -#: ../src/phone.c:1609 ../src/phone.c:1966 ../src/phone.c:2298 +#: ../src/phone.c:1614 ../src/phone.c:1971 ../src/phone.c:2303 msgid "Name" msgstr "Nom" -#: ../src/phone.c:1655 +#: ../src/phone.c:1660 msgid "Dialer" msgstr "Composer" -#: ../src/phone.c:1682 +#: ../src/phone.c:1687 msgid "Hang up" msgstr "Raccrocher" -#: ../src/phone.c:1710 +#: ../src/phone.c:1715 msgid "Phone logs" msgstr "Journal d'appels" -#: ../src/phone.c:1722 +#: ../src/phone.c:1727 msgid "Message" msgstr "Message" -#: ../src/phone.c:1753 +#: ../src/phone.c:1758 msgid "Direction" msgstr "Direction" -#: ../src/phone.c:1758 ../src/phone.c:1877 +#: ../src/phone.c:1763 ../src/phone.c:1882 msgid "To/From" msgstr "Vers/De" -#: ../src/phone.c:1764 ../src/phone.c:1885 +#: ../src/phone.c:1769 ../src/phone.c:1890 msgid "Date" msgstr "Date" -#: ../src/phone.c:1825 +#: ../src/phone.c:1830 msgid "Messages" msgstr "Messages" -#: ../src/phone.c:1836 +#: ../src/phone.c:1841 msgid "New message" msgstr "Nouveau message" -#: ../src/phone.c:1842 ../src/phone.c:2193 +#: ../src/phone.c:1847 ../src/phone.c:2198 msgid "Reply" msgstr "Répondre" -#: ../src/phone.c:1954 +#: ../src/phone.c:1959 msgid "Enabled" msgstr "Activé" -#: ../src/phone.c:2181 +#: ../src/phone.c:2186 msgid "Read message" msgstr "Lire le message" -#: ../src/phone.c:2199 +#: ../src/phone.c:2204 msgid "Forward" msgstr "Transmettre" -#: ../src/phone.c:2273 +#: ../src/phone.c:2278 msgid "Phone settings" msgstr "Paramètres du téléphone" -#: ../src/phone.c:2350 +#: ../src/phone.c:2355 msgid "missed calls" msgstr "appels manqués" -#: ../src/phone.c:2350 +#: ../src/phone.c:2355 msgid "missed call" msgstr "appel manqué" -#: ../src/phone.c:2359 +#: ../src/phone.c:2364 msgid "new messages" msgstr "nouveaux messages" -#: ../src/phone.c:2360 +#: ../src/phone.c:2365 msgid "new message" msgstr "nouveau message" -#: ../src/phone.c:2378 ../src/phone.c:3283 ../src/phone.c:3287 +#: ../src/phone.c:2383 ../src/phone.c:3288 ../src/phone.c:3292 msgid "Information" msgstr "Information" -#: ../src/phone.c:2388 +#: ../src/phone.c:2393 msgid "Status" msgstr "État" -#: ../src/phone.c:2412 +#: ../src/phone.c:2417 msgid "_View" msgstr "_Vue" -#: ../src/phone.c:2431 +#: ../src/phone.c:2436 msgid "_Read" msgstr "_Lire" -#: ../src/phone.c:2532 +#: ../src/phone.c:2537 msgid "Open file..." msgstr "Ouvrir fichier..." -#: ../src/phone.c:2718 +#: ../src/phone.c:2723 msgid "Write message" msgstr "Écrire un message" -#: ../src/phone.c:2724 +#: ../src/phone.c:2729 msgid "Send" msgstr "Envoyer" -#: ../src/phone.c:2730 +#: ../src/phone.c:2735 msgid "Attach" msgstr "Joindre" -#: ../src/phone.c:2846 +#: ../src/phone.c:2851 msgid "Attach file..." msgstr "Joindre un fichier..." -#: ../src/phone.c:2917 +#: ../src/phone.c:2922 #, c-format msgid "%d message%s, %d/%d characters" msgstr "%d message%s, %d/%d caractères" -#: ../src/phone.c:2918 +#: ../src/phone.c:2923 msgid "s" msgstr "s" -#: ../src/phone.c:2982 +#: ../src/phone.c:2987 msgid "Sending message..." msgstr "Envoi du message..." -#: ../src/phone.c:3011 +#: ../src/phone.c:3016 msgid "Outgoing" msgstr "Sortant" -#: ../src/phone.c:3197 +#: ../src/phone.c:3202 msgid "Operation in progress..." msgstr "Opération en cours..." -#: ../src/phone.c:3235 ../src/phone.c:3239 +#: ../src/phone.c:3240 ../src/phone.c:3244 msgid "Question" msgstr "Question" -#: ../src/phone.c:3259 ../src/phone.c:3263 +#: ../src/phone.c:3264 ../src/phone.c:3268 msgid "Error" msgstr "Erreur" -#: ../src/phone.c:3489 +#: ../src/phone.c:3494 msgid "Name: " msgstr "Nom: " -#: ../src/phone.c:3498 +#: ../src/phone.c:3503 msgid "Number: " msgstr "Numéro: " -#: ../src/phone.c:3514 +#: ../src/phone.c:3519 msgid "New contact" msgstr "Nouveau contact" -#: ../src/phone.c:3516 +#: ../src/phone.c:3521 msgid "Edit contact: " msgstr "Modifier contact: " -#: ../src/phone.c:3543 +#: ../src/phone.c:3548 msgid "The name cannot be empty" msgstr "Le nom ne peut être vide" -#: ../src/phone.c:3548 +#: ../src/phone.c:3553 msgid "The number cannot be empty" msgstr "Le numéro ne peut être vide" -#: ../src/phone.c:3684 +#: ../src/phone.c:3689 msgid "Message sent" msgstr "Message envoyé" -#: ../src/phone.c:3720 +#: ../src/phone.c:3725 #, c-format msgid "Wrong %s" msgstr "Mauvais %s" -#: ../src/phone.c:3727 +#: ../src/phone.c:3732 #, c-format msgid "%s is valid" msgstr "%s valide" -#: ../src/phone.c:3790 +#: ../src/phone.c:3795 msgid "Raw data (not shown)" msgstr "Données brutes (non affichées)" -#: ../src/phone.c:3823 +#: ../src/phone.c:3828 msgid "Message deleted" msgstr "Message effacé" diff --git a/src/phone.c b/src/phone.c index 86fdea9..c790b13 100644 --- a/src/phone.c +++ b/src/phone.c @@ -71,6 +71,7 @@ typedef enum _PhoneContactColumn PHONE_CONTACT_COLUMN_STATUS, PHONE_CONTACT_COLUMN_STATUS_DISPLAY, PHONE_CONTACT_COLUMN_NAME, + PHONE_CONTACT_COLUMN_NAME_DISPLAY, PHONE_CONTACT_COLUMN_NUMBER } PhoneContactColumn; #define PHONE_CONTACT_COLUMN_LAST PHONE_CONTACT_COLUMN_NUMBER @@ -400,7 +401,7 @@ Phone * phone_new(char const * plugin, int retry) 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, G_TYPE_STRING, G_TYPE_STRING); icontheme = gtk_icon_theme_get_default(); phone->co_status[MODEM_CONTACT_STATUS_AWAY] = gtk_icon_theme_load_icon(icontheme, "user-away", 24, @@ -412,7 +413,7 @@ Phone * phone_new(char const * plugin, int retry) = gtk_icon_theme_load_icon(icontheme, "user-offline", 24, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL); phone->co_status[MODEM_CONTACT_STATUS_ONLINE] - = gtk_icon_theme_load_icon(icontheme, "user-online", 24, + = gtk_icon_theme_load_icon(icontheme, "user-available", 24, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL); phone->co_dialog = NULL; phone->di_window = NULL; @@ -792,6 +793,7 @@ void phone_contacts_set(Phone * phone, unsigned int index, GtkTreeIter iter; gboolean valid; unsigned int id; + gchar * p; #ifdef DEBUG fprintf(stderr, "DEBUG: %s(%u, \"%s\", \"%s\")\n", __func__, index, @@ -807,13 +809,16 @@ void phone_contacts_set(Phone * phone, unsigned int index, } if(valid != TRUE) gtk_list_store_append(phone->co_store, &iter); + p = g_strdup_printf("%s\n%s", name, number); gtk_list_store_set(phone->co_store, &iter, PHONE_CONTACT_COLUMN_ID, index, PHONE_CONTACT_COLUMN_STATUS, status, PHONE_CONTACT_COLUMN_STATUS_DISPLAY, phone->co_status[status], PHONE_CONTACT_COLUMN_NAME, name, + PHONE_CONTACT_COLUMN_NAME_DISPLAY, p, PHONE_CONTACT_COLUMN_NUMBER, number, -1); + g_free(p); } @@ -1607,8 +1612,8 @@ void phone_show_contacts(Phone * phone, gboolean show) column); renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes(_("Name"), - renderer, "text", PHONE_CONTACT_COLUMN_NAME, - NULL); + renderer, "text", + PHONE_CONTACT_COLUMN_NAME_DISPLAY, NULL); gtk_tree_view_column_set_sort_column_id(column, PHONE_CONTACT_COLUMN_NAME); gtk_tree_view_append_column(GTK_TREE_VIEW(phone->co_view),