diff --git a/debian/autopackage.sh b/debian/autopackage.sh index 73a833b0b..511c5771f 100755 --- a/debian/autopackage.sh +++ b/debian/autopackage.sh @@ -12,7 +12,7 @@ then fi # Libraries dependencies -dependencies="libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libosip2-2, libexosip2-4, libcommoncpp2-1.6-0 , libccrtp1-1.6-0 , sflphone-iax2 , libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , dbus-c++-1 (>=0.5.0)" +dependencies="libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libosip2-2, libexosip2-4, libcommoncpp2-1.6-0 , libccrtp1-1.6-0 , sflphone-iax2 , libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11)" # Package Infos package="sflphone" @@ -54,7 +54,7 @@ cp $sharedir/applications/sflphone.desktop $sfldir$sharedir/applications/ #/usr/share/dbus-1/services mkdir -p $sfldir$sharedir/dbus-1/services cp $sharedir/dbus-1/services/org.sflphone.SFLphone.service $sfldir$sharedir/dbus-1/services/ -/usr/share/pixmaps +#/usr/share/pixmaps mkdir -p $sfldir$sharedir/pixmaps cp $sharedir/pixmaps/sflphone.png $sfldir$sharedir/pixmaps #/usr/share/sflphone @@ -96,4 +96,4 @@ dpkg --build $sfldir ${sfldir}_$2.deb # Clean up the generated stuff echo "Clean up ... " -rm -rf $sfldir +#rm -rf $sfldir diff --git a/po/fr.po b/po/fr.po index 028443697..e04d62584 100644 --- a/po/fr.po +++ b/po/fr.po @@ -103,6 +103,10 @@ msgstr "_Barre d'outils" msgid "_View" msgstr "A_ffichage" +#: sflphone-gtk/src/calltree.c: 206 +msgid "\"Voicemail\" <%s>" +msgstr "\"Boite vocale\" <%s>" + #: sflphone-gtk/src/calltree.c: 336 sflphone-gtk/src/calltree.c: 337 msgid "Place a call" msgstr "Appeler" @@ -132,7 +136,7 @@ msgid "History" msgstr "Historique" #: sflphone-gtk/src/calltree.c: 394 sflphone-gtk/src/calltree.c: 397 -msgid "Voicemail box" +msgid "Voicemail" msgstr "Boite vocale" #: sflphone-gtk/src/configwindow.c: 799 @@ -211,6 +215,10 @@ msgstr "Paramètres Audio" msgid "Accounts" msgstr "Comptes" +#: sflphone-gtk/src/configwindow.c: 1203 +msgid "Accounts previously setup" +msgstr "Liste des comptes existants" + #: sflphone-gtk/src/configwindow.c: 1254 msgid "Desktop Notification" msgstr "Notifications du bureau" @@ -247,9 +255,9 @@ msgstr "Historique des appels" msgid "_Maximum number of calls" msgstr "N_ombre maximum d'appels" -#: sflphone-gtk/src/configwindow.c: 1203 -msgid "Accounts previously setup" -msgstr "Liste des comptes existants" +#: sflphone-gtk/src/configwindow.c: 1352 +msgid "General Settings" +msgstr "Préférences" #: sflphone-gtk/src/accountwindow.c: 139 msgid "Account settings" @@ -319,6 +327,10 @@ msgstr "%d messages vocaux" msgid "%d voice mail" msgstr "%d message vocal" +#: sflphone-gtk/src/actions.c: 70 +msgid "%s account- %s" +msgstr "compte %s- %s" + #: sflphone-gtk/src/actions.c: 162 msgid "Unable to connect to the SFLphone server.\n" " Make sure the daemon is running." @@ -381,6 +393,14 @@ msgstr "Volume des hauts-parleurs" msgid "Mic volume" msgstr "Volume du micro" +#: sflphone-gtk/src/mainwindow.c: 69 +msgid "There is one call in progress.\nDo you still want to quit?" +msgstr "Vous avez un appel en cours.\nVoulez-vous quitter?" + +#: sflphone-gtk/src/mainwindow.c: 69 +msgid "There are calls in progress.\nDo you still want to quit?" +msgstr "Vous avez des appels en cours.\nVoulez-vous quitter?" + #: sflphone-gtk/src/mainwindow.c: 179 msgid "Welcome to SFLphone!\n\n" "There is no VoIP account configured.\n" @@ -467,3 +487,16 @@ msgstr "Félicitations!" msgid "This assistant is now finished.\n\n You can at any time check your registration state or modify your accounts parameters in the Options/Accounts window." msgstr "Cet assistant est maintenant terminé.\n\n Vous pouvez à tout moment vérifier votre état d'enregistrement ou modifier les paramètres de vos comptes dans la fenêtre Options/Comptes." +#: sflphone-gtk/src/timestamp.c: 45 +msgid "Missed call" +msgstr "Appel manqué" + +#: sflphone-gtk/src/timestamp.c: 63 +msgid "Duration: %s" +msgstr "Durée: %s" + +#: sflphone-gtk/src/historyfilter.c: 78 +msgid "Search" +msgstr "Recherche" + + diff --git a/sflphone-gtk/configure.ac b/sflphone-gtk/configure.ac index 3a95fb913..f88b7dc34 100644 --- a/sflphone-gtk/configure.ac +++ b/sflphone-gtk/configure.ac @@ -2,7 +2,7 @@ AC_INIT([SFLphone],[0.8],[sflphoneteam@savoirfairelinux.com],[sflphone]) AM_CONFIG_HEADER(config.h) PACKAGE=SFLphone -VERSION=0.8 +VERSION=0.9 AM_INIT_AUTOMAKE($PACKAGE,$VERSION) diff --git a/sflphone-gtk/src/accountwindow.c b/sflphone-gtk/src/accountwindow.c index e46819612..c6c0c4574 100644 --- a/sflphone-gtk/src/accountwindow.c +++ b/sflphone-gtk/src/accountwindow.c @@ -1,5 +1,6 @@ /* - * Copyright (C) 2007 Savoir-Faire Linux inc. + * Copyright (C) 2007-2008 Savoir-Faire Linux inc. + * Author: Emmanuel Milou * Author: Pierre-Luc Beaudoin * * This program is free software; you can redistribute it and/or modify @@ -17,12 +18,14 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include + +#include #include #include +#include #include /** Local variables */ @@ -90,6 +93,7 @@ stun_state( void ) show_account_window (account_t * a) { guint response; + GtkWidget *image; currentAccount = a; @@ -223,7 +227,9 @@ show_account_window (account_t * a) label = gtk_label_new_with_mnemonic (_("_User name")); gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5); - entryUsername = gtk_entry_new(); + entryUsername = sexy_icon_entry_new(); + image = gtk_image_new_from_stock( GTK_STOCK_DIALOG_AUTHENTICATION , GTK_ICON_SIZE_SMALL_TOOLBAR ); + sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(entryUsername), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) ); gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryUsername); gtk_entry_set_text(GTK_ENTRY(entryUsername), curUsername); gtk_table_attach ( GTK_TABLE( table ), entryUsername, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); @@ -231,7 +237,9 @@ show_account_window (account_t * a) label = gtk_label_new_with_mnemonic (_("_Password")); gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 7, 8, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5); - entryPassword = gtk_entry_new(); + entryPassword = sexy_icon_entry_new(); + image = gtk_image_new_from_stock( GTK_STOCK_DIALOG_AUTHENTICATION , GTK_ICON_SIZE_SMALL_TOOLBAR ); + sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(entryPassword), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) ); gtk_entry_set_visibility(GTK_ENTRY(entryPassword), FALSE); gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryPassword); gtk_entry_set_text(GTK_ENTRY(entryPassword), curPassword); diff --git a/sflphone-gtk/src/accountwindow.h b/sflphone-gtk/src/accountwindow.h index d0bcb0e67..2b393a332 100644 --- a/sflphone-gtk/src/accountwindow.h +++ b/sflphone-gtk/src/accountwindow.h @@ -24,6 +24,7 @@ * @brief The window to edit account details. */ + /** * Display the main account widget * @param a The account you want to edit or null for a new account diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c index b98a75e06..93c33138d 100644 --- a/sflphone-gtk/src/actions.c +++ b/sflphone-gtk/src/actions.c @@ -67,7 +67,7 @@ status_bar_display_account( call_t* c) account_t* acc; if(c->accountID != NULL){ acc = account_list_get_by_id(c->accountID); - msg = g_markup_printf_escaped("%s account- %s" , + msg = g_markup_printf_escaped(_("%s account- %s") , (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE), (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS)); statusbar_push_message( msg , __MSG_ACCOUNT_DEFAULT); diff --git a/sflphone-gtk/src/assistant.c b/sflphone-gtk/src/assistant.c index 4871741bf..a76f97622 100644 --- a/sflphone-gtk/src/assistant.c +++ b/sflphone-gtk/src/assistant.c @@ -19,6 +19,8 @@ #include +#include + #if GTK_CHECK_VERSION(2,10,0) struct _wizard *wiz; @@ -164,6 +166,7 @@ build_sip_account_configuration( void ) { GtkWidget* table; GtkWidget* label; + GtkWidget* image; wiz->sip_account = create_vbox( GTK_ASSISTANT_PAGE_CONTENT , _("SIP account configuration") , _("Please fill the following information:")); // table @@ -192,7 +195,9 @@ build_sip_account_configuration( void ) label = gtk_label_new_with_mnemonic (_("_User name")); gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5); - wiz->sip_username = gtk_entry_new(); + wiz->sip_username = sexy_icon_entry_new(); + image = gtk_image_new_from_stock( GTK_STOCK_DIALOG_AUTHENTICATION , GTK_ICON_SIZE_SMALL_TOOLBAR ); + sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(wiz->sip_username), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) ); gtk_label_set_mnemonic_widget (GTK_LABEL (label), wiz->sip_username); gtk_table_attach ( GTK_TABLE( table ), wiz->sip_username, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); @@ -200,7 +205,8 @@ build_sip_account_configuration( void ) label = gtk_label_new_with_mnemonic (_("_Password")); gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5); - wiz->sip_password = gtk_entry_new(); + wiz->sip_password = sexy_icon_entry_new(); + sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(wiz->sip_password), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) ); gtk_label_set_mnemonic_widget (GTK_LABEL (label), wiz->sip_password); gtk_entry_set_visibility(GTK_ENTRY(wiz->sip_password), FALSE); gtk_table_attach ( GTK_TABLE( table ), wiz->sip_password, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); @@ -213,6 +219,7 @@ build_iax_account_configuration( void ) { GtkWidget* label; GtkWidget* table; + GtkWidget* image; wiz->iax_account = create_vbox( GTK_ASSISTANT_PAGE_CONFIRM , _("IAX2 account configuration") , _("Please fill the following information:")); @@ -241,7 +248,9 @@ build_iax_account_configuration( void ) label = gtk_label_new_with_mnemonic (_("_User name")); gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5); - wiz->iax_username = gtk_entry_new(); + wiz->iax_username = sexy_icon_entry_new(); + image = gtk_image_new_from_stock( GTK_STOCK_DIALOG_AUTHENTICATION , GTK_ICON_SIZE_SMALL_TOOLBAR ); + sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(wiz->iax_username), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) ); gtk_label_set_mnemonic_widget (GTK_LABEL (label), wiz->iax_username); gtk_table_attach ( GTK_TABLE( table ), wiz->iax_username, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); @@ -249,7 +258,8 @@ build_iax_account_configuration( void ) label = gtk_label_new_with_mnemonic (_("_Password")); gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5); - wiz->iax_password = gtk_entry_new(); + wiz->iax_password = sexy_icon_entry_new(); + sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(wiz->iax_password), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) ); gtk_label_set_mnemonic_widget (GTK_LABEL (label), wiz->iax_password); gtk_entry_set_visibility(GTK_ENTRY(wiz->iax_password), FALSE); gtk_table_attach ( GTK_TABLE( table ), wiz->iax_password, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); diff --git a/sflphone-gtk/src/assistant.h b/sflphone-gtk/src/assistant.h index 40faa207e..ec87c679b 100644 --- a/sflphone-gtk/src/assistant.h +++ b/sflphone-gtk/src/assistant.h @@ -25,6 +25,7 @@ #include #include + #if GTK_CHECK_VERSION(2,10,0) #define _SIP 0 diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c index a61e285c9..a247f8127 100644 --- a/sflphone-gtk/src/calltree.c +++ b/sflphone-gtk/src/calltree.c @@ -203,8 +203,7 @@ call_mailbox( GtkWidget* widget , gpointer data ) call_t* mailboxCall = g_new0( call_t , 1); mailboxCall->state = CALL_STATE_DIALING; mailboxCall->to = g_strdup(g_hash_table_lookup(current->properties, ACCOUNT_MAILBOX)); - //mailboxCall->from = g_strconcat("\"Voicemail Box\" <>", NULL); - mailboxCall->from = g_markup_printf_escaped("\"Voicemail\" <%s>", mailboxCall->to); + mailboxCall->from = g_markup_printf_escaped(_("\"Voicemail\" <%s>"), mailboxCall->to); mailboxCall->callID = g_new0(gchar, 30); g_sprintf(mailboxCall->callID, "%d", rand()); mailboxCall->accountID = g_strdup(current->accountID); @@ -476,11 +475,11 @@ create_toolbar () active_calltree = current_calls; image = gtk_image_new_from_file( ICONS_DIR "/mailbox.svg"); - mailboxButton = gtk_tool_button_new( image , _("Voicemail box")); + mailboxButton = gtk_tool_button_new( image , _("Voicemail")); gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(mailboxButton), image); if( account_list_get_size() ==0 ) gtk_widget_set_state( GTK_WIDGET(mailboxButton), GTK_STATE_INSENSITIVE ); #if GTK_CHECK_VERSION(2,12,0) - gtk_widget_set_tooltip_text(GTK_WIDGET(mailboxButton), _("Voicemail box")); + gtk_widget_set_tooltip_text(GTK_WIDGET(mailboxButton), _("Voicemail")); #endif g_signal_connect (G_OBJECT (mailboxButton), "clicked", G_CALLBACK (call_mailbox), NULL); diff --git a/sflphone-gtk/src/historyfilter.c b/sflphone-gtk/src/historyfilter.c index 76d21a075..2d98dc91c 100644 --- a/sflphone-gtk/src/historyfilter.c +++ b/sflphone-gtk/src/historyfilter.c @@ -42,7 +42,7 @@ is_visible(GtkTreeModel* model, GtkTreeIter* iter, gpointer data) if(G_VALUE_HOLDS_STRING(&val)){ text = (gchar *)g_value_get_string(&val); } - if(text != NULL && g_ascii_strncasecmp(search, "Search", 6) != 0){ + if(text != NULL && g_ascii_strncasecmp(search, _("Search"), 6) != 0){ return g_regex_match_simple(search, text, G_REGEX_CASELESS, 0); } return TRUE; @@ -60,7 +60,7 @@ filter_entry_changed(GtkEntry* entry, gchar* arg1, gpointer data) void clear_filter_entry_if_default(GtkWidget* widget, gpointer user_data) { - if(g_ascii_strncasecmp(gtk_entry_get_text(GTK_ENTRY(filter_entry)), "Search", 6) == 0) + if(g_ascii_strncasecmp(gtk_entry_get_text(GTK_ENTRY(filter_entry)), _("Search"), 6) == 0) gtk_entry_set_text(GTK_ENTRY(filter_entry), ""); } @@ -75,7 +75,7 @@ create_filter_entry() image = gtk_image_new_from_stock( GTK_STOCK_FIND , GTK_ICON_SIZE_SMALL_TOOLBAR); sexy_icon_entry_set_icon( SEXY_ICON_ENTRY(filter_entry), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(image) ); sexy_icon_entry_add_clear_button( SEXY_ICON_ENTRY(filter_entry) ); - gtk_entry_set_text(GTK_ENTRY(filter_entry), "Search"); + gtk_entry_set_text(GTK_ENTRY(filter_entry), _("Search")); g_signal_connect(GTK_ENTRY(filter_entry), "changed", G_CALLBACK(filter_entry_changed), NULL); g_signal_connect(GTK_ENTRY(filter_entry), "grab-focus", G_CALLBACK(clear_filter_entry_if_default), NULL); diff --git a/sflphone-gtk/src/mainwindow.c b/sflphone-gtk/src/mainwindow.c index ddf0124d5..ca71e53cc 100644 --- a/sflphone-gtk/src/mainwindow.c +++ b/sflphone-gtk/src/mainwindow.c @@ -66,11 +66,11 @@ main_window_ask_quit(){ if(count == 1) { - question = "There is one call in progress.\nDo you still want to quit?"; + question = _("There is one call in progress.\nDo you still want to quit?"); } else { - question = "There are calls in progress.\nDo you still want to quit?"; + question = _("There are calls in progress.\nDo you still want to quit?"); } dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(window) , diff --git a/sflphone-gtk/src/menus.c b/sflphone-gtk/src/menus.c index d9f8acfd2..b57721f66 100644 --- a/sflphone-gtk/src/menus.c +++ b/sflphone-gtk/src/menus.c @@ -115,25 +115,27 @@ help_about ( void * foo) "Alexandre Bourget ", "Pierre-Luc Beaudoin ", "Emmanuel Milou " - "Jean-Philippe Barrette-LaPierre", + "Jean-Philippe Barrette-LaPierre", "Laurielle Lea", NULL}; gchar *artists[] = { "Pierre-Luc Beaudoin ", + "Emmanuel Milou ", NULL}; gchar *translators[] = { - "", + "Maxime Chambreuil ", + "Emmanuel Milou ", NULL}; gtk_show_about_dialog( GTK_WINDOW(get_main_window()), + "artists", artists, + "authors", authors, + "comments", _("SFLphone is a VoIP client compatible with SIP and IAX2 protocols."), + "copyright", "Copyright © 2004-2008 Savoir-faire Linux Inc.", "name", PACKAGE, "title", _("About SFLphone"), "version", VERSION, "website", "http://www.sflphone.org", - "copyright", "Copyright © 2004-2008 Savoir-faire Linux Inc.", - "comments", _("SFLphone is a VoIP client compatible with SIP and IAX2 protocols."), - "artists", artists, - "authors", authors, NULL); } diff --git a/sflphone-gtk/src/timestamp.c b/sflphone-gtk/src/timestamp.c index e3b6e2c21..77f552d32 100644 --- a/sflphone-gtk/src/timestamp.c +++ b/sflphone-gtk/src/timestamp.c @@ -19,8 +19,8 @@ #include -char* months[12] = {"january","february","march", "april", "may", "june", "july", "august", "september", "october", "november", "december"}; -char* week_days[7] = {"Sun", "Mon", "Tue","Wed","Thu","Fri","Sat"}; +gchar* months[12] = {"january","february","march", "april", "may", "june", "july", "august", "september", "october", "november", "december"}; +gchar* week_days[7] = {"Sun", "Mon", "Tue","Wed","Thu","Fri","Sat"}; gchar* timestamp_get_call_date( void ) @@ -42,7 +42,7 @@ process_call_duration( call_t* c ) g_print("Start = %i - Stop = %i - Call duration = %i\n", c->_start , c->_stop , (int)(c->_stop - c->_start)); if( c->history_state == MISSED && c->_stop == 0 ) - return g_markup_printf_escaped("Missed call"); + return g_markup_printf_escaped(_("Missed call")); int duration = c->_stop - c->_start; @@ -60,7 +60,7 @@ process_call_duration( call_t* c ) else res = g_markup_printf_escaped("%i:%i" , duration/60 , duration%60); } - return g_markup_printf_escaped("Duration: %s", res); + return g_markup_printf_escaped(_("Duration: %s"), res); } gchar* diff --git a/sflphone-gtk/src/timestamp.h b/sflphone-gtk/src/timestamp.h index 0804ff62c..07e93db43 100644 --- a/sflphone-gtk/src/timestamp.h +++ b/sflphone-gtk/src/timestamp.h @@ -32,7 +32,6 @@ #include #include - gchar* timestamp_get_call_date( void ); gchar* process_call_duration( call_t* c );