diff --git a/autogen.sh b/autogen.sh
index 060b7d28caecc796d33338ec6d96568c6187cef8..06b6a97c95e0c7f4db9c8bd21a358a14784e9187 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,5 +6,4 @@ libtoolize --force
autoheader
autoconf -f
automake -a
-
-echo "\nDone! Now you can ./configure. \n"
+./configure $@
diff --git a/po/Makefile.am b/po/Makefile.am
index c5e67123b756d1464b2a3e9097770cc757d6b805..bcb563c6681ba931b6e0d67e4c40928c047bc9a4 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -2,19 +2,22 @@
locale_installdir=$(datadir)/locale
DOMAIN=sflphone
+POTFILE=sflphone.pot
+
POFILES=\
fr.po \
es.po \
de.po \
- zh_CN.po
+ zh_CN.po
MOFILES=\
fr.mo \
es.mo \
de.mo \
- zh_CN.mo
+ zh_CN.mo
MSGFMT=msgfmt
+MSGMERGE=msgmerge
# necessary files
EXTRA_DIST= $(POFILES)
@@ -25,6 +28,7 @@ all: $(MOFILES)
SUFFIXES=.po .mo
.po.mo:
+ $(MSGMERGE) --update $< $(POTFILE)
$(MSGFMT) -o $@ $<
install-data-local:
diff --git a/po/README b/po/README
index 54acb021544a3a2c428cb987bc9c5519361888f4..fd7b8b023f6686fd97a055ea9751b34e1b396719 100644
--- a/po/README
+++ b/po/README
@@ -1,17 +1,6 @@
If we need to update sflphone.pot file, do the following steps:
->cd sflphone-gtk/src
->xgettext -k_ -o sflphone.pot *.c
+xgettext -k_ -o sflphone.pot ../sflphone-gtk/src/*.c
->msgmerge --update zh_CN.po sflphone.pot
->msgmerge --update fr.po sflphone.pot
->msgmerge --update es.po sflphone.pot
->msgmerge --update de.po sflphone.pot
-
-Modify all the new po files, and then
-
->msgfmt -o zh_CN.mo zh_CN.po
->msgfmt -o fr.mo fr.po
->msgfmt -o es.mo es.po
->msgfmt -o de.mo de.po
+Then make && sudo make install
diff --git a/po/de.po b/po/de.po
index b1d8980ef8d296bb682fe0966519a8f4aaa45df9..5f8b5cbccc28b514c29b4e099a605d163c0a138e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,13 +4,12 @@
#
# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
#
-
-#POT-Creation-Date: 2007-01-13 01:39+0100\n
-
+# POT-Creation-Date: 2007-01-13 01:39+0100\n
msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.8.2\n"
-"Report-Msgid-Bugs-To: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com >\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-05 16:41-0500\n"
"PO-Revision-Date: 2008-03-27 11:15\n"
"Last-Translator: Emmanuel Milou <emmnauel.milou@savoirfairelinux.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -19,339 +18,555 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: src/audio/audiolayer.cpp: 318
-msgid "Error while opening capture device "
+#: accountlist.c:158
+msgid "Registered"
msgstr ""
-#: src/audio/audiolayer.cpp: 349
-msgid "Error while opening playback device "
+#: accountlist.c:161
+msgid "Not Registered"
msgstr ""
-#: sflphone-gtk/src/menus.c: 119
-msgid "About SFLphone"
+#: accountlist.c:164
+msgid "Trying..."
msgstr ""
-#: sflphone-gtk/src/menus.c: 124
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr ""
+#: accountlist.c:167 sflnotify.c:171 sflnotify.c:210
+msgid "Error"
+msgstr ""
-#: sflphone-gtk/src/menus.c: 150
-msgid "_Help"
+#: accountlist.c:170
+msgid "Bad authentification"
msgstr ""
-#: sflphone-gtk/src/menus.c: 207
-msgid "_New call"
+#: accountlist.c:173
+msgid "Network unreachable"
msgstr ""
-#: sflphone-gtk/src/menus.c: 217 menus.c: 605
-msgid "_Pick up"
+#: accountlist.c:175
+msgid "Host unreachable"
msgstr ""
-#: sflphone-gtk/src/menus.c: 225 menus.c: 617
-msgid "_Hang up"
+#: accountlist.c:178
+msgid "Invalid"
msgstr ""
-#: sflphone-gtk/src/menus.c: 233 menus.c: 629
-msgid "On _Hold"
+#: accountwindow.c:143
+msgid "Account settings"
msgstr ""
-#: sflphone-gtk/src/menus.c: 254
-msgid "_Call"
+#: accountwindow.c:155
+#, fuzzy
+msgid "Account parameters"
+msgstr "Konten"
+
+#: accountwindow.c:177
+msgid "_Enabled"
msgstr ""
-#: sflphone-gtk/src/menus.c: 423
-msgid "_Accounts"
-msgstr "_Konten"
+#: accountwindow.c:183 assistant.c:210 assistant.c:264
+msgid "_Alias"
+msgstr ""
-#: sflphone-gtk/src/menus.c: 438
-msgid "_Edit"
+#: accountwindow.c:191
+msgid "_Protocol"
msgstr ""
-#: sflphone-gtk/src/menus.c: 462
-msgid "_Dialpad"
+#: accountwindow.c:209
+msgid "Unknown"
msgstr ""
-#: sflphone-gtk/src/menus.c: 471
-msgid "_Volume controls"
+#: accountwindow.c:219 assistant.c:218 assistant.c:272
+msgid "_Host name"
msgstr ""
-#: sflphone-gtk/src/menus.c: 479
-msgid "_Toolbar"
+#: accountwindow.c:227 assistant.c:226 assistant.c:280
+msgid "_User name"
msgstr ""
-#: sflphone-gtk/src/menus.c: 492
-msgid "_View"
+#: accountwindow.c:238 assistant.c:236 assistant.c:290
+msgid "_Password"
msgstr ""
-#: sflphone-gtk/src/calltree.c: 286 calltree.c: 287
-msgid "Place a call"
+#: accountwindow.c:249
+msgid "_Voicemail box #"
msgstr ""
-#: sflphone-gtk/src/calltree.c: 293 calltree.c: 294
-msgid "Pick up"
+#: accountwindow.c:260 assistant.c:313
+msgid "Network Address Translation"
msgstr ""
-#: sflphone-gtk/src/calltree.c: 301 calltree.c: 302
-msgid "Hang up"
+#: accountwindow.c:271 assistant.c:322
+msgid "E_nable STUN"
msgstr ""
-#: sflphone-gtk/src/calltree.c: 309 calltree.c: 310
-msgid "Off Hold"
+#: accountwindow.c:275
+msgid "Enable it if you are behind a firewall, then restart SFLphone"
msgstr ""
-#: sflphone-gtk/src/calltree.c: 317 calltree.c: 318
-msgid "On Hold"
+#: accountwindow.c:279
+msgid "_STUN Server"
msgstr ""
-#: sflphone-gtk/src/calltree.c: 327 calltree.c: 328
-msgid "Transfer"
+#: accountwindow.c:286
+msgid "Format: name.server:port"
+msgstr ""
+
+#: actions.c:57 sflnotify.c:103
+#, c-format
+msgid "%d voice mails"
+msgstr ""
+
+#: actions.c:59
+#, c-format
+msgid "%d voice mail"
+msgstr ""
+
+#: actions.c:80
+#, fuzzy, c-format
+msgid "%s account- %s"
+msgstr "Konten"
+
+#: actions.c:214
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+
+#: actions.c:741
+#, c-format
+msgid ""
+"<b>Error: No audio codecs found.\n"
+"\n"
+"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
+"b> directory in your home( <i>%s</i> )"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 799
+#: assistant.c:138
+msgid "SFLphone account configuration wizard"
+msgstr ""
+
+#: assistant.c:165
+msgid "SFLphone 0.8"
+msgstr ""
+
+#: assistant.c:165
+msgid "Welcome to SFLphone!"
+msgstr ""
+
+#: assistant.c:167
+msgid "This installation wizard will help you configure an account."
+msgstr ""
+
+#: assistant.c:182
+msgid "VoIP Protocols"
+msgstr ""
+
+#: assistant.c:182
+msgid "Select an account type:"
+msgstr ""
+
+#: assistant.c:202
+msgid "SIP account configuration"
+msgstr ""
+
+#: assistant.c:202 assistant.c:256
+msgid "Please fill the following information:"
+msgstr ""
+
+#: assistant.c:256
+msgid "IAX2 account configuration"
+msgstr ""
+
+#: assistant.c:313
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+
+#: assistant.c:329
+msgid "_STUN server"
+msgstr ""
+
+#: assistant.c:346
+msgid "Account Registration"
+msgstr ""
+
+#: assistant.c:346
+msgid "Congratulations!"
+msgstr ""
+
+#: assistant.c:348
+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 ""
+
+#: audioconf.c:150
+#, c-format
+msgid "audio device index for output = %d\n"
+msgstr ""
+
+#: audioconf.c:558
msgid "Name"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 804
+#: audioconf.c:563
msgid "Frequency"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 809
+#: audioconf.c:568
msgid "Bitrate"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 814
+#: audioconf.c:573
msgid "Bandwidth"
msgstr "Bandbreite"
-#: sflphone-gtk/src/configwindow.c: 892
-msgid "Protocol"
+#: audioconf.c:633
+msgid "Pulseaudio"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 900
-msgid "Status"
+#: audioconf.c:636
+msgid "ALSA"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 934
-msgid "Default"
+#: audioconf.c:662
+msgid "ALSA plugin"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 935
-msgid "Set the selected account as the default one to make calls"
+#: audioconf.c:684
+msgid "Output"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 976
-msgid "Devices"
+#: audioconf.c:706
+msgid "Input"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1018
-msgid "ALSA plugin"
+#: audioconf.c:739
+msgid "_Enable ringtones"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1039
-msgid "Output peripheral"
+#: audioconf.c:744
+msgid "Choose a ringtone"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1060
-msgid "Input peripheral"
+#: audioconf.c:749
+msgid "Audio Files"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1080
-msgid "Detect all"
+#: audioconf.c:774
+msgid "Sound Manager"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1107
-msgid "_Enable ringtones"
+#: audioconf.c:781
+msgid "ALSA configuration"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1112
-msgid "Choose a ringtone"
+#: audioconf.c:791
+msgid "Codecs"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1117
-msgid "Audio Files"
+#: audioconf.c:799
+msgid "Ringtones"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1142
-msgid "Preferences"
+#: calltree.c:208
+#, c-format
+msgid "\"Voicemail\" <%s>"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1167
-msgid "Audio Settings"
+#: calltree.c:405 calltree.c:407
+msgid "Place a call"
msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1191
-msgid "Accounts"
-msgstr "Konten"
+#: calltree.c:414 calltree.c:416
+msgid "Pick up"
+msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1203
-msgid "Accounts previously setup"
+#: calltree.c:424 calltree.c:426
+msgid "Hang up"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 150
-msgid "Account settings"
+#: calltree.c:434 calltree.c:436
+msgid "Off Hold"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 177
-msgid "_Enabled"
+#: calltree.c:445 calltree.c:447
+msgid "On Hold"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 187
-msgid "_Alias"
+#: calltree.c:458 calltree.c:460
+msgid "Transfer"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 195
-msgid "_Protocol"
+#: calltree.c:470 calltree.c:472
+msgid "History"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 214
-msgid "Unknown"
+#: calltree.c:480 calltree.c:484
+msgid "Voicemail"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 224
-msgid "_Full Name"
+#: configwindow.c:371
+msgid "Protocol"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 232
-msgid "_User part"
+#: configwindow.c:378
+msgid "Status"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 240
-msgid "_Host part"
+#: configwindow.c:470
+msgid "Desktop Notification"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 248
-msgid "U_sername"
+#: configwindow.c:478
+msgid "_Enable"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 256
-msgid "_Password"
+#: configwindow.c:483
+msgid "_Notify voice mails"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 267
-msgid "<b>NAT Detection</b>"
+#: configwindow.c:489
+msgid "System Tray Icon"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 270
-msgid "E_nable STUN"
+#: configwindow.c:497
+msgid "_Popup main window on incoming call"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 275
-msgid "Enable it if you are behind a firewall, then restart SFLphone"
+#: configwindow.c:502
+msgid "Ne_ver popup main window"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 277
-msgid "S_TUN Server"
+#: configwindow.c:506
+msgid "_Start hidden"
msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 283
-msgid "Format: name.server:port"
+#: configwindow.c:512
+msgid "Calls History"
msgstr ""
-#: sflphone-gtk/src/actions.c: 45
-msgid "%d voice mails"
+#: configwindow.c:520
+msgid "_Maximum number of calls"
msgstr ""
-#: sflphone-gtk/src/actions.c: 47
-msgid "%d voice mail"
+#: configwindow.c:536
+msgid "PulseAudio sound server"
+msgstr ""
+
+#: configwindow.c:544
+msgid "_Control running applications volume"
+msgstr ""
+
+#: configwindow.c:557
+msgid "SIP Port"
+msgstr ""
+
+#: configwindow.c:566
+msgid "Apply"
+msgstr ""
+
+#: configwindow.c:570
+msgid "Port:"
+msgstr ""
+
+#: configwindow.c:600
+msgid "Preferences"
msgstr ""
-#: sflphone-gtk/src/actions.c: 162
-msgid "Unable to connect to the SFLphone server.\n"
-" Make sure the daemon is running."
+#: configwindow.c:620
+msgid "General Settings"
msgstr ""
-""
-#: sflphone-gtk/src/actions.c: 544
-msgid "The account selected as default is not registered."
+#: configwindow.c:625
+msgid "Audio Settings"
msgstr ""
-#: sflphone-gtk/src/actions.c: 557
-msgid "There is no registered account to make this call with."
+#: configwindow.c:649
+msgid "Accounts"
+msgstr "Konten"
+
+#: configwindow.c:661
+msgid "Accounts previously setup"
msgstr ""
-#: sflphone-gtk/src/actions.c: 591
-msgid "<b>ALSA notification</b>\n\n"
+#: errors.c:28
+msgid ""
+"<b>ALSA notification</b>\n"
+"\n"
"Error while opening playback device"
msgstr ""
-""
-#: sflphone-gtk/src/actions.c: 594
-msgid "<b>ALSA notification</b>\n\n"
+#: errors.c:31
+msgid ""
+"<b>ALSA notification</b>\n"
+"\n"
"Error while opening capture device"
msgstr ""
-""
-#: sflphone-gtk/src/actions.c: 632
-msgid "<b>Error: No audio codecs found.\n\n</b>"
-" SFL audio codecs have to be placed in <i>%s</i>"
-" or in the <b>.sflphone</b> directory in your home( <i>%s</i> )"
+#: errors.c:34
+msgid ""
+"<b>Pulseaudio notification</b>\n"
+"\n"
+"Pulseaudio is not running"
msgstr ""
-""
-""
-#: sflphone-gtk/src/accountlist.c: 148
-msgid "Registered"
+#: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
+msgid "Search"
msgstr ""
-#: sflphone-gtk/src/accountlist.c: 151
-msgid "Not Registered"
+#: mainwindow.c:69
+msgid ""
+"<b>There is one call in progress.</b>\n"
+"Do you still want to quit?"
msgstr ""
-#: sflphone-gtk/src/accountlist.c: 154
-msgid "Trying..."
+#: mainwindow.c:73
+msgid ""
+"<b>There are calls in progress.</b>\n"
+"Do you still want to quit?"
msgstr ""
-#: sflphone-gtk/src/accountlist.c: 157
-msgid "Error"
+#: menus.c:130
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr ""
-#: sflphone-gtk/src/accountlist.c: 160
-msgid "Invalid"
+#: menus.c:133
+msgid "About SFLphone"
msgstr ""
-#: sflphone-gtk/src/sliders.c: 166
-msgid "Speakers volume"
+#: menus.c:156
+msgid "_Help"
msgstr ""
-#: sflphone-gtk/src/sliders.c: 168
-msgid "Mic volume"
+#: menus.c:273
+msgid "_New call"
+msgstr ""
+
+#: menus.c:285 menus.c:769
+msgid "_Pick up"
msgstr ""
-#: sflphone-gtk/src/mainwindow.c: 179
-msgid "<b><big>Welcome to SFLphone!</big></b>\n\n"
-"There is no VoIP account configured.\n"
-" Would you like to create one now?"
+#: menus.c:295 menus.c:781
+msgid "_Hang up"
msgstr ""
-""
-""
-#: sflphone-gtk/src/SFLnotify.c: 32
+#: menus.c:305 menus.c:793
+msgid "On _Hold"
+msgstr ""
+
+#: menus.c:321
+#, fuzzy
+msgid "_Account Assistant"
+msgstr "_Konten"
+
+#: menus.c:351
+msgid "_Call"
+msgstr ""
+
+#: menus.c:497
+msgid "History empty"
+msgstr ""
+
+#: menus.c:538
+msgid "_Clear history"
+msgstr ""
+
+#: menus.c:550
+msgid "_Accounts"
+msgstr "_Konten"
+
+#: menus.c:565
+msgid "_Edit"
+msgstr ""
+
+#: menus.c:625
+msgid "_Dialpad"
+msgstr ""
+
+#: menus.c:637
+msgid "_Volume controls"
+msgstr ""
+
+#: menus.c:646
+msgid "_Search history"
+msgstr ""
+
+#: menus.c:654
+msgid "_View"
+msgstr ""
+
+#: menus.c:876
+msgid "_Call back"
+msgstr ""
+
+#: sflnotify.c:34 sflnotify.c:100
+#, c-format
msgid "%s account: %s"
msgstr ""
-#: sflphone-gtk/src/SFLnotify.c: 35
+#: sflnotify.c:37
+#, c-format
msgid "<i>From:</i> %s"
msgstr ""
-#: sflphone-gtk/src/SFLnotify.c: 50
+#: sflnotify.c:52
msgid "Accept"
msgstr ""
-#: sflphone-gtk/src/SFLnotify.c: 51
+#: sflnotify.c:53
msgid "Refuse"
msgstr ""
-#: sflphone-gtk/src/SFLnotify.c: 52
+#: sflnotify.c:54 sflnotify.c:117 sflnotify.c:154
msgid "Ignore"
msgstr ""
-#: sflphone-gtk/src/statusicon.c: 80
-msgid "Show main window"
+#: sflnotify.c:136
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr ""
+
+#: sflnotify.c:140
+msgid "Current account"
+msgstr ""
+
+#: sflnotify.c:169
+msgid "You haven't setup any accounts"
+msgstr ""
+
+#: sflnotify.c:185 sflnotify.c:224
+#, fuzzy
+msgid "Setup Accounts"
+msgstr "Konten"
+
+#: sflnotify.c:208
+msgid "You have no registered accounts"
+msgstr ""
+
+#: sliders.c:161
+msgid "Speakers volume"
+msgstr ""
+
+#: sliders.c:163
+msgid "Mic volume"
+msgstr ""
+
+#: statusicon.c:91
+msgid "_Show main window"
+msgstr ""
+
+#: statusicon.c:124
+#, c-format
+msgid "SFLphone - %i accounts registered"
msgstr ""
-#: sflphone-gtk/src/statusicon.c: 113
-msgid "SFLphone - %i account registered"
-msgid_plural "SFLphone - %i accounts registered"
-msgstr[0] ""
-msgstr[1] ""
+#: timestamp.c:45
+msgid "<small>Missed call</small>"
+msgstr ""
+#: timestamp.c:63
+#, c-format
+msgid "<small>Duration:</small> %s"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 2ac69b73399a88877b2a527c479e01b3077b24f1..85319280625cfa27d10c20aef46b255a759c67c1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,442 +4,600 @@
#
# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
#
-
-#POT-Creation-Date: 2007-01-13 01:39+0100\n
-
+# POT-Creation-Date: 2007-01-13 01:39+0100\n
msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.8.2\n"
-"Report-Msgid-Bugs-To: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com >\n"
-"PO-Revision-Date: 2008-03-27 11:15\n"
-"Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-05 16:41-0500\n"
+"PO-Revision-Date: 2008-08-11 11:53+0200\n"
+"Last-Translator: Carlos Galisteo <cgalisteo AT k-rolus.net>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: src/audio/audiolayer.cpp: 318
-msgid "Error while opening capture device "
-msgstr "Error abriendo el dispositivo de captura "
+#: accountlist.c:158
+msgid "Registered"
+msgstr "Registrado"
-#: src/audio/audiolayer.cpp: 349
-msgid "Error while opening playback device "
-msgstr "Error abriendo el dispositivo del aparato de lectura "
+#: accountlist.c:161
+msgid "Not Registered"
+msgstr "No registrado"
-#: sflphone-gtk/src/menus.c: 119
-msgid "About SFLphone"
-msgstr "Sobre SFLphone"
+#: accountlist.c:164
+msgid "Trying..."
+msgstr "Intentando..."
-#: sflphone-gtk/src/menus.c: 124
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone es un telefono por Internet compatible con los protocolos SIP y IAX2"
+#: accountlist.c:167 sflnotify.c:171 sflnotify.c:210
+msgid "Error"
+msgstr "Error"
-#: sflphone-gtk/src/menus.c: 150
-msgid "_Help"
-msgstr "_Ayuda"
+#: accountlist.c:170
+msgid "Bad authentification"
+msgstr ""
-#: sflphone-gtk/src/menus.c: 207
-msgid "_New call"
-msgstr "_Nueva llamada"
+#: accountlist.c:173
+msgid "Network unreachable"
+msgstr ""
-#: sflphone-gtk/src/menus.c: 217 menus.c: 605
-msgid "_Pick up"
-msgstr "_Colgar"
+#: accountlist.c:175
+#, fuzzy
+msgid "Host unreachable"
+msgstr "_Parte del servidor"
-#: sflphone-gtk/src/menus.c: 225 menus.c: 617
-msgid "_Hang up"
-msgstr "_Descolgar"
+#: accountlist.c:178
+msgid "Invalid"
+msgstr "Inválido"
-#: sflphone-gtk/src/menus.c: 233 menus.c: 629
-msgid "On _Hold"
-msgstr "_Sostener"
+#: accountwindow.c:143
+msgid "Account settings"
+msgstr "Configuración de cuentas"
-#: sflphone-gtk/src/menus.c: 254
-msgid "_Call"
-msgstr "_Llamar"
+#: accountwindow.c:155
+msgid "Account parameters"
+msgstr "Parà metros de cuenta"
-#: sflphone-gtk/src/menus.c: 270
-msgid "_Account Assistant"
-msgstr "_Asistente de Cuenta"
+#: accountwindow.c:177
+msgid "_Enabled"
+msgstr "_Activado"
-#: sflphone-gtk/src/menus.c: 423
-msgid "_Accounts"
-msgstr "_Cuentas"
+#: accountwindow.c:183 assistant.c:210 assistant.c:264
+msgid "_Alias"
+msgstr "_Alias"
-#: sflphone-gtk/src/menus.c: 438
-msgid "_Edit"
-msgstr "_Edición"
+#: accountwindow.c:191
+msgid "_Protocol"
+msgstr "_Protocolo"
-#: sflphone-gtk/src/menus.c: 462
-msgid "_Dialpad"
-msgstr "_Pantalla de numero"
+#: accountwindow.c:209
+msgid "Unknown"
+msgstr "Desconocido"
-#: sflphone-gtk/src/menus.c: 471
-msgid "_Volume controls"
-msgstr "_Controles de volumen"
+#: accountwindow.c:219 assistant.c:218 assistant.c:272
+msgid "_Host name"
+msgstr "_Nombre de equipo"
-#: sflphone-gtk/src/menus.c: 479
-msgid "_Toolbar"
-msgstr "_Herramientas"
+#: accountwindow.c:227 assistant.c:226 assistant.c:280
+msgid "_User name"
+msgstr "_Usuario"
-#: sflphone-gtk/src/menus.c: 492
-msgid "_View"
-msgstr "_Ver"
+#: accountwindow.c:238 assistant.c:236 assistant.c:290
+msgid "_Password"
+msgstr "_Contraseña"
-#: sflphone-gtk/src/calltree.c: 336 sflphone-gtk/src/calltree.c: 337
-msgid "Place a call"
-msgstr "Llamar"
+#: accountwindow.c:249
+msgid "_Voicemail box #"
+msgstr "_Número de buzón de voz"
-#: sflphone-gtk/src/calltree.c: 343 sflphone-gtk/src/calltree.c: 344
-msgid "Pick up"
-msgstr "Colgar"
+#: accountwindow.c:260 assistant.c:313
+msgid "Network Address Translation"
+msgstr "Conversión de Dirección de Red (NAT)"
-#: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
-msgid "Hang up"
-msgstr "Descolgar"
+#: accountwindow.c:271 assistant.c:322
+msgid "E_nable STUN"
+msgstr "A_ctivar STUN"
-#: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
-msgid "Off Hold"
-msgstr "Seguir"
+#: accountwindow.c:275
+msgid "Enable it if you are behind a firewall, then restart SFLphone"
+msgstr "ActÃvelo si está detrás de un cortafuegos, después reinicie SFLphone"
-#: sflphone-gtk/src/calltree.c: 367 sflphone-gtk/src/calltree.c: 368
-msgid "On Hold"
-msgstr "Sostener"
+#: accountwindow.c:279
+msgid "_STUN Server"
+msgstr "_Servidor STUN"
-#: sflphone-gtk/src/calltree.c: 375 sflphone-gtk/src/calltree.c: 376
-msgid "Transfer"
-msgstr "Transferir"
+#: accountwindow.c:286
+msgid "Format: name.server:port"
+msgstr "Formato: nombre.servidor:puerto"
-#: sflphone-gtk/src/configwindow.c: 799
+#: actions.c:57 sflnotify.c:103
+#, c-format
+msgid "%d voice mails"
+msgstr "%d mensajes de voz"
+
+#: actions.c:59
+#, c-format
+msgid "%d voice mail"
+msgstr "%d mensaje de voz"
+
+#: actions.c:80
+#, fuzzy, c-format
+msgid "%s account- %s"
+msgstr "%s cuenta: %s"
+
+#: actions.c:214
+#, fuzzy
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"Incapaz de conectar con el servidor SFLphone.\n"
+" Asegúrese de que el demonio esté funcionando."
+
+#: actions.c:741
+#, c-format
+msgid ""
+"<b>Error: No audio codecs found.\n"
+"\n"
+"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
+"b> directory in your home( <i>%s</i> )"
+msgstr ""
+"<b>Error: Codecs de audio no encontrados.\n"
+"\n"
+"</b> Los codecs de audio de SFLphone deben estar en <i>%s</i> o en el "
+"directorio <b>.sflphone</b> de su home( <i>%s</i> )"
+
+#: assistant.c:138
+msgid "SFLphone account configuration wizard"
+msgstr "Asistente de configuración de cuentas de SFLphone"
+
+#: assistant.c:165
+#, fuzzy
+msgid "SFLphone 0.8"
+msgstr "Sobre SFLphone"
+
+#: assistant.c:165
+msgid "Welcome to SFLphone!"
+msgstr "¡Bienvenido a SFLphone!"
+
+#: assistant.c:167
+msgid "This installation wizard will help you configure an account."
+msgstr "Este asistente de instalación le ayudará a configurar una cuenta."
+
+#: assistant.c:182
+msgid "VoIP Protocols"
+msgstr "Protocolos VoIP"
+
+#: assistant.c:182
+msgid "Select an account type:"
+msgstr "Escoja un tipo de cuenta:"
+
+#: assistant.c:202
+msgid "SIP account configuration"
+msgstr "Configuración de cuenta SIP"
+
+#: assistant.c:202 assistant.c:256
+msgid "Please fill the following information:"
+msgstr "Por favor, rellene la siguiente información:"
+
+#: assistant.c:256
+msgid "IAX2 account configuration"
+msgstr "Configuración de cuenta IAX2"
+
+#: assistant.c:313
+msgid "You should probably enable this if you are behind a firewall."
+msgstr "Probablemente tiene que activar esto si está detrás de un cortafuegos."
+
+#: assistant.c:329
+#, fuzzy
+msgid "_STUN server"
+msgstr "_Servidor STUN"
+
+#: assistant.c:346
+msgid "Account Registration"
+msgstr "Registro de cuenta"
+
+#: assistant.c:346
+msgid "Congratulations!"
+msgstr "¡Enhorabuena!"
+
+#: assistant.c:348
+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 ""
+"Ese asistante ha finalizado.\n"
+"\n"
+"Puede comprobar en cualquier momento su estado de registro o modificar la "
+"configuración de sus cuentas en la ventana de Opciones/Cuentas."
+
+#: audioconf.c:150
+#, c-format
+msgid "audio device index for output = %d\n"
+msgstr ""
+
+#: audioconf.c:558
msgid "Name"
msgstr "Nombre"
-#: sflphone-gtk/src/configwindow.c: 804
+#: audioconf.c:563
msgid "Frequency"
-msgstr "Frequencia"
+msgstr "Frecuencia"
-#: sflphone-gtk/src/configwindow.c: 809
+#: audioconf.c:568
msgid "Bitrate"
-msgstr "Bitrato"
+msgstr "Tasa de transferencia"
-#: sflphone-gtk/src/configwindow.c: 814
+#: audioconf.c:573
msgid "Bandwidth"
msgstr "Ancho de banda"
-#: sflphone-gtk/src/configwindow.c: 892
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: sflphone-gtk/src/configwindow.c: 900
-msgid "Status"
-msgstr "Estado"
-
-#: sflphone-gtk/src/configwindow.c: 934
-msgid "Default"
-msgstr "Defecto"
-
-#: sflphone-gtk/src/configwindow.c: 935
-msgid "Set the selected account as the default one to make calls"
-msgstr "Fije la cuenta seleccionada como el defecto para llamar"
+#: audioconf.c:633
+msgid "Pulseaudio"
+msgstr ""
-#: sflphone-gtk/src/configwindow.c: 976
-msgid "Devices"
-msgstr "Dispositivos"
+#: audioconf.c:636
+msgid "ALSA"
+msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1018
+#: audioconf.c:662
msgid "ALSA plugin"
msgstr "Plugin ALSA"
-#: sflphone-gtk/src/configwindow.c: 1039
-msgid "Output peripheral"
-msgstr "Periférico de salida"
-
-#: sflphone-gtk/src/configwindow.c: 1060
-msgid "Input peripheral"
-msgstr "Periférico de entrada"
+#: audioconf.c:684
+msgid "Output"
+msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1080
-msgid "Detect all"
-msgstr "Detecte todos"
+#: audioconf.c:706
+msgid "Input"
+msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1107
+#: audioconf.c:739
msgid "_Enable ringtones"
-msgstr "_Permitir los ringtones"
+msgstr "_Habilitar tonos de llamada"
-#: sflphone-gtk/src/configwindow.c: 1112
+#: audioconf.c:744
msgid "Choose a ringtone"
-msgstr "Elija un ringtones"
+msgstr "Elija un tono de llmada"
-#: sflphone-gtk/src/configwindow.c: 1117
+#: audioconf.c:749
msgid "Audio Files"
-msgstr "Archivos Audio"
+msgstr "Archivos de Audio"
-#: sflphone-gtk/src/configwindow.c: 1142
-msgid "Preferences"
-msgstr "Preferencias"
+#: audioconf.c:774
+msgid "Sound Manager"
+msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1167
-msgid "Audio Settings"
-msgstr "Configuración Audio"
+#: audioconf.c:781
+#, fuzzy
+msgid "ALSA configuration"
+msgstr "Configuraciòn de cuenta SIP"
-#: sflphone-gtk/src/configwindow.c: 1191
-msgid "Accounts"
-msgstr "Cuentas"
+#: audioconf.c:791
+msgid "Codecs"
+msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1203
-msgid "Accounts previously setup"
-msgstr "Cuentas existentes"
+#: audioconf.c:799
+#, fuzzy
+msgid "Ringtones"
+msgstr "_Permitir los ringtones"
+
+#: calltree.c:208
+#, fuzzy, c-format
+msgid "\"Voicemail\" <%s>"
+msgstr "_Numero de Caja de Voz"
-#: sflphone-gtk/src/configwindow.c: 1254
+#: calltree.c:405 calltree.c:407
+msgid "Place a call"
+msgstr "Llamar"
+
+#: calltree.c:414 calltree.c:416
+msgid "Pick up"
+msgstr "Descolgar"
+
+#: calltree.c:424 calltree.c:426
+msgid "Hang up"
+msgstr "Colgar"
+
+#: calltree.c:434 calltree.c:436
+msgid "Off Hold"
+msgstr "Seguir"
+
+#: calltree.c:445 calltree.c:447
+msgid "On Hold"
+msgstr "Retener"
+
+#: calltree.c:458 calltree.c:460
+msgid "Transfer"
+msgstr "Transferir"
+
+#: calltree.c:470 calltree.c:472
+#, fuzzy
+msgid "History"
+msgstr "Historia de Llamada"
+
+#: calltree.c:480 calltree.c:484
+#, fuzzy
+msgid "Voicemail"
+msgstr "%d mensaje"
+
+#: configwindow.c:371
+msgid "Protocol"
+msgstr "Protocolo"
+
+#: configwindow.c:378
+msgid "Status"
+msgstr "Estado"
+
+#: configwindow.c:470
msgid "Desktop Notification"
-msgstr "Notificación de Escritorio"
+msgstr "Notificación de escritorio"
-#: sflphone-gtk/src/configwindow.c: 1263
+#: configwindow.c:478
msgid "_Enable"
msgstr "_Activar"
-#: sflphone-gtk/src/configwindow.c: 1268
-msgid "_Notify Voice Mails"
-msgstr "_Notificar Mensajes Vocales"
+#: configwindow.c:483
+#, fuzzy
+msgid "_Notify voice mails"
+msgstr "_Notificar mensajes de voz"
-#: sflphone-gtk/src/configwindow.c: 1274
+#: configwindow.c:489
msgid "System Tray Icon"
-msgstr "Icono de Bandeja del Sistema"
+msgstr "Icono de bandeja del sistema"
-#: sflphone-gtk/src/configwindow.c: 1283
-msgid "_Popup Main Window On Incoming Call"
-msgstr "_Popup Ventana Principal por las Llamadas Recibidas"
+#: configwindow.c:497
+#, fuzzy
+msgid "_Popup main window on incoming call"
+msgstr "_Popup ventana principal al recibir llamadas"
-#: sflphone-gtk/src/configwindow.c: 1288
-msgid "Ne_ver Popup Main Window"
-msgstr "_Jamas Popup Ventana Principal"
+#: configwindow.c:502
+#, fuzzy
+msgid "Ne_ver popup main window"
+msgstr "_Nunca mostrar ventana principal"
-#: sflphone-gtk/src/configwindow.c: 1292
-msgid "_Start Hidden"
-msgstr "_Iniciar Escondido"
+#: configwindow.c:506
+#, fuzzy
+msgid "_Start hidden"
+msgstr "_Iniciar oculto"
-#: sflphone-gtk/src/configwindow.c: 1297
+#: configwindow.c:512
msgid "Calls History"
-msgstr "Historia de Llamada"
+msgstr "Historial de llamadas"
-#: sflphone-gtk/src/configwindow.c: 1307
+#: configwindow.c:520
msgid "_Maximum number of calls"
-msgstr "_Numero Maximo de Llamadas"
+msgstr "_Numero maximo de llamadas"
-#: sflphone-gtk/src/accountwindow.c: 139
-msgid "Account settings"
-msgstr "Configuración de cuentas"
+#: configwindow.c:536
+msgid "PulseAudio sound server"
+msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 151
-msgid "Account parameters"
-msgstr "Parà metros de Cuenta"
+#: configwindow.c:544
+msgid "_Control running applications volume"
+msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 174
-msgid "_Enabled"
-msgstr "_Activado"
+#: configwindow.c:557
+msgid "SIP Port"
+msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 180 sflphone-gtk/src/assistant.c: 161 sflphone-gtk/src/assistant.c: 210
-msgid "_Alias"
-msgstr "_Alias"
+#: configwindow.c:566
+msgid "Apply"
+msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 188
-msgid "_Protocol"
-msgstr "_Protocolo"
+#: configwindow.c:570
+msgid "Port:"
+msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 206
-msgid "Unknown"
-msgstr "Desconocido"
+#: configwindow.c:600
+msgid "Preferences"
+msgstr "Preferencias"
-#: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
-msgid "_Host name"
-msgstr "_Parte del servidor"
+#: configwindow.c:620
+#, fuzzy
+msgid "General Settings"
+msgstr "Configuración Audio"
-#: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
-msgid "_User name"
-msgstr "_Usuario"
+#: configwindow.c:625
+msgid "Audio Settings"
+msgstr "Configuración de audio"
-#: sflphone-gtk/src/accountwindow.c: 232 sflphone-gtk/src/assistant.c: 185 sflphone-gtk/src/assistant.c: 234
-msgid "_Password"
-msgstr "_Contraseña"
+#: configwindow.c:649
+msgid "Accounts"
+msgstr "Cuentas"
-#: sflphone-gtk/src/accountwindow.c: 241
-msgid "_Voicemail box #"
-msgstr "_Numero de Caja de Voz"
+#: configwindow.c:661
+msgid "Accounts previously setup"
+msgstr "Cuentas existentes"
-#: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
-msgid "Network Address Translation"
-msgstr "Conversión de Dirección de Red"
+#: errors.c:28
+msgid ""
+"<b>ALSA notification</b>\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"<b>Notificación ALSA</b>\n"
+"\n"
+"Error al abrir el dispositivo de reproducción"
-#: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
-msgid "E_nable STUN"
-msgstr "A_ctivar STUN"
+#: errors.c:31
+msgid ""
+"<b>ALSA notification</b>\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"<b>Notificación ALSA</b>\n"
+"\n"
+"Error al abrir el dispositivo de captura"
-#: sflphone-gtk/src/accountwindow.c: 267
-msgid "Enable it if you are behind a firewall, then restart SFLphone"
-msgstr "Activar si esta atras un cortafuego, despues reiniciar SFLphone"
+#: errors.c:34
+msgid ""
+"<b>Pulseaudio notification</b>\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
-msgid "_STUN Server"
-msgstr "_Servidor STUN"
+#: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
+msgid "Search"
+msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 276
-msgid "Format: name.server:port"
-msgstr "Formato: nombre.servidor:puerto"
+#: mainwindow.c:69
+msgid ""
+"<b>There is one call in progress.</b>\n"
+"Do you still want to quit?"
+msgstr ""
-#: sflphone-gtk/src/actions.c: 45
-msgid "%d voice mails"
-msgstr "%d mensajes"
+#: mainwindow.c:73
+msgid ""
+"<b>There are calls in progress.</b>\n"
+"Do you still want to quit?"
+msgstr ""
-#: sflphone-gtk/src/actions.c: 47
-msgid "%d voice mail"
-msgstr "%d mensaje"
+#: menus.c:130
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr ""
+"SFLphone es un telefono por Internet compatible con los protocolos SIP y IAX2"
-#: sflphone-gtk/src/actions.c: 162
-msgid "Unable to connect to the SFLphone server.\n"
-" Make sure the daemon is running."
-msgstr "Incapaz e conectar con el servidor SFLphone.\n"
-" Checa que el demonio está funcionando."
+#: menus.c:133
+msgid "About SFLphone"
+msgstr "Sobre SFLphone"
-#: sflphone-gtk/src/actions.c: 544
-msgid "The account selected as default is not registered."
-msgstr "La cuenta seleccionada como defecto no es registrada."
+#: menus.c:156
+msgid "_Help"
+msgstr "_Ayuda"
-#: sflphone-gtk/src/actions.c: 557
-msgid "There is no registered account to make this call with."
-msgstr "No hay cuenta registrada para hacer esta llamada"
+#: menus.c:273
+msgid "_New call"
+msgstr "_Nueva llamada"
-#: sflphone-gtk/src/actions.c: 591
-msgid "<b>ALSA notification</b>\n\n"
-"Error while opening playback device"
-msgstr "<b>Notificación ALSA</b>\n\n"
-"Error abriendo el dispositivo del aparato de lectura"
+#: menus.c:285 menus.c:769
+msgid "_Pick up"
+msgstr "_Descolgar"
-#: sflphone-gtk/src/actions.c: 594
-msgid "<b>ALSA notification</b>\n\n"
-"Error while opening capture device"
-msgstr "<b>Notificación ALSA</b>\n\n"
-"Error abriendo el dispositivo de captura"
-
-#r sflphone-gtk/src/actions.c: 632
-msgid "<b>Error: No audio codecs found.\n\n</b>"
-" SFL audio codecs have to be placed in <i>%s</i>"
-" or in the <b>.sflphone</b> directory in your home( <i>%s</i> )"
-msgstr "<b>Error: No codec audio encontrado.\n\n</b>"
-" Los codecs audio de SFLphone deben estar en <i>%s</i>"
-" o en el directorio <b>.sflphone</b> de su home( <i>%s</i> )"
-
-#: sflphone-gtk/src/accountlist.c: 148
-msgid "Registered"
-msgstr "Registrado"
+#: menus.c:295 menus.c:781
+msgid "_Hang up"
+msgstr "_Colgar"
-#: sflphone-gtk/src/accountlist.c: 151
-msgid "Not Registered"
-msgstr "No registrado"
+#: menus.c:305 menus.c:793
+msgid "On _Hold"
+msgstr "En _Espera"
-#: sflphone-gtk/src/accountlist.c: 154
-msgid "Trying..."
-msgstr "Tratando..."
+#: menus.c:321
+msgid "_Account Assistant"
+msgstr "_Asistente de Cuenta"
-#: sflphone-gtk/src/accountlist.c: 157
-msgid "Error"
-msgstr "Error"
+#: menus.c:351
+msgid "_Call"
+msgstr "_Llamar"
-#: sflphone-gtk/src/accountlist.c: 160
-msgid "Invalid"
-msgstr "Inválido"
+#: menus.c:497
+msgid "History empty"
+msgstr ""
-#: sflphone-gtk/src/sliders.c: 166
-msgid "Speakers volume"
-msgstr "Volumen de altavoces"
+#: menus.c:538
+#, fuzzy
+msgid "_Clear history"
+msgstr "Historia de Llamada"
-#: sflphone-gtk/src/sliders.c: 168
-msgid "Mic volume"
-msgstr "Volumen del micrófono"
+#: menus.c:550
+msgid "_Accounts"
+msgstr "_Cuentas"
+
+#: menus.c:565
+msgid "_Edit"
+msgstr "_Editar"
+
+#: menus.c:625
+msgid "_Dialpad"
+msgstr "_Teclado numérico"
-#: sflphone-gtk/src/mainwindow.c: 179
-msgid "<b><big>Welcome to SFLphone!</big></b>\n\n"
-"There is no VoIP account configured.\n"
-" Would you like to create one now?"
-msgstr "<b><big>Bienvenido en SFLphone!</big></b>\n\n"
-"No hay cuenta VoIP configurada.\n"
-" Usted quiere crear una ?"
+#: menus.c:637
+msgid "_Volume controls"
+msgstr "_Controles de volumen"
+
+#: menus.c:646
+msgid "_Search history"
+msgstr ""
+
+#: menus.c:654
+msgid "_View"
+msgstr "_Ver"
-#: sflphone-gtk/src/SFLnotify.c: 32
+#: menus.c:876
+#, fuzzy
+msgid "_Call back"
+msgstr "_Llamar"
+
+#: sflnotify.c:34 sflnotify.c:100
+#, c-format
msgid "%s account: %s"
msgstr "%s cuenta: %s"
-#: sflphone-gtk/src/SFLnotify.c: 35
+#: sflnotify.c:37
+#, c-format
msgid "<i>From:</i> %s"
msgstr "<i>De:</i> %s"
-#: sflphone-gtk/src/SFLnotify.c: 50
+#: sflnotify.c:52
msgid "Accept"
msgstr "Aceptar"
-#: sflphone-gtk/src/SFLnotify.c: 51
+#: sflnotify.c:53
msgid "Refuse"
-msgstr "Renunciar"
+msgstr "Rechazar"
-#: sflphone-gtk/src/SFLnotify.c: 52
+#: sflnotify.c:54 sflnotify.c:117 sflnotify.c:154
msgid "Ignore"
msgstr "Ignorar"
-#: sflphone-gtk/src/statusicon.c: 80
-msgid "Show main window"
-msgstr "Mostrar Ventana Principal"
-
-#: sflphone-gtk/src/statusicon.c: 113
-msgid "SFLphone - %i account registered"
-msgid_plural "SFLphone - %i accounts registered"
-msgstr[0] "SFLphone - %i cuenta registrada"
-msgstr[1] "SFLphone - %i cuentas registradas"
-
-#: sflphone-gtk/src/assistant.c: 91
-msgid "SFLphone account configuration wizard"
-msgstr "Asistante de Configuración de Cuenta SFLphone"
-
-#: sflphone-gtk/src/assistant.c: 122
-msgid "Welcome to SFLphone!"
-msgstr "Bienvenido en SFLphone!"
-
-#: sflphone-gtk/src/assistant.c: 119
-msgid "This installation wizard will help you configure an account."
-msgstr "Ese asistante de instalaciòn ayuda usted a configurar una cuenta."
+#: sflnotify.c:136
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr ""
-#: sflphone-gtk/src/assistant.c: 134
-msgid "VoIP Protocols"
-msgstr "Protocolos VoIP"
+#: sflnotify.c:140
+msgid "Current account"
+msgstr ""
-#: sflphone-gtk/src/assistant.c: 134
-msgid "Select an account type:"
-msgstr "Escoje un tipo de cuenta:"
+#: sflnotify.c:169
+msgid "You haven't setup any accounts"
+msgstr ""
-#: sflphone-gtk/src/assistant.c: 153
-msgid "SIP account configuration"
-msgstr "Configuraciòn de cuenta SIP"
+#: sflnotify.c:185 sflnotify.c:224
+#, fuzzy
+msgid "Setup Accounts"
+msgstr "Cuentas"
-#: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
-msgid "Please fill the following information:"
-msgstr "Por favor de llenar esas informaciones:"
+#: sflnotify.c:208
+msgid "You have no registered accounts"
+msgstr ""
-#: sflphone-gtk/src/assistant.c: 202
-msgid "IAX2 account configuration"
-msgstr "Configuraciòn de cuenta IAX2"
+#: sliders.c:161
+msgid "Speakers volume"
+msgstr "Volumen de altavoces"
-#: sflphone-gtk/src/assistant.c: 256
-msgid "You should probably enable this if you are behind a firewall."
-msgstr "Probablemente, tiene que activar eso si usted esta atras de un cortafuego."
+#: sliders.c:163
+msgid "Mic volume"
+msgstr "Volumen del micrófono"
-#: sflphone-gtk/src/assistant.c: 289
-msgid "Account Registration"
-msgstr "Registraciòn de Cuenta"
+#: statusicon.c:91
+#, fuzzy
+msgid "_Show main window"
+msgstr "Mostrar ventana principal"
-#: sflphone-gtk/src/assistant.c: 289
-msgid "Congratulations!"
-msgstr "Felicitaciones!"
+#: statusicon.c:124
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts registered"
+msgstr "SFLphone - %i cuenta registrada"
-#: sflphone-gtk/src/assistant.c: 291
-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 "Ese asistante esta terminado.\n\n Usted puede checar su estado de registraciòn o cambiar sus parametros de cuentas en cualquier momento en la ventana de Opciones/Cuentas."
+#: timestamp.c:45
+msgid "<small>Missed call</small>"
+msgstr ""
+#: timestamp.c:63
+#, c-format
+msgid "<small>Duration:</small> %s"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index fcae4b705480137306402eb14e7e7103602cc9db..25ba4ff41601ece4a3e7d63f488f2d93843dbd3d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,12 @@
#
# Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>, 2008.
#
-
-#POT-Creation-Date: 2007-01-13 01:39+0100\n
-
+# POT-Creation-Date: 2007-01-13 01:39+0100\n
msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.8.2\n"
-"Report-Msgid-Bugs-To: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com >\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-05 16:41-0500\n"
"PO-Revision-Date: 2008-03-31 14:15\n"
"Last-Translator: Emmanuel Milou <emmnauel.milou@savoirfairelinux.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -19,488 +18,583 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: src/audio/audiolayer.cpp: 318
-msgid "Error while opening capture device "
-msgstr "Erreur lors de l'ouverture du périphérique de capture "
+#: accountlist.c:158
+msgid "Registered"
+msgstr "Enregistré"
-#: src/audio/audiolayer.cpp: 349
-msgid "Error while opening playback device "
-msgstr "Erreur lors de l'ouverture du périphérique de lecture "
+#: accountlist.c:161
+msgid "Not Registered"
+msgstr "Non Enregistré"
-#: sflphone-gtk/src/menus.c: 119
-msgid "About SFLphone"
-msgstr "A propos de SFLphone"
+#: accountlist.c:164
+msgid "Trying..."
+msgstr "En cours..."
-#: sflphone-gtk/src/menus.c: 124
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone est un client VoIP compatible avec les protocoles SIP et IAX2."
+#: accountlist.c:167 sflnotify.c:171 sflnotify.c:210
+msgid "Error"
+msgstr "Erreur"
-#: sflphone-gtk/src/menus.c: 150
-msgid "_Help"
-msgstr "A_ide"
+#: accountlist.c:170
+msgid "Bad authentification"
+msgstr "Erreur d'authentification"
-#: sflphone-gtk/src/menus.c: 207
-msgid "_New call"
-msgstr "_Nouvel appel"
+#: accountlist.c:173
+msgid "Network unreachable"
+msgstr "Réseau non trouvé"
-#: sflphone-gtk/src/menus.c: 217 menus.c: 605
-msgid "_Pick up"
-msgstr "_Décrocher"
+#: accountlist.c:175
+#, fuzzy
+msgid "Host unreachable"
+msgstr "_Serveur"
-#: sflphone-gtk/src/menus.c: 225 menus.c: 617
-msgid "_Hang up"
-msgstr "_Raccrocher"
+#: accountlist.c:178
+msgid "Invalid"
+msgstr "Non valide"
-#: sflphone-gtk/src/menus.c: 233 menus.c: 629
-msgid "On _Hold"
-msgstr "_Mettre en attente"
+#: accountwindow.c:143
+msgid "Account settings"
+msgstr "Configuration des comptes"
-#: sflphone-gtk/src/menus.c: 254
-msgid "_Call"
-msgstr "_Actions"
+#: accountwindow.c:155
+msgid "Account parameters"
+msgstr "Paramètres du compte"
-#: sflphone-gtk/src/menus.c: 270
-msgid "_Account Assistant"
-msgstr "_Assistant SFLphone"
+#: accountwindow.c:177
+msgid "_Enabled"
+msgstr "_Activé"
-#: sflphone-gtk/src/menus.c: 423
-msgid "_Accounts"
-msgstr "Co_mptes"
+#: accountwindow.c:183 assistant.c:210 assistant.c:264
+msgid "_Alias"
+msgstr "A_lias"
-#: sflphone-gtk/src/menus.c: 523
-msgid "_Clear history"
-msgstr "Effacer l'historique"
+#: accountwindow.c:191
+msgid "_Protocol"
+msgstr "_Protocole"
-#: sflphone-gtk/src/menus.c: 523
-msgid "History empty"
-msgstr "L'historique est vide"
+#: accountwindow.c:209
+msgid "Unknown"
+msgstr "Inconnu"
-#: sflphone-gtk/src/menus.c: 523
-msgid "Clear the call history?"
-msgstr "Effacer l'historique des appels?"
+#: accountwindow.c:219 assistant.c:218 assistant.c:272
+msgid "_Host name"
+msgstr "_Serveur"
-#: sflphone-gtk/src/menus.c: 438
-msgid "_Edit"
-msgstr "_Options"
+#: accountwindow.c:227 assistant.c:226 assistant.c:280
+msgid "_User name"
+msgstr "Usa_ger"
-#: sflphone-gtk/src/menus.c: 462
-msgid "_Dialpad"
-msgstr "_Clavier"
+#: accountwindow.c:238 assistant.c:236 assistant.c:290
+msgid "_Password"
+msgstr "_Mot de passe"
-#: sflphone-gtk/src/menus.c: 471
-msgid "_Volume controls"
-msgstr "_Contrôle du volume"
+#: accountwindow.c:249
+msgid "_Voicemail box #"
+msgstr "_Boite vocale #"
-#: sflphone-gtk/src/menus.c: 610
-msgid "_Search history"
-msgstr "Recherche dans l'historique"
+#: accountwindow.c:260 assistant.c:313
+msgid "Network Address Translation"
+msgstr "Traduction d'adresse réseau (NAT)"
-#: sflphone-gtk/src/menus.c: 479
-msgid "_Toolbar"
-msgstr "_Barre d'outils"
+#: accountwindow.c:271 assistant.c:322
+msgid "E_nable STUN"
+msgstr "A_ctiver STUN"
-#: sflphone-gtk/src/menus.c: 492
-msgid "_View"
-msgstr "A_ffichage"
+#: accountwindow.c:275
+msgid "Enable it if you are behind a firewall, then restart SFLphone"
+msgstr "À activer si vous êtes derrière un pare-feu, puis redémarrez SFLphone"
-#: sflphone-gtk/src/calltree.c: 206
-msgid "\"Voicemail\" <%s>"
-msgstr "\"Boite vocale\" <%s>"
+#: accountwindow.c:279
+msgid "_STUN Server"
+msgstr "S_erveur STUN"
-#: sflphone-gtk/src/calltree.c: 336 sflphone-gtk/src/calltree.c: 337
-msgid "Place a call"
-msgstr "Appeler"
+#: accountwindow.c:286
+msgid "Format: name.server:port"
+msgstr "Format: nom.serveur:port"
-#: sflphone-gtk/src/calltree.c: 343 sflphone-gtk/src/calltree.c: 344
-msgid "Pick up"
-msgstr "Décrocher"
+#: actions.c:57 sflnotify.c:103
+#, c-format
+msgid "%d voice mails"
+msgstr "%d messages vocaux"
-#: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
-msgid "Hang up"
-msgstr "Raccrocher"
+#: actions.c:59
+#, c-format
+msgid "%d voice mail"
+msgstr "%d message vocal"
-#: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
-msgid "Off Hold"
-msgstr "Reprendre"
+#: actions.c:80
+#, c-format
+msgid "%s account- %s"
+msgstr "compte %s- %s"
-#: sflphone-gtk/src/calltree.c: 367 sflphone-gtk/src/calltree.c: 368
-msgid "On Hold"
-msgstr "Mettre en attente"
+#: actions.c:214
+#, fuzzy
+msgid ""
+"Unable to connect to the SFLphone server.\n"
+"Make sure the daemon is running."
+msgstr ""
+"Impossible de se connecter au serveur SFLphone.\n"
+" Assurez-vous que le démon est lancé."
-#: sflphone-gtk/src/calltree.c: 377 sflphone-gtk/src/calltree.c: 378
-msgid "Transfer"
-msgstr "Transférer"
+#: actions.c:741
+#, c-format
+msgid ""
+"<b>Error: No audio codecs found.\n"
+"\n"
+"</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</"
+"b> directory in your home( <i>%s</i> )"
+msgstr ""
+"<b>Erreur: Aucun codec audio trouvé.\n"
+"\n"
+"</b> Les codecs audio SFL doivent être soit dans <i>%s</i> soit dans le "
+"répertoire <b>.sflphone</b> de votre répertoire racine( <i>%s</i> )"
-#: sflphone-gtk/src/calltree.c: 385 sflphone-gtk/src/calltree.c: 386
-msgid "History"
-msgstr "Historique"
+#: assistant.c:138
+msgid "SFLphone account configuration wizard"
+msgstr "Assistant de configuration de compte"
-#: sflphone-gtk/src/calltree.c: 394 sflphone-gtk/src/calltree.c: 397
-msgid "Voicemail"
-msgstr "Boite vocale"
+#: assistant.c:165
+#, fuzzy
+msgid "SFLphone 0.8"
+msgstr "A propos de SFLphone"
-#: sflphone-gtk/src/configwindow.c: 548
-msgid "_Control running applications volume"
-msgstr "_Autoriser à modifier le volume des autres applications"
+#: assistant.c:165
+msgid "Welcome to SFLphone!"
+msgstr "Bienvenue dans SFLphone"
+
+#: assistant.c:167
+msgid "This installation wizard will help you configure an account."
+msgstr "Cet assistant va vous guider dans la configuration d'un compte. "
+
+#: assistant.c:182
+msgid "VoIP Protocols"
+msgstr "Protocoles VoIP"
+
+#: assistant.c:182
+msgid "Select an account type:"
+msgstr "Choisissez un type de compte:"
+
+#: assistant.c:202
+msgid "SIP account configuration"
+msgstr "Configuration d'un compte SIP"
+
+#: assistant.c:202 assistant.c:256
+msgid "Please fill the following information:"
+msgstr "Veuillez remplir les champs suivants:"
+
+#: assistant.c:256
+msgid "IAX2 account configuration"
+msgstr "Configuration d'un compte IAX2"
+
+#: assistant.c:313
+msgid "You should probably enable this if you are behind a firewall."
+msgstr ""
+"Vous devriez probablement activer cette option si \n"
+"vous vous trouvez derrière un pare-feu."
+
+#: assistant.c:329
+#, fuzzy
+msgid "_STUN server"
+msgstr "S_erveur STUN"
+
+#: assistant.c:346
+msgid "Account Registration"
+msgstr "Enregistrement du compte"
+
+#: assistant.c:346
+msgid "Congratulations!"
+msgstr "Félicitations!"
-#: sflphone-gtk/src/configwindow.c: 799
+#: assistant.c:348
+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."
+
+#: audioconf.c:150
+#, c-format
+msgid "audio device index for output = %d\n"
+msgstr "index du device audio de sortie = %d\n"
+
+#: audioconf.c:558
msgid "Name"
msgstr "Nom"
-#: sflphone-gtk/src/configwindow.c: 804
+#: audioconf.c:563
msgid "Frequency"
msgstr "Fréquence"
-#: sflphone-gtk/src/configwindow.c: 809
+#: audioconf.c:568
msgid "Bitrate"
msgstr "Bitrate"
-#: sflphone-gtk/src/configwindow.c: 814
+#: audioconf.c:573
msgid "Bandwidth"
msgstr "Bande passante"
-#: sflphone-gtk/src/configwindow.c: 892
-msgid "Protocol"
-msgstr "Protocole"
-
-#: sflphone-gtk/src/configwindow.c: 900
-msgid "Status"
-msgstr "Statut"
-
-#: sflphone-gtk/src/configwindow.c: 934
-msgid "Default"
-msgstr "Défaut"
-
-#: sflphone-gtk/src/configwindow.c: 935
-msgid "Set the selected account as the default one to make calls"
-msgstr "Utiliser le compte sélectionné pour passer des appels par défaut"
+#: audioconf.c:633
+msgid "Pulseaudio"
+msgstr ""
-#: sflphone-gtk/src/configwindow.c: 976
-msgid "Devices"
-msgstr "Matériel"
+#: audioconf.c:636
+msgid "ALSA"
+msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1018
+#: audioconf.c:662
msgid "ALSA plugin"
msgstr "Greffon ALSA"
-#: sflphone-gtk/src/configwindow.c: 1039
-msgid "Output peripheral"
-msgstr "Périphérique de sortie"
+#: audioconf.c:684
+msgid "Output"
+msgstr "Sortie"
-#: sflphone-gtk/src/configwindow.c: 1060
-msgid "Input peripheral"
-msgstr "Périphérique d'entrée"
+#: audioconf.c:706
+msgid "Input"
+msgstr "Entrée"
-#: sflphone-gtk/src/configwindow.c: 1080
-msgid "Detect all"
-msgstr "Détecter"
-
-#: sflphone-gtk/src/configwindow.c: 1107
+#: audioconf.c:739
msgid "_Enable ringtones"
msgstr "_Activer les sonneries"
-#: sflphone-gtk/src/configwindow.c: 1112
+#: audioconf.c:744
msgid "Choose a ringtone"
msgstr "Sélectionner une sonnerie"
-#: sflphone-gtk/src/configwindow.c: 1117
+#: audioconf.c:749
msgid "Audio Files"
msgstr "Fichier Audio"
-#: sflphone-gtk/src/configwindow.c: 1142
-msgid "Preferences"
-msgstr "Préférences"
+#: audioconf.c:774
+msgid "Sound Manager"
+msgstr "Interface Audio"
-#: sflphone-gtk/src/configwindow.c: 1167
-msgid "Audio Settings"
-msgstr "Paramètres Audio"
+#: audioconf.c:781
+#, fuzzy
+msgid "ALSA configuration"
+msgstr "Configuration d'un compte SIP"
-#: sflphone-gtk/src/configwindow.c: 1191
-msgid "Accounts"
-msgstr "Comptes"
+#: audioconf.c:791
+msgid "Codecs"
+msgstr ""
-#: sflphone-gtk/src/configwindow.c: 1203
-msgid "Accounts previously setup"
-msgstr "Liste des comptes existants"
+#: audioconf.c:799
+#, fuzzy
+msgid "Ringtones"
+msgstr "_Activer les sonneries"
+
+#: calltree.c:208
+#, c-format
+msgid "\"Voicemail\" <%s>"
+msgstr "\"Boite vocale\" <%s>"
+
+#: calltree.c:405 calltree.c:407
+msgid "Place a call"
+msgstr "Appeler"
+
+#: calltree.c:414 calltree.c:416
+msgid "Pick up"
+msgstr "Décrocher"
-#: sflphone-gtk/src/configwindow.c: 1254
+#: calltree.c:424 calltree.c:426
+msgid "Hang up"
+msgstr "Raccrocher"
+
+#: calltree.c:434 calltree.c:436
+msgid "Off Hold"
+msgstr "Reprendre"
+
+#: calltree.c:445 calltree.c:447
+msgid "On Hold"
+msgstr "Mettre en attente"
+
+#: calltree.c:458 calltree.c:460
+msgid "Transfer"
+msgstr "Transférer"
+
+#: calltree.c:470 calltree.c:472
+msgid "History"
+msgstr "Historique"
+
+#: calltree.c:480 calltree.c:484
+msgid "Voicemail"
+msgstr "Boite vocale"
+
+#: configwindow.c:371
+msgid "Protocol"
+msgstr "Protocole"
+
+#: configwindow.c:378
+msgid "Status"
+msgstr "Statut"
+
+#: configwindow.c:470
msgid "Desktop Notification"
msgstr "Notifications du bureau"
-#: sflphone-gtk/src/configwindow.c: 1263
+#: configwindow.c:478
msgid "_Enable"
msgstr "_Activer"
-#: sflphone-gtk/src/configwindow.c: 1268
+#: configwindow.c:483
msgid "_Notify voice mails"
msgstr "_Notifier les messages vocaux"
-#: sflphone-gtk/src/configwindow.c: 1274
+#: configwindow.c:489
msgid "System Tray Icon"
msgstr "Icône dans la barre des tâches"
-#: sflphone-gtk/src/configwindow.c: 1283
+#: configwindow.c:497
msgid "_Popup main window on incoming call"
msgstr "_Faire apparaître la fenêtre principale lors d'appel entrant"
-#: sflphone-gtk/src/configwindow.c: 1288
+#: configwindow.c:502
msgid "Ne_ver popup main window"
msgstr "Ne _jamais afficher la fenêtre principale"
-#: sflphone-gtk/src/configwindow.c: 1292
+#: configwindow.c:506
msgid "_Start hidden"
msgstr "_Démarrer caché"
-#: sflphone-gtk/src/configwindow.c: 1297
+#: configwindow.c:512
msgid "Calls History"
msgstr "Historique des appels"
-#: sflphone-gtk/src/configwindow.c: 1307
+#: configwindow.c:520
msgid "_Maximum number of calls"
msgstr "N_ombre maximum d'appels"
-#: sflphone-gtk/src/configwindow.c: 1352
-msgid "General Settings"
-msgstr "Préférences"
-
-#: sflphone-gtk/src/accountwindow.c: 139
-msgid "Account settings"
-msgstr "Configuration des comptes"
+#: configwindow.c:536
+msgid "PulseAudio sound server"
+msgstr "Serveur de son PulseAudio"
-#: sflphone-gtk/src/accountwindow.c: 151
-msgid "Account parameters"
-msgstr "Paramètres du compte"
+#: configwindow.c:544
+msgid "_Control running applications volume"
+msgstr "_Autoriser à modifier le volume des autres applications"
-#: sflphone-gtk/src/accountwindow.c: 174
-msgid "_Enabled"
-msgstr "_Activé"
+#: configwindow.c:557
+msgid "SIP Port"
+msgstr "Port SIP"
-#: sflphone-gtk/src/accountwindow.c: 180 sflphone-gtk/src/assistant.c: 161 sflphone-gtk/src/assistant.c: 210
-msgid "_Alias"
-msgstr "A_lias"
+#: configwindow.c:566
+msgid "Apply"
+msgstr "Appliquer"
-#: sflphone-gtk/src/accountwindow.c: 188
-msgid "_Protocol"
-msgstr "_Protocole"
+#: configwindow.c:570
+msgid "Port:"
+msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 206
-msgid "Unknown"
-msgstr "Inconnu"
+#: configwindow.c:600
+msgid "Preferences"
+msgstr "Préférences"
-#: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
-msgid "_Host name"
-msgstr "_Serveur"
+#: configwindow.c:620
+msgid "General Settings"
+msgstr "Préférences"
-#: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
-msgid "_User name"
-msgstr "Usa_ger"
+#: configwindow.c:625
+msgid "Audio Settings"
+msgstr "Paramètres Audio"
-#: sflphone-gtk/src/accountwindow.c: 232 sflphone-gtk/src/assistant.c: 185 sflphone-gtk/src/assistant.c: 234
-msgid "_Password"
-msgstr "_Mot de passe"
+#: configwindow.c:649
+msgid "Accounts"
+msgstr "Comptes"
-#: sflphone-gtk/src/accountwindow.c: 241
-msgid "_Voicemail box #"
-msgstr "_Boite vocale #"
+#: configwindow.c:661
+msgid "Accounts previously setup"
+msgstr "Liste des comptes existants"
-#: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
-msgid "Network Address Translation"
-msgstr "Traduction d'adresse réseau (NAT)"
+#: errors.c:28
+msgid ""
+"<b>ALSA notification</b>\n"
+"\n"
+"Error while opening playback device"
+msgstr ""
+"<b>Notification ALSA</b>\n"
+"\n"
+"Erreur lors de l'ouverture du périphérique de sortie"
-#: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
-msgid "E_nable STUN"
-msgstr "A_ctiver STUN"
+#: errors.c:31
+msgid ""
+"<b>ALSA notification</b>\n"
+"\n"
+"Error while opening capture device"
+msgstr ""
+"<b>Notification ALSA</b>\n"
+"\n"
+"Erreur lors de l'ouverture du périphérique d'entrée"
-#: sflphone-gtk/src/accountwindow.c: 267
-msgid "Enable it if you are behind a firewall, then restart SFLphone"
-msgstr "À activer si vous êtes derrière un pare-feu, puis redémarrez SFLphone"
+#: errors.c:34
+msgid ""
+"<b>Pulseaudio notification</b>\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
-#: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
-msgid "_STUN Server"
-msgstr "S_erveur STUN"
+#: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
+msgid "Search"
+msgstr "Recherche"
-#: sflphone-gtk/src/accountwindow.c: 276
-msgid "Format: name.server:port"
-msgstr "Format: nom.serveur:port"
+#: mainwindow.c:69
+msgid ""
+"<b>There is one call in progress.</b>\n"
+"Do you still want to quit?"
+msgstr ""
+"<b>Vous avez un appel en cours.</b>\n"
+"Voulez-vous quitter?"
-#: sflphone-gtk/src/actions.c: 45
-msgid "%d voice mails"
-msgstr "%d messages vocaux"
+#: mainwindow.c:73
+msgid ""
+"<b>There are calls in progress.</b>\n"
+"Do you still want to quit?"
+msgstr ""
+"<b>Vous avez des appels en cours.</b>\n"
+"Voulez-vous quitter?"
-#: sflphone-gtk/src/actions.c: 47
-msgid "%d voice mail"
-msgstr "%d message vocal"
+#: menus.c:130
+msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr ""
+"SFLphone est un client VoIP compatible avec les protocoles SIP et IAX2."
-#: sflphone-gtk/src/actions.c: 70
-msgid "%s account- %s"
-msgstr "compte %s- %s"
+#: menus.c:133
+msgid "About SFLphone"
+msgstr "A propos de SFLphone"
-#: sflphone-gtk/src/actions.c: 162
-msgid "Unable to connect to the SFLphone server.\n"
-" Make sure the daemon is running."
-msgstr "Impossible de se connecter au serveur SFLphone.\n"
-" Assurez-vous que le démon est lancé."
+#: menus.c:156
+msgid "_Help"
+msgstr "A_ide"
-#: sflphone-gtk/src/actions.c: 544
-msgid "The account selected as default is not registered."
-msgstr "Le compte sélectionné par défaut n'est pas enregistré."
+#: menus.c:273
+msgid "_New call"
+msgstr "_Nouvel appel"
-#: sflphone-gtk/src/actions.c: 557
-msgid "There is no registered account to make this call with."
-msgstr "Vous n'avez aucun compte enregistré pour passer cet appel."
+#: menus.c:285 menus.c:769
+msgid "_Pick up"
+msgstr "_Décrocher"
-#: sflphone-gtk/src/actions.c: 591
-msgid "<b>ALSA notification</b>\n\n"
-"Error while opening playback device"
-msgstr "<b>Notification ALSA</b>\n\n"
-"Erreur lors de l'ouverture du périphérique de sortie"
+#: menus.c:295 menus.c:781
+msgid "_Hang up"
+msgstr "_Raccrocher"
-#: sflphone-gtk/src/actions.c: 594
-msgid "<b>ALSA notification</b>\n\n"
-"Error while opening capture device"
-msgstr "<b>Notification ALSA</b>\n\n"
-"Erreur lors de l'ouverture du périphérique d'entrée"
+#: menus.c:305 menus.c:793
+msgid "On _Hold"
+msgstr "_Mettre en attente"
-#: sflphone-gtk/src/actions.c: 632
-msgid "<b>Error: No audio codecs found.\n\n</b>"
-" SFL audio codecs have to be placed in <i>%s</i>"
-" or in the <b>.sflphone</b> directory in your home( <i>%s</i> )"
-msgstr "<b>Erreur: Aucun codec audio trouvé.\n\n</b>"
-" Les codecs audio SFL doivent être soit dans <i>%s</i>"
-" soit dans le répertoire <b>.sflphone</b> de votre répertoire racine( <i>%s</i> )"
+#: menus.c:321
+msgid "_Account Assistant"
+msgstr "_Assistant SFLphone"
-#: sflphone-gtk/src/accountlist.c: 148
-msgid "Registered"
-msgstr "Enregistré"
+#: menus.c:351
+msgid "_Call"
+msgstr "_Actions"
-#: sflphone-gtk/src/accountlist.c: 151
-msgid "Not Registered"
-msgstr "Non Enregistré"
+#: menus.c:497
+msgid "History empty"
+msgstr "L'historique est vide"
-#: sflphone-gtk/src/accountlist.c: 154
-msgid "Trying..."
-msgstr "En cours..."
+#: menus.c:538
+msgid "_Clear history"
+msgstr "Effacer l'historique"
-#: sflphone-gtk/src/accountlist.c: 157
-msgid "Error"
-msgstr "Erreur"
+#: menus.c:550
+msgid "_Accounts"
+msgstr "Co_mptes"
-#: sflphone-gtk/src/accountlist.c: 160
-msgid "Invalid"
-msgstr "Non valide"
+#: menus.c:565
+msgid "_Edit"
+msgstr "_Options"
-#: sflphone-gtk/src/sliders.c: 166
-msgid "Speakers volume"
-msgstr "Volume des hauts-parleurs"
+#: menus.c:625
+msgid "_Dialpad"
+msgstr "_Clavier"
-#: sflphone-gtk/src/sliders.c: 168
-msgid "Mic volume"
-msgstr "Volume du micro"
+#: menus.c:637
+msgid "_Volume controls"
+msgstr "_Contrôle du volume"
-#: sflphone-gtk/src/mainwindow.c: 69
-msgid "<b>There is one call in progress.</b>\nDo you still want to quit?"
-msgstr "<b>Vous avez un appel en cours.</b>\nVoulez-vous quitter?"
+#: menus.c:646
+msgid "_Search history"
+msgstr "Recherche dans l'historique"
-#: sflphone-gtk/src/mainwindow.c: 69
-msgid "<b>There are calls in progress.</b>\nDo you still want to quit?"
-msgstr "<b>Vous avez des appels en cours.</b>\nVoulez-vous quitter?"
+#: menus.c:654
+msgid "_View"
+msgstr "A_ffichage"
-#: sflphone-gtk/src/mainwindow.c: 179
-msgid "<b><big>Welcome to SFLphone!</big></b>\n\n"
-"There is no VoIP account configured.\n"
-" Would you like to create one now?"
-msgstr "<b><big>Bienvenue dans SFLphone!</big></b>\n\n"
-"Vous n'avez aucun compte configuré pour l'instant.\n"
-" Voulez-vous en créer un immédiatement?"
+#: menus.c:876
+#, fuzzy
+msgid "_Call back"
+msgstr "_Actions"
-#: sflphone-gtk/src/SFLnotify.c: 32
+#: sflnotify.c:34 sflnotify.c:100
+#, c-format
msgid "%s account: %s"
msgstr "Compte %s: %s"
-#: sflphone-gtk/src/SFLnotify.c: 35
+#: sflnotify.c:37
+#, c-format
msgid "<i>From:</i> %s"
msgstr "<i>De:</i> %s"
-#: sflphone-gtk/src/SFLnotify.c: 50
+#: sflnotify.c:52
msgid "Accept"
msgstr "Accepter"
-#: sflphone-gtk/src/SFLnotify.c: 51
+#: sflnotify.c:53
msgid "Refuse"
msgstr "Refuser"
-#: sflphone-gtk/src/SFLnotify.c: 52
+#: sflnotify.c:54 sflnotify.c:117 sflnotify.c:154
msgid "Ignore"
msgstr "Ignorer"
-#: sflphone-gtk/src/statusicon.c: 80
-msgid "_Show main window"
-msgstr "_Afficher la fenêtre principale"
-
-#: sflphone-gtk/src/statusicon.c: 113
-msgid "SFLphone - %i account registered"
-msgid_plural "SFLphone - %i accounts registered"
-msgstr[0] "SFLphone - %i compte enregistré"
-msgstr[1] "SFLphone - %i comptes enregistrés"
-
-#: sflphone-gtk/src/assistant.c: 91
-msgid "SFLphone account configuration wizard"
-msgstr "Assistant de configuration de compte"
-
-#: sflphone-gtk/src/assistant.c: 122
-msgid "Welcome to SFLphone!"
-msgstr "Bienvenue dans SFLphone"
+#: sflnotify.c:136
+#, c-format
+msgid "Calling with %s account <i>%s</i>"
+msgstr "Appel avec le compte %s <i>%s</i>"
-#: sflphone-gtk/src/assistant.c: 119
-msgid "This installation wizard will help you configure an account."
-msgstr "Cet assistant va vous guider dans la configuration d'un compte. "
+#: sflnotify.c:140
+msgid "Current account"
+msgstr "Compte courant"
-#: sflphone-gtk/src/assistant.c: 134
-msgid "VoIP Protocols"
-msgstr "Protocoles VoIP"
-
-#: sflphone-gtk/src/assistant.c: 134
-msgid "Select an account type:"
-msgstr "Choisissez un type de compte:"
-
-#: sflphone-gtk/src/assistant.c: 153
-msgid "SIP account configuration"
-msgstr "Configuration d'un compte SIP"
+#: sflnotify.c:169
+msgid "You haven't setup any accounts"
+msgstr "Vous n'avez aucun compte configuré"
-#: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
-msgid "Please fill the following information:"
-msgstr "Veuillez remplir les champs suivants:"
+#: sflnotify.c:185 sflnotify.c:224
+#, fuzzy
+msgid "Setup Accounts"
+msgstr "Comptes"
-#: sflphone-gtk/src/assistant.c: 202
-msgid "IAX2 account configuration"
-msgstr "Configuration d'un compte IAX2"
+#: sflnotify.c:208
+msgid "You have no registered accounts"
+msgstr "Vous n'avez aucun compte enregistré"
-#: sflphone-gtk/src/assistant.c: 256
-msgid "You should probably enable this if you are behind a firewall."
-msgstr "Vous devriez probablement activer cette option si \nvous vous trouvez derrière un pare-feu."
+#: sliders.c:161
+msgid "Speakers volume"
+msgstr "Volume des hauts-parleurs"
-#: sflphone-gtk/src/assistant.c: 289
-msgid "Account Registration"
-msgstr "Enregistrement du compte"
+#: sliders.c:163
+msgid "Mic volume"
+msgstr "Volume du micro"
-#: sflphone-gtk/src/assistant.c: 289
-msgid "Congratulations!"
-msgstr "Félicitations!"
+#: statusicon.c:91
+msgid "_Show main window"
+msgstr "_Afficher la fenêtre principale"
-#: sflphone-gtk/src/assistant.c: 291
-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."
+#: statusicon.c:124
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts registered"
+msgstr "SFLphone - %i compte enregistré"
-#: sflphone-gtk/src/timestamp.c: 45
+#: timestamp.c:45
msgid "<small>Missed call</small>"
msgstr "<small>Appel manqué</small>"
-#: sflphone-gtk/src/timestamp.c: 63
+#: timestamp.c:63
+#, c-format
msgid "<small>Duration:</small> %s"
msgstr "<small>Durée:</small> %s"
-
-#: sflphone-gtk/src/historyfilter.c: 78
-msgid "Search"
-msgstr "Recherche"
-
-
diff --git a/po/sflphone.pot b/po/sflphone.pot
index f37ed7c6d43e82670478680dee071df82cfc17f2..595319e11506a0587675c8c851313d120b6c7249 100644
--- a/po/sflphone.pot
+++ b/po/sflphone.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-29 10:56-0400\n"
+"POT-Creation-Date: 2008-11-05 16:41-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -402,6 +402,13 @@ msgid ""
"Error while opening capture device"
msgstr ""
+#: errors.c:34
+msgid ""
+"<b>Pulseaudio notification</b>\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+
#: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
msgid "Search"
msgstr ""
@@ -418,75 +425,75 @@ msgid ""
"Do you still want to quit?"
msgstr ""
-#: menus.c:129
+#: menus.c:130
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr ""
-#: menus.c:132
+#: menus.c:133
msgid "About SFLphone"
msgstr ""
-#: menus.c:155
+#: menus.c:156
msgid "_Help"
msgstr ""
-#: menus.c:272
+#: menus.c:273
msgid "_New call"
msgstr ""
-#: menus.c:284 menus.c:768
+#: menus.c:285 menus.c:769
msgid "_Pick up"
msgstr ""
-#: menus.c:294 menus.c:780
+#: menus.c:295 menus.c:781
msgid "_Hang up"
msgstr ""
-#: menus.c:304 menus.c:792
+#: menus.c:305 menus.c:793
msgid "On _Hold"
msgstr ""
-#: menus.c:320
+#: menus.c:321
msgid "_Account Assistant"
msgstr ""
-#: menus.c:350
+#: menus.c:351
msgid "_Call"
msgstr ""
-#: menus.c:496
+#: menus.c:497
msgid "History empty"
msgstr ""
-#: menus.c:537
+#: menus.c:538
msgid "_Clear history"
msgstr ""
-#: menus.c:549
+#: menus.c:550
msgid "_Accounts"
msgstr ""
-#: menus.c:564
+#: menus.c:565
msgid "_Edit"
msgstr ""
-#: menus.c:624
+#: menus.c:625
msgid "_Dialpad"
msgstr ""
-#: menus.c:636
+#: menus.c:637
msgid "_Volume controls"
msgstr ""
-#: menus.c:645
+#: menus.c:646
msgid "_Search history"
msgstr ""
-#: menus.c:653
+#: menus.c:654
msgid "_View"
msgstr ""
-#: menus.c:875
+#: menus.c:876
msgid "_Call back"
msgstr ""
diff --git a/po/sflphone_es.po.patch b/po/sflphone_es.po.patch
new file mode 100644
index 0000000000000000000000000000000000000000..80b09273b2ce99e095bc24d5ee842c3e2461d865
--- /dev/null
+++ b/po/sflphone_es.po.patch
@@ -0,0 +1,395 @@
+--- sflphone_es.po.orig 2008-05-21 23:16:55.000000000 +0200
++++ sflphone_es.po 2008-08-13 11:53:32.000000000 +0200
+@@ -11,7 +11,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: SFLphone 0.8.2\n"
+ "Report-Msgid-Bugs-To: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com >\n"
+-"PO-Revision-Date: 2008-03-27 11:15\n"
++"PO-Revision-Date: 2008-08-13 11:53+0200\n"
+ "Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
+ "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
+ "MIME-Version: 1.0\n"
+@@ -21,19 +21,19 @@ msgstr ""
+
+ #: src/audio/audiolayer.cpp: 318
+ msgid "Error while opening capture device "
+-msgstr "Error abriendo el dispositivo de captura "
++msgstr "Error al abrir el dispositivo de captura "
+
+ #: src/audio/audiolayer.cpp: 349
+ msgid "Error while opening playback device "
+-msgstr "Error abriendo el dispositivo del aparato de lectura "
++msgstr "Error al abrir el dispositivo de reproducción "
+
+ #: sflphone-gtk/src/menus.c: 119
+ msgid "About SFLphone"
+-msgstr "Sobre SFLphone"
++msgstr "Acerca de SFLphone"
+
+ #: sflphone-gtk/src/menus.c: 124
+ msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+-msgstr "SFLphone es un telefono por Internet compatible con los protocolos SIP y IAX2"
++msgstr "SFLphone es un cliente de VoIP compatible con los protocolos SIP y IAX2."
+
+ #: sflphone-gtk/src/menus.c: 150
+ msgid "_Help"
+@@ -45,15 +45,15 @@ msgstr "_Nueva llamada"
+
+ #: sflphone-gtk/src/menus.c: 217 menus.c: 605
+ msgid "_Pick up"
+-msgstr "_Colgar"
++msgstr "_Descolgar"
+
+ #: sflphone-gtk/src/menus.c: 225 menus.c: 617
+ msgid "_Hang up"
+-msgstr "_Descolgar"
++msgstr "_Colgar"
+
+ #: sflphone-gtk/src/menus.c: 233 menus.c: 629
+ msgid "On _Hold"
+-msgstr "_Sostener"
++msgstr "En _Espera"
+
+ #: sflphone-gtk/src/menus.c: 254
+ msgid "_Call"
+@@ -69,11 +69,11 @@ msgstr "_Cuentas"
+
+ #: sflphone-gtk/src/menus.c: 438
+ msgid "_Edit"
+-msgstr "_Edición"
++msgstr "_Editar"
+
+ #: sflphone-gtk/src/menus.c: 462
+ msgid "_Dialpad"
+-msgstr "_Pantalla de numero"
++msgstr "_Teclado numérico"
+
+ #: sflphone-gtk/src/menus.c: 471
+ msgid "_Volume controls"
+@@ -93,11 +93,11 @@ msgstr "Llamar"
+
+ #: sflphone-gtk/src/calltree.c: 343 sflphone-gtk/src/calltree.c: 344
+ msgid "Pick up"
+-msgstr "Colgar"
++msgstr "Descolgar"
+
+ #: sflphone-gtk/src/calltree.c: 351 sflphone-gtk/src/calltree.c: 352
+ msgid "Hang up"
+-msgstr "Descolgar"
++msgstr "Colgar"
+
+ #: sflphone-gtk/src/calltree.c: 359 sflphone-gtk/src/calltree.c: 360
+ msgid "Off Hold"
+@@ -105,7 +105,7 @@ msgstr "Seguir"
+
+ #: sflphone-gtk/src/calltree.c: 367 sflphone-gtk/src/calltree.c: 368
+ msgid "On Hold"
+-msgstr "Sostener"
++msgstr "Retener"
+
+ #: sflphone-gtk/src/calltree.c: 375 sflphone-gtk/src/calltree.c: 376
+ msgid "Transfer"
+@@ -117,11 +117,11 @@ msgstr "Nombre"
+
+ #: sflphone-gtk/src/configwindow.c: 804
+ msgid "Frequency"
+-msgstr "Frequencia"
++msgstr "Frecuencia"
+
+ #: sflphone-gtk/src/configwindow.c: 809
+ msgid "Bitrate"
+-msgstr "Bitrato"
++msgstr "Tasa de transferencia"
+
+ #: sflphone-gtk/src/configwindow.c: 814
+ msgid "Bandwidth"
+@@ -137,11 +137,11 @@ msgstr "Estado"
+
+ #: sflphone-gtk/src/configwindow.c: 934
+ msgid "Default"
+-msgstr "Defecto"
++msgstr "Predeterminado"
+
+ #: sflphone-gtk/src/configwindow.c: 935
+ msgid "Set the selected account as the default one to make calls"
+-msgstr "Fije la cuenta seleccionada como el defecto para llamar"
++msgstr "Establecer la cuenta seleccionada como predeterminada para hacer llamadas"
+
+ #: sflphone-gtk/src/configwindow.c: 976
+ msgid "Devices"
+@@ -161,19 +161,19 @@ msgstr "Periférico de entrada"
+
+ #: sflphone-gtk/src/configwindow.c: 1080
+ msgid "Detect all"
+-msgstr "Detecte todos"
++msgstr "Detectar todos"
+
+ #: sflphone-gtk/src/configwindow.c: 1107
+ msgid "_Enable ringtones"
+-msgstr "_Permitir los ringtones"
++msgstr "_Habilitar tonos de llamada"
+
+ #: sflphone-gtk/src/configwindow.c: 1112
+ msgid "Choose a ringtone"
+-msgstr "Elija un ringtones"
++msgstr "Elija un tono de llamada"
+
+ #: sflphone-gtk/src/configwindow.c: 1117
+ msgid "Audio Files"
+-msgstr "Archivos Audio"
++msgstr "Archivos de Audio"
+
+ #: sflphone-gtk/src/configwindow.c: 1142
+ msgid "Preferences"
+@@ -181,7 +181,7 @@ msgstr "Preferencias"
+
+ #: sflphone-gtk/src/configwindow.c: 1167
+ msgid "Audio Settings"
+-msgstr "Configuración Audio"
++msgstr "Configuración de audio"
+
+ #: sflphone-gtk/src/configwindow.c: 1191
+ msgid "Accounts"
+@@ -193,7 +193,7 @@ msgstr "Cuentas existentes"
+
+ #: sflphone-gtk/src/configwindow.c: 1254
+ msgid "Desktop Notification"
+-msgstr "Notificación de Escritorio"
++msgstr "Notificación de escritorio"
+
+ #: sflphone-gtk/src/configwindow.c: 1263
+ msgid "_Enable"
+@@ -201,31 +201,31 @@ msgstr "_Activar"
+
+ #: sflphone-gtk/src/configwindow.c: 1268
+ msgid "_Notify Voice Mails"
+-msgstr "_Notificar Mensajes Vocales"
++msgstr "_Notificar mensajes de voz"
+
+ #: sflphone-gtk/src/configwindow.c: 1274
+ msgid "System Tray Icon"
+-msgstr "Icono de Bandeja del Sistema"
++msgstr "Icono de bandeja del sistema"
+
+ #: sflphone-gtk/src/configwindow.c: 1283
+ msgid "_Popup Main Window On Incoming Call"
+-msgstr "_Popup Ventana Principal por las Llamadas Recibidas"
++msgstr "_Mostrar ventana principal al recibir llamadas"
+
+ #: sflphone-gtk/src/configwindow.c: 1288
+ msgid "Ne_ver Popup Main Window"
+-msgstr "_Jamas Popup Ventana Principal"
++msgstr "_Nunca mostrar ventana principal"
+
+ #: sflphone-gtk/src/configwindow.c: 1292
+ msgid "_Start Hidden"
+-msgstr "_Iniciar Escondido"
++msgstr "_Iniciar oculto"
+
+ #: sflphone-gtk/src/configwindow.c: 1297
+ msgid "Calls History"
+-msgstr "Historia de Llamada"
++msgstr "Historial de llamadas"
+
+ #: sflphone-gtk/src/configwindow.c: 1307
+ msgid "_Maximum number of calls"
+-msgstr "_Numero Maximo de Llamadas"
++msgstr "_Número máximo de llamadas"
+
+ #: sflphone-gtk/src/accountwindow.c: 139
+ msgid "Account settings"
+@@ -233,7 +233,7 @@ msgstr "Configuración de cuentas"
+
+ #: sflphone-gtk/src/accountwindow.c: 151
+ msgid "Account parameters"
+-msgstr "Parà metros de Cuenta"
++msgstr "Parámetros de cuenta"
+
+ #: sflphone-gtk/src/accountwindow.c: 174
+ msgid "_Enabled"
+@@ -253,7 +253,7 @@ msgstr "Desconocido"
+
+ #: sflphone-gtk/src/accountwindow.c: 216 sflphone-gtk/src/assistant.c: 169 sflphone-gtk/src/assistant.c: 218
+ msgid "_Host name"
+-msgstr "_Parte del servidor"
++msgstr "_Nombre de equipo"
+
+ #: sflphone-gtk/src/accountwindow.c: 224 sflphone-gtk/src/assistant.c: 177 sflphone-gtk/src/assistant.c: 226
+ msgid "_User name"
+@@ -265,11 +265,11 @@ msgstr "_Contraseña"
+
+ #: sflphone-gtk/src/accountwindow.c: 241
+ msgid "_Voicemail box #"
+-msgstr "_Numero de Caja de Voz"
++msgstr "_Número de buzón de voz"
+
+ #: sflphone-gtk/src/accountwindow.c: 252 sflphone-gtk/src/assistant.c: 256
+ msgid "Network Address Translation"
+-msgstr "Conversión de Dirección de Red"
++msgstr "Conversión de Dirección de Red (NAT)"
+
+ #: sflphone-gtk/src/accountwindow.c: 264 sflphone-gtk/src/assistant.c: 265
+ msgid "E_nable STUN"
+@@ -277,7 +277,7 @@ msgstr "A_ctivar STUN"
+
+ #: sflphone-gtk/src/accountwindow.c: 267
+ msgid "Enable it if you are behind a firewall, then restart SFLphone"
+-msgstr "Activar si esta atras un cortafuego, despues reiniciar SFLphone"
++msgstr "ActÃvelo si está detrás de un cortafuegos, después reinicie SFLphone"
+
+ #: sflphone-gtk/src/accountwindow.c: 270 sflphone-gtk/src/assistant.c: 272
+ msgid "_STUN Server"
+@@ -289,44 +289,44 @@ msgstr "Formato: nombre.servidor:puerto"
+
+ #: sflphone-gtk/src/actions.c: 45
+ msgid "%d voice mails"
+-msgstr "%d mensajes"
++msgstr "%d mensajes de voz"
+
+ #: sflphone-gtk/src/actions.c: 47
+ msgid "%d voice mail"
+-msgstr "%d mensaje"
++msgstr "%d mensaje de voz"
+
+ #: sflphone-gtk/src/actions.c: 162
+ msgid "Unable to connect to the SFLphone server.\n"
+ " Make sure the daemon is running."
+-msgstr "Incapaz e conectar con el servidor SFLphone.\n"
+-" Checa que el demonio está funcionando."
++msgstr "Incapaz de conectar con el servidor SFLphone.\n"
++" Asegúrese de que el demonio esté funcionando."
+
+ #: sflphone-gtk/src/actions.c: 544
+ msgid "The account selected as default is not registered."
+-msgstr "La cuenta seleccionada como defecto no es registrada."
++msgstr "La cuenta seleccionada como predeterminada no está registrada."
+
+ #: sflphone-gtk/src/actions.c: 557
+ msgid "There is no registered account to make this call with."
+-msgstr "No hay cuenta registrada para hacer esta llamada"
++msgstr "No hay ninguna cuenta registrada para hacer esta llamada."
+
+ #: sflphone-gtk/src/actions.c: 591
+ msgid "<b>ALSA notification</b>\n\n"
+ "Error while opening playback device"
+ msgstr "<b>Notificación ALSA</b>\n\n"
+-"Error abriendo el dispositivo del aparato de lectura"
++"Error al abrir el dispositivo de reproducción"
+
+ #: sflphone-gtk/src/actions.c: 594
+ msgid "<b>ALSA notification</b>\n\n"
+ "Error while opening capture device"
+ msgstr "<b>Notificación ALSA</b>\n\n"
+-"Error abriendo el dispositivo de captura"
++"Error al abrir el dispositivo de captura"
+
+ #r sflphone-gtk/src/actions.c: 632
+ msgid "<b>Error: No audio codecs found.\n\n</b>"
+ " SFL audio codecs have to be placed in <i>%s</i>"
+ " or in the <b>.sflphone</b> directory in your home( <i>%s</i> )"
+-msgstr "<b>Error: No codec audio encontrado.\n\n</b>"
+-" Los codecs audio de SFLphone deben estar en <i>%s</i>"
++msgstr "<b>Error: Codecs de audio no encontrados.\n\n</b>"
++" Los codecs de audio de SFLphone deben estar en <i>%s</i>"
+ " o en el directorio <b>.sflphone</b> de su home( <i>%s</i> )"
+
+ #: sflphone-gtk/src/accountlist.c: 148
+@@ -339,7 +339,7 @@ msgstr "No registrado"
+
+ #: sflphone-gtk/src/accountlist.c: 154
+ msgid "Trying..."
+-msgstr "Tratando..."
++msgstr "Intentando..."
+
+ #: sflphone-gtk/src/accountlist.c: 157
+ msgid "Error"
+@@ -362,8 +362,8 @@ msgid "<b><big>Welcome to SFLphone!</big
+ "There is no VoIP account configured.\n"
+ " Would you like to create one now?"
+ msgstr "<b><big>Bienvenido en SFLphone!</big></b>\n\n"
+-"No hay cuenta VoIP configurada.\n"
+-" Usted quiere crear una ?"
++"No hay ninguna cuenta VoIP configurada.\n"
++" ¿Quiere crear una?"
+
+ #: sflphone-gtk/src/SFLnotify.c: 32
+ msgid "%s account: %s"
+@@ -379,7 +379,7 @@ msgstr "Aceptar"
+
+ #: sflphone-gtk/src/SFLnotify.c: 51
+ msgid "Refuse"
+-msgstr "Renunciar"
++msgstr "Rechazar"
+
+ #: sflphone-gtk/src/SFLnotify.c: 52
+ msgid "Ignore"
+@@ -387,7 +387,7 @@ msgstr "Ignorar"
+
+ #: sflphone-gtk/src/statusicon.c: 80
+ msgid "Show main window"
+-msgstr "Mostrar Ventana Principal"
++msgstr "Mostrar ventana principal"
+
+ #: sflphone-gtk/src/statusicon.c: 113
+ msgid "SFLphone - %i account registered"
+@@ -397,15 +397,15 @@ msgstr[1] "SFLphone - %i cuentas registr
+
+ #: sflphone-gtk/src/assistant.c: 91
+ msgid "SFLphone account configuration wizard"
+-msgstr "Asistante de Configuración de Cuenta SFLphone"
++msgstr "Asistente de configuración de cuentas de SFLphone"
+
+ #: sflphone-gtk/src/assistant.c: 122
+ msgid "Welcome to SFLphone!"
+-msgstr "Bienvenido en SFLphone!"
++msgstr "¡Bienvenido a SFLphone!"
+
+ #: sflphone-gtk/src/assistant.c: 119
+ msgid "This installation wizard will help you configure an account."
+-msgstr "Ese asistante de instalaciòn ayuda usted a configurar una cuenta."
++msgstr "Este asistente de instalación le ayudará a configurar una cuenta."
+
+ #: sflphone-gtk/src/assistant.c: 134
+ msgid "VoIP Protocols"
+@@ -413,33 +413,33 @@ msgstr "Protocolos VoIP"
+
+ #: sflphone-gtk/src/assistant.c: 134
+ msgid "Select an account type:"
+-msgstr "Escoje un tipo de cuenta:"
++msgstr "Escoja un tipo de cuenta:"
+
+ #: sflphone-gtk/src/assistant.c: 153
+ msgid "SIP account configuration"
+-msgstr "Configuraciòn de cuenta SIP"
++msgstr "Configuración de cuenta SIP"
+
+ #: sflphone-gtk/src/assistant.c: 153 sflphone-gtk/src/assistant.c: 202
+ msgid "Please fill the following information:"
+-msgstr "Por favor de llenar esas informaciones:"
++msgstr "Por favor, rellene la siguiente información:"
+
+ #: sflphone-gtk/src/assistant.c: 202
+ msgid "IAX2 account configuration"
+-msgstr "Configuraciòn de cuenta IAX2"
++msgstr "Configuración de cuenta IAX2"
+
+ #: sflphone-gtk/src/assistant.c: 256
+ msgid "You should probably enable this if you are behind a firewall."
+-msgstr "Probablemente, tiene que activar eso si usted esta atras de un cortafuego."
++msgstr "Probablemente tiene que activar esto si está detrás de un cortafuegos."
+
+ #: sflphone-gtk/src/assistant.c: 289
+ msgid "Account Registration"
+-msgstr "Registraciòn de Cuenta"
++msgstr "Registro de cuenta"
+
+ #: sflphone-gtk/src/assistant.c: 289
+ msgid "Congratulations!"
+-msgstr "Felicitaciones!"
++msgstr "¡Enhorabuena!"
+
+ #: sflphone-gtk/src/assistant.c: 291
+ 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 "Ese asistante esta terminado.\n\n Usted puede checar su estado de registraciòn o cambiar sus parametros de cuentas en cualquier momento en la ventana de Opciones/Cuentas."
++msgstr "Este asistente ha finalizado.\n\n Puede comprobar en cualquier momento su estado de registro o modificar la configuración de sus cuentas en la ventana de Opciones/Cuentas."
+
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 48e22d35743e6a10bb4d235f6c35b403dca5d930..bcc23599a5de759b204f02d4a36ecc365310fdf4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,11 +4,11 @@
#
# Yun Liu <yun.liu@savoirfairelinux.com>, 2008.
#
-
msgid ""
msgstr ""
"Project-Id-Version: SFLphone 0.9.2\n"
-"Report-Msgid-Bugs-To: Yun Liu <yun.liu@savoirfairelinux.com >\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-05 16:41-0500\n"
"PO-Revision-Date: 2008-10-28 14:15\n"
"Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -142,7 +142,8 @@ msgid ""
msgstr ""
"<b>é”™è¯¯ï¼šæ— æ³•æ‰¾åˆ°codecsç¼–ç 文件.\n"
"\n"
-"</b> SFL声音codecs文件应ä½äºŽ<i>%s</i> 或 ä½äºŽä¸»ç›®å½•( <i>%s</i> )çš„<b>.sflphone</b>目录下"
+"</b> SFL声音codecs文件应ä½äºŽ<i>%s</i> 或 ä½äºŽä¸»ç›®å½•( <i>%s</i> )çš„<b>."
+"sflphone</b>目录下"
#: assistant.c:138
msgid "SFLphone account configuration wizard"
@@ -417,6 +418,13 @@ msgstr ""
"\n"
"打开采集设备时出错"
+#: errors.c:34
+msgid ""
+"<b>Pulseaudio notification</b>\n"
+"\n"
+"Pulseaudio is not running"
+msgstr ""
+
#: historyfilter.c:45 historyfilter.c:63 historyfilter.c:78
msgid "Search"
msgstr "查找"
@@ -437,75 +445,75 @@ msgstr ""
"<b>有电è¯æ£åœ¨å¤„ç†ä¸</b>\n"
"确定è¦é€€å‡ºï¼Ÿ"
-#: menus.c:129
+#: menus.c:130
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
msgstr "SFLphone是一个VoIP客户端，它兼容SIPå’ŒIAX2åè®®."
-#: menus.c:132
+#: menus.c:133
msgid "About SFLphone"
msgstr "关于SFLphone"
-#: menus.c:155
+#: menus.c:156
msgid "_Help"
msgstr "帮助(H)"
-#: menus.c:272
+#: menus.c:273
msgid "_New call"
msgstr "新电è¯(N)"
-#: menus.c:284 menus.c:768
+#: menus.c:285 menus.c:769
msgid "_Pick up"
msgstr "拨出(P)"
-#: menus.c:294 menus.c:780
+#: menus.c:295 menus.c:781
msgid "_Hang up"
msgstr "放下(H)"
-#: menus.c:304 menus.c:792
+#: menus.c:305 menus.c:793
msgid "On _Hold"
msgstr ""
-#: menus.c:320
+#: menus.c:321
msgid "_Account Assistant"
msgstr "å¸æˆ·å‘导(A)"
-#: menus.c:350
+#: menus.c:351
msgid "_Call"
msgstr "电è¯"
-#: menus.c:496
+#: menus.c:497
msgid "History empty"
msgstr "æ— åŽ†å²è®°å½•"
-#: menus.c:537
+#: menus.c:538
msgid "_Clear history"
msgstr "清空历å²è®°å½•(C)"
-#: menus.c:549
+#: menus.c:550
msgid "_Accounts"
msgstr "å¸æˆ·(A)"
-#: menus.c:564
+#: menus.c:565
msgid "_Edit"
msgstr "编辑(E)"
-#: menus.c:624
+#: menus.c:625
msgid "_Dialpad"
msgstr "拨å·é¢æ¿"
-#: menus.c:636
+#: menus.c:637
msgid "_Volume controls"
msgstr "音é‡æŽ§åˆ¶(V)"
-#: menus.c:645
+#: menus.c:646
msgid "_Search history"
msgstr "查找历å²(S)"
-#: menus.c:653
+#: menus.c:654
msgid "_View"
msgstr "查看(V)"
-#: menus.c:875
+#: menus.c:876
msgid "_Call back"
msgstr "回å«(C)"
diff --git a/sflphone-gtk/autogen.sh b/sflphone-gtk/autogen.sh
index 826d47d8edba52766a7a63430c6a517ad78a7b49..115f4372542d9a656c19679513bf20b076c206cf 100755
--- a/sflphone-gtk/autogen.sh
+++ b/sflphone-gtk/autogen.sh
@@ -6,6 +6,6 @@ libtoolize --force
autoheader
autoconf -f
automake -a
+./configure $@
-echo "\nDone! Now you can ./configure."
diff --git a/sflphone-gtk/src/errors.c b/sflphone-gtk/src/errors.c
index 00db523d7842547f407df60ea04bba191bf3d96f..9f9842720b9d5d443c9fde7148790e4d867ea675 100644
--- a/sflphone-gtk/src/errors.c
+++ b/sflphone-gtk/src/errors.c
@@ -30,6 +30,9 @@ sflphone_throw_exception( int err )
case ALSA_CAPTURE_DEVICE:
markup = g_markup_printf_escaped(_("<b>ALSA notification</b>\n\nError while opening capture device"));
break;
+ case PULSEAUDIO_NOT_RUNNING:
+ markup = g_markup_printf_escaped(_("<b>Pulseaudio notification</b>\n\nPulseaudio is not running"));
+ break;
}
main_window_error_message( markup );
free( markup );
diff --git a/sflphone-gtk/src/sflphone_const.h b/sflphone-gtk/src/sflphone_const.h
index 134f462cab85e263c4d63806cae8b356bf6dc049..34faa3f59d9cdbdffbd0d59ed40cff3ee93217dd 100644
--- a/sflphone-gtk/src/sflphone_const.h
+++ b/sflphone-gtk/src/sflphone_const.h
@@ -66,6 +66,10 @@
#define ALSA_CAPTURE_DEVICE 0x0001
/** Error while opening playback device */
#define ALSA_PLAYBACK_DEVICE 0x0010
+/** Error pulseaudio */
+#define PULSEAUDIO_NOT_RUNNING 0x0100
+
+
/** Tone to play when no voice mails */
#define TONE_WITHOUT_MESSAGE 0
diff --git a/src/audio/alsalayer.cpp b/src/audio/alsalayer.cpp
index 9d4c70ca02dca747f5fc7d78ddef501fae1e4d59..084ab5b455effcf5caae08b669dce1c0004d0da4 100644
--- a/src/audio/alsalayer.cpp
+++ b/src/audio/alsalayer.cpp
@@ -59,6 +59,12 @@ AlsaLayer::closeLayer()
AlsaLayer::openDevice (int indexIn, int indexOut, int sampleRate, int frameSize, int stream , std::string plugin)
{
+ // We don't accept that the audio plugin is changed during a conversation
+ if( _talk ){
+ _debug("can't switch audio plugin when talking\n. Please hang up and try again...\n");
+ return false;
+ }
+
if(deviceClosed == false)
{
if( stream == SFL_PCM_CAPTURE )
@@ -694,4 +700,4 @@ AlsaLayer::adjustVolume( void* buffer , int len, int stream )
return src ;
}
-void AlsaLayer::setPlaybackVolume( double volume ){}
+void AlsaLayer::setPlaybackVolume( double volume UNUSED){}
diff --git a/src/global.h b/src/global.h
index 69ac066acc7cab7cb24911d7d022ab3edabd4b10..e95d776764d08d4d0935d08bed9890873ae13a27 100644
--- a/src/global.h
+++ b/src/global.h
@@ -126,6 +126,7 @@ typedef short int16;
#define ALSA_CAPTURE_DEVICE 0x0001 /** Error while opening capture device */
#define ALSA_PLAYBACK_DEVICE 0x0010 /** Error while opening playback device */
#define NETWORK_UNREACHABLE 0x0011 /** Network unreachable */
+#define PULSEAUDIO_NOT_RUNNING 0x0100 /** Pulseaudio is not running */
#define ALSA 0
#define PULSEAUDIO 1
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 313079e3558aaa680c2751bb3b723baa39ecd20c..51d8342d80b9420de3435c53a01b7e1e46501606 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -1274,10 +1274,12 @@ ManagerImpl::setInputAudioPlugin(const std::string& audioPlugin)
void
ManagerImpl::setOutputAudioPlugin(const std::string& audioPlugin)
{
- //int layer = _audiodriver -> getLayerType();
+
+ int res;
+
_debug("Set output audio plugin\n");
_audiodriver -> setErrorMessage( -1 );
- _audiodriver -> openDevice( _audiodriver -> getIndexIn(),
+ res = _audiodriver -> openDevice( _audiodriver -> getIndexIn(),
_audiodriver -> getIndexOut(),
_audiodriver -> getSampleRate(),
_audiodriver -> getFrameSize(),
@@ -1286,7 +1288,7 @@ ManagerImpl::setOutputAudioPlugin(const std::string& audioPlugin)
if( _audiodriver -> getErrorMessage() != -1)
notifyErrClient( _audiodriver -> getErrorMessage() );
// set config
- setConfig( AUDIO , ALSA_PLUGIN , audioPlugin );
+ if(res) setConfig( AUDIO , ALSA_PLUGIN , audioPlugin );
}
/**
@@ -1520,11 +1522,27 @@ ManagerImpl::setPulseAppVolumeControl( void )
(getConfigInt( PREFERENCES , CONFIG_PA_VOLUME_CTRL ) == 1)? setConfig( PREFERENCES , CONFIG_PA_VOLUME_CTRL , NO_STR) : setConfig( PREFERENCES , CONFIG_PA_VOLUME_CTRL , YES_STR) ;
}
-void
-ManagerImpl::setAudioManager( const int32_t& api )
+void ManagerImpl::setAudioManager( const int32_t& api )
{
- setConfig( PREFERENCES , CONFIG_AUDIO , api) ;
- switchAudioManager();
+ int manager;
+
+ manager = api;
+ if( manager == PULSEAUDIO )
+ {
+ if(app_is_running("pulseaudio") != 0)
+ {
+ // The pulseaudio daemon is not running
+ manager = ALSA;
+ notifyErrClient(PULSEAUDIO_NOT_RUNNING);
+ }
+ }
+
+ if(manager == api)
+ {
+ // it means that we can change the audio manager
+ setConfig( PREFERENCES , CONFIG_AUDIO , api) ;
+ switchAudioManager();
+ }
}
int32_t
@@ -1569,6 +1587,14 @@ ManagerImpl::getCurrentAudioOutputPlugin( void )
return _audiodriver -> getAudioPlugin();
}
+int ManagerImpl::app_is_running( std::string process )
+{
+ std::ostringstream cmd;
+
+ cmd << "ps -C " << process;
+ return system(cmd.str().c_str());
+}
+
/**
* Initialization: Main Thread
@@ -1581,12 +1607,23 @@ ManagerImpl::initAudioDriver(void)
_debugInit("AudioLayer Creation");
- if( getConfigInt( PREFERENCES , CONFIG_AUDIO ) == ALSA )
- _audiodriver = new AlsaLayer( this );
- else if( getConfigInt( PREFERENCES , CONFIG_AUDIO ) == PULSEAUDIO )
- _audiodriver = new PulseLayer( this );
- else
- _debug("Error - Audio API unknown\n");
+ if( getConfigInt( PREFERENCES , CONFIG_AUDIO ) == ALSA )
+ {
+ _audiodriver = new AlsaLayer( this );
+ }
+ else if( getConfigInt( PREFERENCES , CONFIG_AUDIO ) == PULSEAUDIO )
+ {
+ if( app_is_running("pulseaudio") == 0 )
+ {
+ _audiodriver = new PulseLayer( this );
+ } else
+ {
+ _audiodriver = new AlsaLayer( this );
+ setConfig( PREFERENCES, CONFIG_AUDIO, ALSA);
+ }
+ }
+ else
+ _debug("Error - Audio API unknown\n");
if (_audiodriver == 0) {
_debug("Init audio driver error\n");
@@ -1630,6 +1667,7 @@ ManagerImpl::selectAudioDriver (void)
setConfig( AUDIO , ALSA_CARD_ID_OUT , ALSA_DFT_CARD_ID );
}
+
if(CHECK_INTERFACE( layer , ALSA ))
{
delete _audiodriver;
diff --git a/src/managerimpl.h b/src/managerimpl.h
index b97edb59d6de79e94137ccbc14f1658584427a95..6f5dac3fb737feaa5f6f0e6d14ecd6ff8fc458ff 100644
--- a/src/managerimpl.h
+++ b/src/managerimpl.h
@@ -829,6 +829,14 @@ class ManagerImpl {
private:
+ /**
+ * Check if a process is running with the system command
+ *
+ * @return 0 on success
+ * 1 otherelse
+ */
+ int app_is_running(std::string process);
+
/**
* Create .PROGNAME directory in home user and create
* configuration tree from the settings file if this file exists.